mirrors-yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn synced 2024-11-25 16:35:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

target-i386: Require APIC ID to be explicitly set before CPU realize

Browse source 
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).

Backports commit e1356dd70aef11425883dd4d2885f1d208eb9d57 from qemu
This commit is contained in:
Eduardo Habkost 2018-02-12 15:48:11 -05:00 committed by Lioncash
parent ce36141f10
commit a55484021b
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qemu/target-i386/cpu-qom.h
View file

@ -92,7 +92,7 @@ typedef struct X86CPU {
bool expose_kvm; bool expose_kvm;
bool migratable; bool migratable;
bool host_features; bool host_features;
uint32_t apic_id; int64_t apic_id;
/* if true the CPUID code directly forward host cache leaves to the guest */ /* if true the CPUID code directly forward host cache leaves to the guest */
bool cache_info_passthrough; bool cache_info_passthrough;

7
qemu/target-i386/cpu.c
View file

@ -2377,6 +2377,11 @@ static int x86_cpu_realizefn(struct uc_struct *uc, DeviceState *dev, Error **err
CPUX86State *env = &cpu->env; CPUX86State *env = &cpu->env;
Error *local_err = NULL; Error *local_err = NULL;
if (cpu->apic_id < 0) {
error_setg(errp, "apic-id property was not initialized properly");
return -1;
}
if (env->features[FEAT_7_0_EBX] && env->cpuid_level < 7) { if (env->features[FEAT_7_0_EBX] && env->cpuid_level < 7) {
env->cpuid_level = 7; env->cpuid_level = 7;
} }
@ -2504,7 +2509,7 @@ static void x86_cpu_initfn(struct uc_struct *uc, Object *obj, void *opaque)
NULL, NULL, (void *)cpu->filtered_features, NULL); NULL, NULL, (void *)cpu->filtered_features, NULL);
cpu->hyperv_spinlock_attempts = HYPERV_SPINLOCK_NEVER_RETRY; 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); x86_cpu_load_def(cpu, xcc->cpu_def, &error_abort);