diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2014-12-18 23:31:11 -0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2015-03-09 16:30:03 -0300 |
| commit | 9886e834f47adabdbfd54ab606788ce7326e6779 (patch) | |
| tree | dc83315d8b4ea53ebd2686154b7d942153f1ad5f | |
| parent | 54a402930ac6d1a9d6d402229ae8ba8bef7e598e (diff) | |
target-i386: Require APIC ID to be explicitly set before CPU realize
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).
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | target-i386/cpu-qom.h | 2 | ||||
| -rw-r--r-- | target-i386/cpu.c | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h index 4a6f48a8db..31a0c1e776 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 110716e84c..50907d0bf1 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2757,6 +2757,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; } @@ -2868,6 +2873,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 */ |