ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Laszlo Ersek 2013-03-21 00:23:20 +01:00 committed by Anthony Liguori
parent 23084327dc
commit dab8623430
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/apic_common.c
View File

@ -218,7 +218,7 @@ static void apic_reset_common(DeviceState *d)
bool bsp; bool bsp;
bsp = cpu_is_bsp(s->cpu); bsp = cpu_is_bsp(s->cpu);
s->apicbase = 0xfee00000 | s->apicbase = APIC_DEFAULT_ADDRESS |
(bsp ? MSR_IA32_APICBASE_BSP : 0) | MSR_IA32_APICBASE_ENABLE; (bsp ? MSR_IA32_APICBASE_BSP : 0) | MSR_IA32_APICBASE_ENABLE;
s->vapic_paddr = 0; s->vapic_paddr = 0;

2
hw/i386/kvmvapic.c
View File

@ -13,8 +13,6 @@
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
#include "hw/apic_internal.h" #include "hw/apic_internal.h"
#define APIC_DEFAULT_ADDRESS 0xfee00000
#define VAPIC_IO_PORT 0x7e #define VAPIC_IO_PORT 0x7e
#define VAPIC_CPU_SHIFT 7 #define VAPIC_CPU_SHIFT 7

4
target-i386/cpu.c
View File

@ -2049,8 +2049,6 @@ static void mce_init(X86CPU *cpu)
} }
} }
#define MSI_ADDR_BASE 0xfee00000
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
static void x86_cpu_apic_init(X86CPU *cpu, Error **errp) 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. */ on the global memory bus. */
/* XXX: what if the base changes? */ /* XXX: what if the base changes? */
sysbus_mmio_map_overlap(SYS_BUS_DEVICE(env->apic_state), 0, sysbus_mmio_map_overlap(SYS_BUS_DEVICE(env->apic_state), 0,
MSI_ADDR_BASE, 0x1000); APIC_DEFAULT_ADDRESS, 0x1000);
apic_mapped = 1; apic_mapped = 1;
} }
} }

2
target-i386/cpu.h
View File

@ -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); uint32_t x86_cpu_apic_id_from_index(unsigned int cpu_index);
void enable_compat_apic_id_mode(void); void enable_compat_apic_id_mode(void);
#define APIC_DEFAULT_ADDRESS 0xfee00000
#endif /* CPU_I386_H */ #endif /* CPU_I386_H */