mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests 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 CPUX86State, and it is not specific
for the CPUID instruction, so move and rename it.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2014-12-18 23:20:10 -02:00
parent 0f4b210e50
commit 7e72a45c99
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,6 +93,7 @@ typedef struct X86CPU {
bool expose_kvm; bool expose_kvm;
bool migratable; bool migratable;
bool host_features; bool host_features;
uint32_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;

15
target-i386/cpu.c
View File

@ -1690,7 +1690,7 @@ static void x86_cpuid_get_apic_id(Object *obj, Visitor *v, void *opaque,
const char *name, Error **errp) const char *name, Error **errp)
{ {
X86CPU *cpu = X86_CPU(obj); X86CPU *cpu = X86_CPU(obj);
int64_t value = cpu->env.cpuid_apic_id; int64_t value = cpu->apic_id;
visit_type_int(v, &value, name, errp); visit_type_int(v, &value, name, errp);
} }
@ -1723,11 +1723,11 @@ static void x86_cpuid_set_apic_id(Object *obj, Visitor *v, void *opaque,
return; return;
} }
if ((value != cpu->env.cpuid_apic_id) && cpu_exists(value)) { if ((value != cpu->apic_id) && cpu_exists(value)) {
error_setg(errp, "CPU with APIC ID %" PRIi64 " exists", value); error_setg(errp, "CPU with APIC ID %" PRIi64 " exists", value);
return; return;
} }
cpu->env.cpuid_apic_id = value; cpu->apic_id = value;
} }
/* Generic getter for "feature-words" and "filtered-features" properties */ /* Generic getter for "feature-words" and "filtered-features" properties */
@ -2252,7 +2252,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
break; break;
case 1: case 1:
*eax = env->cpuid_version; *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]; *ecx = env->features[FEAT_1_ECX];
*edx = env->features[FEAT_1_EDX]; *edx = env->features[FEAT_1_EDX];
if (cs->nr_cores * cs->nr_threads > 1) { if (cs->nr_cores * cs->nr_threads > 1) {
@ -2699,7 +2700,6 @@ static void mce_init(X86CPU *cpu)
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) static void x86_cpu_apic_create(X86CPU *cpu, Error **errp)
{ {
CPUX86State *env = &cpu->env;
DeviceState *dev = DEVICE(cpu); DeviceState *dev = DEVICE(cpu);
APICCommonState *apic; APICCommonState *apic;
const char *apic_type = "apic"; const char *apic_type = "apic";
@ -2718,7 +2718,7 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp)
object_property_add_child(OBJECT(cpu), "apic", object_property_add_child(OBJECT(cpu), "apic",
OBJECT(cpu->apic_state), NULL); 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<> */ /* TODO: convert to link<> */
apic = APIC_COMMON(cpu->apic_state); apic = APIC_COMMON(cpu->apic_state);
apic->cpu = cpu; apic->cpu = cpu;
@ -2914,9 +2914,8 @@ static void x86_cpu_initfn(Object *obj)
static int64_t x86_cpu_get_arch_id(CPUState *cs) static int64_t x86_cpu_get_arch_id(CPUState *cs)
{ {
X86CPU *cpu = X86_CPU(cs); X86CPU *cpu = X86_CPU(cs);
CPUX86State *env = &cpu->env;
return env->cpuid_apic_id; return cpu->apic_id;
} }
static bool x86_cpu_get_paging_enabled(const CPUState *cs) static bool x86_cpu_get_paging_enabled(const CPUState *cs)

1
target-i386/cpu.h
View File

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

2
target-i386/kvm.c
View File

@ -430,7 +430,7 @@ static void cpu_update_state(void *opaque, int running, RunState state)
unsigned long kvm_arch_vcpu_id(CPUState *cs) unsigned long kvm_arch_vcpu_id(CPUState *cs)
{ {
X86CPU *cpu = X86_CPU(cs); X86CPU *cpu = X86_CPU(cs);
return cpu->env.cpuid_apic_id; return cpu->apic_id;
} }
#ifndef KVM_CPUID_SIGNATURE_NEXT #ifndef KVM_CPUID_SIGNATURE_NEXT