diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2013-03-21 00:23:20 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-04 19:23:09 -0500 |
| commit | dab8623430926a8c55a149c22b2b8e2edb786ae3 (patch) | |
| tree | 5615603abe612879585ae46ad937c9060c865ada | |
| parent | 23084327dc5c2f42e8a1c3e39ec565e344c7f52e (diff) | |
| download | focaccia-qemu-dab8623430926a8c55a149c22b2b8e2edb786ae3.tar.gz focaccia-qemu-dab8623430926a8c55a149c22b2b8e2edb786ae3.zip | |
extract/unify the constant 0xfee00000 as APIC_DEFAULT_ADDRESS
A common dependency of the constant's current users: - hw/apic_common.c - hw/i386/kvmvapic.c - target-i386/cpu.c is "target-i386/cpu.h". Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Message-id: 1363821803-3380-9-git-send-email-lersek@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/apic_common.c | 2 | ||||
| -rw-r--r-- | hw/i386/kvmvapic.c | 2 | ||||
| -rw-r--r-- | target-i386/cpu.c | 4 | ||||
| -rw-r--r-- | target-i386/cpu.h | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/hw/apic_common.c b/hw/apic_common.c index d0c261602c..37985097ca 100644 --- a/hw/apic_common.c +++ b/hw/apic_common.c @@ -218,7 +218,7 @@ static void apic_reset_common(DeviceState *d) bool bsp; bsp = cpu_is_bsp(s->cpu); - s->apicbase = 0xfee00000 | + s->apicbase = APIC_DEFAULT_ADDRESS | (bsp ? MSR_IA32_APICBASE_BSP : 0) | MSR_IA32_APICBASE_ENABLE; s->vapic_paddr = 0; diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index c151c95c3e..cc95e5c3f0 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -13,8 +13,6 @@ #include "sysemu/kvm.h" #include "hw/apic_internal.h" -#define APIC_DEFAULT_ADDRESS 0xfee00000 - #define VAPIC_IO_PORT 0x7e #define VAPIC_CPU_SHIFT 7 diff --git a/target-i386/cpu.c b/target-i386/cpu.c index bf717d5e15..69c3570a15 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2049,8 +2049,6 @@ static void mce_init(X86CPU *cpu) } } -#define MSI_ADDR_BASE 0xfee00000 - #ifndef CONFIG_USER_ONLY static void x86_cpu_apic_init(X86CPU *cpu, Error **errp) { @@ -2090,7 +2088,7 @@ static void x86_cpu_apic_init(X86CPU *cpu, Error **errp) on the global memory bus. */ /* XXX: what if the base changes? */ sysbus_mmio_map_overlap(SYS_BUS_DEVICE(env->apic_state), 0, - MSI_ADDR_BASE, 0x1000); + APIC_DEFAULT_ADDRESS, 0x1000); apic_mapped = 1; } } diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 5284ebc1ed..069a2e2cf9 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1267,4 +1267,6 @@ const char *get_register_name_32(unsigned int reg); uint32_t x86_cpu_apic_id_from_index(unsigned int cpu_index); void enable_compat_apic_id_mode(void); +#define APIC_DEFAULT_ADDRESS 0xfee00000 + #endif /* CPU_I386_H */ |