[Qemu-devel] [PATCH 4/8] target-i386: Keep track of apic-id setting

[Eduardo Habkost <ehabkost@redhat.com>]

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 <ehabkost@redhat.com>
Cc: Gu Zheng <guz.fnst@cn.fujitsu.com>
---
 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