From: Anthony Liguori <[email protected]> This gets ppc-softmmu building when KVM is not enabled. It may be enough to get it working with KVM enabled but I haven't checked.
Signed-off-by: Anthony Liguori <[email protected]> Signed-off-by: Avi Kivity <[email protected]> diff --git a/hw/ppc440.c b/hw/ppc440.c index 5171988..aefc019 100644 --- a/hw/ppc440.c +++ b/hw/ppc440.c @@ -19,6 +19,7 @@ #include "ppc405.h" #include "sysemu.h" #include "kvm.h" +#include "qemu-kvm.h" #define PPC440EP_PCI_CONFIG 0xeec00000 #define PPC440EP_PCI_INTACK 0xeed00000 diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c index d9ef3ec..c74aa2f 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc440_bamboo.c @@ -22,6 +22,7 @@ #include "kvm.h" #include "kvm_ppc.h" #include "device_tree.h" +#include "qemu-kvm.h" #define BINARY_DEVICE_TREE_FILE "bamboo.dtb" diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c index c0e367d..db52cdd 100644 --- a/hw/ppce500_mpc8544ds.c +++ b/hw/ppce500_mpc8544ds.c @@ -29,6 +29,7 @@ #include "device_tree.h" #include "openpic.h" #include "ppce500.h" +#include "qemu-kvm.h" #define BINARY_DEVICE_TREE_FILE "mpc8544ds.dtb" #define UIMAGE_LOAD_BASE 0 diff --git a/qemu-kvm.h b/qemu-kvm.h index 68a5b40..9341d0c 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -169,6 +169,7 @@ int kvm_has_sync_mmu(void); void kvm_init_vcpu(CPUState *env); void kvm_load_tsc(CPUState *env); #else +#define kvm_has_sync_mmu() (0) #define kvm_enabled() (0) #define kvm_nested 0 #define qemu_kvm_irqchip_in_kernel() (0) diff --git a/target-ppc/helper.c b/target-ppc/helper.c index 5a7a935..3629c99 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -29,6 +29,7 @@ #include "helper_regs.h" #include "qemu-common.h" #include "kvm.h" +#include "qemu-kvm.h" //#define DEBUG_MMU //#define DEBUG_BATS diff --git a/target-ppc/machine.c b/target-ppc/machine.c index 99ba3eb..ec8e197 100644 --- a/target-ppc/machine.c +++ b/target-ppc/machine.c @@ -1,6 +1,7 @@ #include "hw/hw.h" #include "hw/boards.h" #include "kvm.h" +#include "qemu-kvm.h" void cpu_save(QEMUFile *f, void *opaque) { -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
