Commit dab86234 authored by Laszlo Ersek's avatar Laszlo Ersek Committed by Anthony Liguori
Browse files

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: default avatarLaszlo Ersek <lersek@redhat.com>
Reviewed-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1363821803-3380-9-git-send-email-lersek@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 23084327

hw/apic_common.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

hw/i386/kvmvapic.c

+0 −2
Original line number Diff line number Diff line
@@ -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

target-i386/cpu.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

    }

}

target-i386/cpu.h

+2 −0
Original line number Diff line number Diff line
@@ -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 */