diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2016-07-06 08:20:37 +0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2016-07-20 11:58:44 -0300 |
| commit | d9c84f196970f78d4b55ab87e03cbcad7c65f86f (patch) | |
| tree | dd3cde9f926ae952894d63b0d7f0cff0aa7aeac8 /target-i386 | |
| parent | fcc35e7ccaed771790940524f3b0eef7aebfc9b1 (diff) | |
| download | qemu-d9c84f196970f78d4b55ab87e03cbcad7c65f86f.tar.gz | |
target-i386: Use uint32_t for X86CPU.apic_id
Redo 9886e834 (target-i386: Require APIC ID to be explicitly set before
CPU realize) in another way that doesn't use int64_t to detect
if apic-id property has been set.
Use the fact that 0xFFFFFFFF is the broadcast
value that a CPU can't have and set default
uint32_t apic_id to it instead of using int64_t.
Later uint32_t apic_id will be used to drop custom
property setter/getter in favor of static property.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/cpu.c | 4 | ||||
| -rw-r--r-- | target-i386/cpu.h | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 5ac7e975ad..5fc01c61dc 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2946,7 +2946,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) goto out; } - if (cpu->apic_id < 0) { + if (cpu->apic_id == UNASSIGNED_APIC_ID) { error_setg(errp, "apic-id property was not initialized properly"); return; } @@ -3254,7 +3254,7 @@ static void x86_cpu_initfn(Object *obj) #ifndef CONFIG_USER_ONLY /* Any code creating new X86CPU objects have to set apic-id explicitly */ - cpu->apic_id = -1; + cpu->apic_id = UNASSIGNED_APIC_ID; #endif for (w = 0; w < FEATURE_WORDS; w++) { diff --git a/target-i386/cpu.h b/target-i386/cpu.h index b2ab8bf4be..10d562d4ea 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -845,6 +845,11 @@ typedef struct { #define NB_OPMASK_REGS 8 +/* CPU can't have 0xFFFFFFFF APIC ID, use that value to distinguish + * that APIC ID hasn't been set yet + */ +#define UNASSIGNED_APIC_ID 0xFFFFFFFF + typedef union X86LegacyXSaveArea { struct { uint16_t fcw; @@ -1174,7 +1179,7 @@ struct X86CPU { bool expose_kvm; bool migratable; bool host_features; - int64_t apic_id; + uint32_t apic_id; /* if true the CPUID code directly forward host cache leaves to the guest */ bool cache_info_passthrough; |