Skip to contentSkip to conversation

use KVM_UPSTREAM for ppc.

PATCH In review Glauber Costa 4 participants 4 messages Feb 13, 2009 – Feb 16, 2009 KVM

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 use KVM_UPSTREAM for ppc.

ppc should compile with upstream qemu code, so, put these defines in ppc specific code that references kvm functions.

We don put them in config.h in this case, since there are files (like vl.c) that includes both kvm.h and qemu-kvm.h, and would break compilation.

---
 qemu/hw/ppc440.c         |    1 +
 qemu/hw/ppc440_bamboo.c  |    1 +
 qemu/target-ppc/helper.c |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)
qemu/hw/ppc440.c +1 -0
index 00d82e4..164c326 100644
@@ -18,6 +18,7 @@
 #include "ppc440.h"
 #include "ppc405.h"
 #include "sysemu.h"
+#define KVM_UPSTREAM
 #include "kvm.h"
 
 #define PPC440EP_PCI_CONFIG     0xeec00000
qemu/hw/ppc440_bamboo.c +1 -0
index fbd447c..60ddaf4 100644
@@ -21,6 +21,7 @@
 #include "boards.h"
 #include "sysemu.h"
 #include "ppc440.h"
+#define KVM_UPSTREAM
 #include "kvm.h"
 #include "kvm_ppc.h"
 #include "device_tree.h"
qemu/target-ppc/helper.c +1 -0
index fc62a63..d49acaf 100644
@@ -29,6 +29,7 @@
 #include "exec-all.h"
 #include "helper_regs.h"
 #include "qemu-common.h"
+#define KVM_UPSTREAM
 #include "kvm.h"
 
 //#define DEBUG_MMU
Signature · 1 line
1.5.6.5
#1 lore raw
Quoted 8 lines · Glauber Costa

ppc should compile with upstream qemu code, so, put these defines in ppc specific code that references kvm functions.

We don put them in config.h in this case, since there are files (like vl.c) that includes both kvm.h and qemu-kvm.h, and would break compilation.

I actually haven't tried to build kvm-userspace for PPC since we got upstream qemu working...

I'm a little confused though, because it doesn't look like even x86 is using this?

Signature · 2 lines
Hollis Blanchard
IBM Linux Technology Center
#2 lore raw
Quoted 8 lines · Hollis Blanchard
Quoted 7 lines · Glauber Costa

ppc should compile with upstream qemu code, so, put these defines in ppc specific code that references kvm functions.

We don put them in config.h in this case, since there are files (like vl.c) that includes both kvm.h and qemu-kvm.h, and would break compilation.

Quoted 7 lines
Quoted 1 line

I actually haven't tried to build kvm-userspace for PPC since we got upstream qemu working...

I'm a little confused though, because it doesn't look like even x86 is using this?

upstream here means from qemu upstream.
x86 don't use this because kvm-userspace should not use qemu bits (yet)

Signature · 5 lines
Glauber  Costa.
"Free as in Freedom"
http://glommer.net

"The less confident you are, the more serious you have to act."
#3 lore raw
In reply to Glauber Costa
Quoted 6 lines · Glauber Costa

ppc should compile with upstream qemu code, so, put these
defines in ppc specific code that references kvm functions.

We don put them in config.h in this case, since there are files (like vl.c) that includes both kvm.h and qemu-kvm.h, and would break compilation.

Ack.

This patch is required for Ubuntu packaging of kvm-84. Otherwise, the compilation is broken.

Thanks for this.

:-Dustin