yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-10-20 01:48:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

target-i386: Move CPUX86State.cpuid_apic_id to X86CPU.apic_id

Browse Source 
The field doesn't need to be inside CPUState, and it is not specific for
the CPUID instruction, so move and rename it.

Backports commit 9e9d3863adcbd1ffeca30f240f49805b00ba0d87 from qemu
This commit is contained in:
Eduardo Habkost 2018-02-12 15:41:30 -05:00 committed by Lioncash
parent 92c076c042
commit 81cae9834a
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qemu/target-i386/cpu-qom.h
View File

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

16
qemu/target-i386/cpu.c
View File

@ -1513,7 +1513,7 @@ static void x86_cpuid_get_apic_id(struct uc_struct *uc, Object *obj, Visitor *v,
const char *name, Error **errp)
{
X86CPU *cpu = X86_CPU(uc, obj);
int64_t value = cpu->env.cpuid_apic_id;
int64_t value = cpu->apic_id;
visit_type_int(v, &value, name, errp);
}
@ -1546,11 +1546,11 @@ static int x86_cpuid_set_apic_id(struct uc_struct *uc, Object *obj, Visitor *v,
return -1;
}
if ((value != cpu->env.cpuid_apic_id) && cpu_exists(uc, value)) {
if ((value != cpu->apic_id) && cpu_exists(uc, value)) {
error_setg(errp, "CPU with APIC ID %" PRIi64 " exists", value);
return -1;
}
cpu->env.cpuid_apic_id = (uint32_t)value;
cpu->apic_id = (uint32_t)value;
return 0;
}
@ -1928,7 +1928,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
break;
case 1:
*eax = env->cpuid_version;
*ebx = (env->cpuid_apic_id << 24) | 8 << 8; /* CLFLUSH size in quad words, Linux wants it. */
*ebx = (cpu->apic_id << 24) |
8 << 8; /* CLFLUSH size in quad words, Linux wants it. */
*ecx = env->features[FEAT_1_ECX];
*edx = env->features[FEAT_1_EDX];
if (cs->nr_cores * cs->nr_threads > 1) {
@ -2326,7 +2327,7 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp)
object_property_add_child(OBJECT(cpu), "apic",
OBJECT(cpu->apic_state), NULL);
//qdev_prop_set_uint8(cpu->apic_state, "id", env->cpuid_apic_id);
//qdev_prop_set_uint8(cpu->apic_state, "id", cpu->apic_id);
/* TODO: convert to link<> */
apic = APIC_COMMON(cpu->apic_state);
apic->cpu = cpu;
@ -2493,7 +2494,7 @@ static void x86_cpu_initfn(struct uc_struct *uc, Object *obj, void *opaque)
NULL, NULL, (void *)cpu->filtered_features, NULL);
cpu->hyperv_spinlock_attempts = HYPERV_SPINLOCK_NEVER_RETRY;
env->cpuid_apic_id = x86_cpu_apic_id_from_index(cs->cpu_index);
cpu->apic_id = x86_cpu_apic_id_from_index(cs->cpu_index);
x86_cpu_load_def(cpu, xcc->cpu_def, &error_abort);
@ -2505,9 +2506,8 @@ static void x86_cpu_initfn(struct uc_struct *uc, Object *obj, void *opaque)
static int64_t x86_cpu_get_arch_id(CPUState *cs)
{
X86CPU *cpu = X86_CPU(cs->uc, cs);
CPUX86State *env = &cpu->env;
return env->cpuid_apic_id;
return cpu->apic_id;
}
static bool x86_cpu_get_paging_enabled(const CPUState *cs)

1
qemu/target-i386/cpu.h
View File

@ -939,7 +939,6 @@ typedef struct CPUX86State {
uint32_t cpuid_version;
FeatureWordArray features;
uint32_t cpuid_model[12];
uint32_t cpuid_apic_id;
/* MTRRs */
uint64_t mtrr_fixed[11];