From a55484021bd48eed2147893eb88e2e89b3a0c60b Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Mon, 12 Feb 2018 15:48:11 -0500 Subject: [PATCH] target-i386: Require APIC ID to be explicitly set before CPU realize Instead of setting APIC ID automatically when creating a X86CPU, require the property to be set before realizing the object (which all callers of cpu_x86_create() already do). Backports commit e1356dd70aef11425883dd4d2885f1d208eb9d57 from qemu --- qemu/target-i386/cpu-qom.h | 2 +- qemu/target-i386/cpu.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/qemu/target-i386/cpu-qom.h b/qemu/target-i386/cpu-qom.h index 14248607..a318454e 100644 --- a/qemu/target-i386/cpu-qom.h +++ b/qemu/target-i386/cpu-qom.h @@ -92,7 +92,7 @@ typedef struct X86CPU { bool expose_kvm; bool migratable; bool host_features; - uint32_t apic_id; + int64_t apic_id; /* if true the CPUID code directly forward host cache leaves to the guest */ bool cache_info_passthrough; diff --git a/qemu/target-i386/cpu.c b/qemu/target-i386/cpu.c index b696306d..ebf19ed7 100644 --- a/qemu/target-i386/cpu.c +++ b/qemu/target-i386/cpu.c @@ -2377,6 +2377,11 @@ static int x86_cpu_realizefn(struct uc_struct *uc, DeviceState *dev, Error **err CPUX86State *env = &cpu->env; Error *local_err = NULL; + if (cpu->apic_id < 0) { + error_setg(errp, "apic-id property was not initialized properly"); + return -1; + } + if (env->features[FEAT_7_0_EBX] && env->cpuid_level < 7) { env->cpuid_level = 7; } @@ -2504,7 +2509,7 @@ static void x86_cpu_initfn(struct uc_struct *uc, Object *obj, void *opaque) NULL, NULL, (void *)cpu->filtered_features, NULL); cpu->hyperv_spinlock_attempts = HYPERV_SPINLOCK_NEVER_RETRY; - cpu->apic_id = x86_cpu_apic_id_from_index(cs->cpu_index); + cpu->apic_id = -1; x86_cpu_load_def(cpu, xcc->cpu_def, &error_abort);