MP State is implemented in the generic code, so let's move the variable it accesses to generic code as well.
Still unbreaks PPC and now even S390x w/ KVM. Signed-off-by: Alexander Graf <ag...@suse.de> --- cpu-defs.h | 1 + target-i386/cpu.h | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cpu-defs.h b/cpu-defs.h index 95068b5..ad804e6 100644 --- a/cpu-defs.h +++ b/cpu-defs.h @@ -197,6 +197,7 @@ typedef struct CPUWatchpoint { const char *cpu_model_str; \ struct KVMState *kvm_state; \ struct kvm_run *kvm_run; \ + uint32_t mp_state; \ int kvm_fd; #endif diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 5929d28..8d0c2a9 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -692,7 +692,6 @@ typedef struct CPUX86State { /* For KVM */ uint64_t interrupt_bitmap[256 / 64]; - uint32_t mp_state; /* in order to simplify APIC support, we leave this pointer to the user */ -- 1.6.0.2