Alexander Graf <ag...@suse.de> writes: > On Dec 20, 2013, at 11:55 AM, Alexander Graf <ag...@suse.de> wrote: > >> >> On 19.12.2013, at 17:04, Aneesh Kumar K.V <aneesh.ku...@linux.vnet.ibm.com> >> wrote: >> >>> From: "Aneesh Kumar K.V" <aneesh.ku...@linux.vnet.ibm.com> >>> >>> Targets like ppc64 support different typed of KVM, one which use >>> hypervisor mode and the other which doesn't. Add a new machine >>> property kvm-type that helps in selecting the respective ones >>> We also add a new QEMUMachine callback get_vm_type that helps >>> in mapping the string representation of kvm type specified. >>> >>> Signed-off-by: Aneesh Kumar K.V <aneesh.ku...@linux.vnet.ibm.com> >> >> Thanks, applied to ppc-next. > > This breaks compilation for ppc{,64}-linux-user. Please fix that up > and submit a v5. I've taken this patch from my tree for now :).
Sent v5 with the below fix folded diff --git a/kvm-stub.c b/kvm-stub.c index c27b69076572..6dd4454a640c 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -19,8 +19,6 @@ #include "hw/pci/msi.h" #endif -#include "hw/boards.h" - KVMState *kvm_state; bool kvm_kernel_irqchip; bool kvm_async_interrupts_allowed; @@ -30,6 +28,7 @@ bool kvm_gsi_routing_allowed; bool kvm_gsi_direct_mapping; bool kvm_allowed; bool kvm_readonly_mem_allowed; +typedef struct QEMUMachine QEMUMachine; int kvm_init_vcpu(CPUState *cpu) {