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/intc | |
parent | 2188cc52cb363433751f72b991d8fb05fc60e39d (diff) | |
download | qemu-8d42d2d32b508484106f1c600f5cdd5496bc867e.zip qemu-8d42d2d32b508484106f1c600f5cdd5496bc867e.tar.gz qemu-8d42d2d32b508484106f1c600f5cdd5496bc867e.tar.bz2 |
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/intc')
-rw-r--r-- | hw/intc/apic_common.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 0032b97..c0b32eb 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -296,7 +296,6 @@ static void apic_common_realize(DeviceState *dev, Error **errp) APICCommonClass *info; static DeviceState *vapic; static int apic_no; - static bool mmio_registered; if (apic_no >= MAX_APICS) { error_setg(errp, "%s initialization failed.", @@ -307,11 +306,6 @@ static void apic_common_realize(DeviceState *dev, Error **errp) info = APIC_COMMON_GET_CLASS(s); info->realize(dev, errp); - if (!mmio_registered) { - ICCBus *b = ICC_BUS(qdev_get_parent_bus(dev)); - memory_region_add_subregion(b->apic_address_space, 0, &s->io_memory); - mmio_registered = true; - } /* Note: We need at least 1M to map the VAPIC option ROM */ if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK && |