| Message ID | 1425435224-2630-6-git-send-email-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
Am 04.03.2015 um 03:13 schrieb Eduardo Habkost: > On softmuu, instead of setting APIC ID automatically when creating a > X86CPU, require the property to be set before realizing the object > (which is already done by the CPU creation code on PC). > > Keep apic_id = 0 by default on *-user so it can simply create a new CPU > object and realize it without extra steps (so target-i386 will be able > to use cpu_generic_init() eventually). > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > target-i386/cpu-qom.h | 2 +- > target-i386/cpu.c | 10 ++++++++++ > 2 files changed, 11 insertions(+), 1 deletion(-) Reviewed-by: Andreas Färber <afaerber@suse.de> Thanks, Andreas
diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h index 4a6f48a..31a0c1e 100644 --- a/target-i386/cpu-qom.h +++ b/target-i386/cpu-qom.h @@ -93,7 +93,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/target-i386/cpu.c b/target-i386/cpu.c index 49a5e58..45700fb 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2779,6 +2779,11 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) Error *local_err = NULL; static bool ht_warned; + if (cpu->apic_id < 0) { + error_setg(errp, "apic-id property was not initialized properly"); + return; + } + if (env->features[FEAT_7_0_EBX] && env->cpuid_level < 7) { env->cpuid_level = 7; } @@ -2890,6 +2895,11 @@ static void x86_cpu_initfn(Object *obj) cpu->hyperv_spinlock_attempts = HYPERV_SPINLOCK_NEVER_RETRY; +#ifndef CONFIG_USER_ONLY + /* Any code creating new X86CPU objects have to set apic-id explicitly */ + cpu->apic_id = -1; +#endif + x86_cpu_load_def(cpu, xcc->cpu_def, &error_abort); /* init various static tables used in TCG mode */
On softmuu, instead of setting APIC ID automatically when creating a X86CPU, require the property to be set before realizing the object (which is already done by the CPU creation code on PC). Keep apic_id = 0 by default on *-user so it can simply create a new CPU object and realize it without extra steps (so target-i386 will be able to use cpu_generic_init() eventually). Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- target-i386/cpu-qom.h | 2 +- target-i386/cpu.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-)