[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/8] target-i386: Keep track of apic-id setting
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 4/8] target-i386: Keep track of apic-id setting |
Date: |
Fri, 19 Dec 2014 00:41:20 -0200 |
Set a flag indicating that the apic-id property was set, so we can later
ensure we won't try to realize a X86CPU object before apic-id was set.
Signed-off-by: Eduardo Habkost <address@hidden>
Cc: Gu Zheng <address@hidden>
---
target-i386/cpu-qom.h | 1 +
target-i386/cpu.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h
index 4a6f48a..ba0ee15 100644
--- a/target-i386/cpu-qom.h
+++ b/target-i386/cpu-qom.h
@@ -94,6 +94,7 @@ typedef struct X86CPU {
bool migratable;
bool host_features;
uint32_t apic_id;
+ bool apic_id_set;
/* 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 cbed717..bb9525d 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1691,7 +1691,7 @@ static void x86_cpuid_get_apic_id(Object *obj, Visitor
*v, void *opaque,
const char *name, Error **errp)
{
X86CPU *cpu = X86_CPU(obj);
- int64_t value = cpu->apic_id;
+ int64_t value = cpu->apic_id_set ? cpu->apic_id : -1;
visit_type_int(v, &value, name, errp);
}
@@ -1729,6 +1729,7 @@ static void x86_cpuid_set_apic_id(Object *obj, Visitor
*v, void *opaque,
return;
}
cpu->apic_id = value;
+ cpu->apic_id_set = true;
}
/* Generic getter for "feature-words" and "filtered-features" properties */
--
1.9.3
- [Qemu-devel] [PATCH 0/8] target-i386: Simplify APIC ID initialization, move compat code to pc.c, Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 1/8] target-i386: Rename cpu_x86_init() to cpu_x86_init_user(), Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 4/8] target-i386: Keep track of apic-id setting,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 3/8] target-i386: Move CPUX86State.cpuid_apic_id to X86CPU.apic_id, Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 6/8] target-i386: Don't set APIC ID on instance_init, Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 2/8] target-i386: Eliminate cpu_init() function, Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 5/8] target-i386: Set APIC ID using cpu_index on CONFIG_USER, Eduardo Habkost, 2014/12/18
- [Qemu-devel] [PATCH 7/8] target-i386: Move topology.h to hw/i386/topology.h, Eduardo Habkost, 2014/12/18