diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-10-10 12:18:02 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-10-30 22:38:37 +0100 |
| commit | 449994eb58a4175a2e7656175b18c65ead6c09ca (patch) | |
| tree | b54e34b26b4b4d5e2f39caab225a8ca3d8224be1 | |
| parent | bdeec802170d5dc9f0f8a01235c3488dca3ff83b (diff) | |
| download | focaccia-qemu-449994eb58a4175a2e7656175b18c65ead6c09ca.tar.gz focaccia-qemu-449994eb58a4175a2e7656175b18c65ead6c09ca.zip | |
target-i386: Inline APIC cpu_env property setting
This prepares for changing the variable type from void*. Signed-off-by: Andreas Färber <afaerber@suse.de> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
| -rw-r--r-- | hw/apic_common.c | 1 | ||||
| -rw-r--r-- | target-i386/cpu.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/hw/apic_common.c b/hw/apic_common.c index d68116d490..b13f23c991 100644 --- a/hw/apic_common.c +++ b/hw/apic_common.c @@ -368,7 +368,6 @@ static const VMStateDescription vmstate_apic_common = { static Property apic_properties_common[] = { DEFINE_PROP_UINT8("id", APICCommonState, id, -1), - DEFINE_PROP_PTR("cpu_env", APICCommonState, cpu_env), DEFINE_PROP_BIT("vapic", APICCommonState, vapic_control, VAPIC_ENABLE_BIT, true), DEFINE_PROP_END_OF_LIST(), diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 18b8549a6f..c30cc799de 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -41,6 +41,7 @@ #ifndef CONFIG_USER_ONLY #include "hw/xen.h" #include "hw/sysbus.h" +#include "hw/apic_internal.h" #endif /* feature flags taken from "Intel Processor Identification and the CPUID @@ -1892,6 +1893,7 @@ static void x86_cpu_apic_init(X86CPU *cpu, Error **errp) { static int apic_mapped; CPUX86State *env = &cpu->env; + APICCommonState *apic; const char *apic_type = "apic"; if (kvm_irqchip_in_kernel()) { @@ -1910,7 +1912,8 @@ static void x86_cpu_apic_init(X86CPU *cpu, Error **errp) OBJECT(env->apic_state), NULL); qdev_prop_set_uint8(env->apic_state, "id", env->cpuid_apic_id); /* TODO: convert to link<> */ - qdev_prop_set_ptr(env->apic_state, "cpu_env", env); + apic = APIC_COMMON(env->apic_state); + apic->cpu_env = env; if (qdev_init(env->apic_state)) { error_setg(errp, "APIC device '%s' could not be initialized", |