diff options
| author | Chen Fan <chen.fan.fnst@cn.fujitsu.com> | 2015-09-16 17:19:11 +0800 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2015-10-02 16:22:02 -0300 |
| commit | 8d42d2d32b508484106f1c600f5cdd5496bc867e (patch) | |
| tree | 294c7fa08fda7a570b13f4760b065f741d6bf2a8 /hw/i386 | |
| parent | 2188cc52cb363433751f72b991d8fb05fc60e39d (diff) | |
| download | qemu-8d42d2d32b508484106f1c600f5cdd5496bc867e.tar.gz qemu-8d42d2d32b508484106f1c600f5cdd5496bc867e.tar.bz2 qemu-8d42d2d32b508484106f1c600f5cdd5496bc867e.zip | |
apic: move APIC's MMIO region mapping into APIC
When ICC bus/bridge is removed, APIC MMIO will be left
unmapped since it was mapped into system's address space
indirectly by ICC bridge.
Fix it by moving mapping into APIC code, so it would be
possible to remove ICC bus/bridge code later.
Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/pc.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 01eefa3e09..6a20e16e3f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1158,13 +1158,6 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) object_unref(OBJECT(cpu)); } - /* map APIC MMIO area if CPU has APIC */ - if (cpu && cpu->apic_state) { - /* XXX: what if the base changes? */ - sysbus_mmio_map_overlap(SYS_BUS_DEVICE(icc_bridge), 0, - APIC_DEFAULT_ADDRESS, 0x1000); - } - /* tell smbios about cpuid version and features */ smbios_set_cpuid(cpu->env.cpuid_version, cpu->env.features[FEAT_1_EDX]); } |