[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 8/9] target-i386: Require APIC ID to be explicitl
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH v2 8/9] target-i386: Require APIC ID to be explicitly set before CPU realize |
Date: |
Tue, 3 Feb 2015 17:39:30 -0200 |
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).
Signed-off-by: Eduardo Habkost <address@hidden>
Cc: Gu Zheng <address@hidden>
---
target-i386/cpu-qom.h | 2 +-
target-i386/cpu.c | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
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 f17fd36..029bfff 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -2789,6 +2789,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;
}
@@ -2932,7 +2937,7 @@ static void x86_cpu_initfn(Object *obj)
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);
--
2.1.0
- [Qemu-devel] [PATCH v2 0/9] target-i386: Simplify APIC ID initialization, move compat code to pc.c, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 2/9] target-i386: Rename cpu_x86_init() to cpu_x86_init_user(), Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 3/9] target-i386: Eliminate cpu_init() function, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 1/9] target-i386: Move topology.h to include/hw/i386, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 4/9] target-i386: Simplify error handling on cpu_x86_init_user(), Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 5/9] target-i386: Move CPUX86State.cpuid_apic_id to X86CPU.apic_id, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 9/9] target-i386: Move APIC ID compatibility code to pc.c, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 6/9] linux-user: Check for cpu_init() errors, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 7/9] target-i386: Set APIC ID using cpu_index on CONFIG_USER, Eduardo Habkost, 2015/02/03
- [Qemu-devel] [PATCH v2 8/9] target-i386: Require APIC ID to be explicitly set before CPU realize,
Eduardo Habkost <=
- Re: [Qemu-devel] [PATCH v2 0/9] target-i386: Simplify APIC ID initialization, move compat code to pc.c, Paolo Bonzini, 2015/02/04