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>
This commit is contained in:
parent
fcc35e7cca
commit
d9c84f1969
|
@ -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++) {
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue