Signed-off-by: Michael S. Tsirkin mst@redhat.com Signed-off-by: Laszlo Ersek lersek@redhat.com Signed-off-by: Michael S. Tsirkin mst@redhat.com --- hw/i386/pc.c | 2 -- include/hw/i386/apic.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 197d218..f13dde5 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -75,8 +75,6 @@ #define FW_CFG_E820_TABLE (FW_CFG_ARCH_LOCAL + 3) #define FW_CFG_HPET (FW_CFG_ARCH_LOCAL + 4)
-#define IO_APIC_DEFAULT_ADDRESS 0xfec00000 - #define E820_NR_ENTRIES 16
struct e820_entry { diff --git a/include/hw/i386/apic.h b/include/hw/i386/apic.h index 1d48e02..edbb37f 100644 --- a/include/hw/i386/apic.h +++ b/include/hw/i386/apic.h @@ -26,6 +26,8 @@ void apic_designate_bsp(DeviceState *d); /* pc.c */ DeviceState *cpu_get_current_apic(void);
+#define IO_APIC_DEFAULT_ADDRESS 0xfec00000 + /* cpu.c */ bool cpu_is_bsp(X86CPU *cpu);