diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2013-06-22 08:07:01 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-07-04 17:42:43 +0200 |
| commit | b6f3296292f027c9a87a12dddd736a7c344d0206 (patch) | |
| tree | fd91c43198bc6a01a15fe7ef9a55021c988cc32e /hw/acpi | |
| parent | 8ab9b41876c0ead43648b55576a8f17aa2c8b027 (diff) | |
| download | qemu-b6f3296292f027c9a87a12dddd736a7c344d0206.tar.gz | |
isa: implement isa_is_ioport_assigned via memory_region_find
Open-code isa_is_ioport_assigned via a memory region lookup. As all IO
ports are now directly or indirectly registered via the memory API, this
becomes possible and will finally allow us to drop the ioport tables.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/acpi')
| -rw-r--r-- | hw/acpi/piix4.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 756df3bee2..ff559c0a4a 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -383,14 +383,15 @@ static void piix4_pm_powerdown_req(Notifier *n, void *opaque) static void piix4_pm_machine_ready(Notifier *n, void *opaque) { PIIX4PMState *s = container_of(n, PIIX4PMState, machine_ready); + MemoryRegion *io_as = pci_address_space_io(&s->dev); uint8_t *pci_conf; pci_conf = s->dev.config; - pci_conf[0x5f] = (isa_is_ioport_assigned(0x378) ? 0x80 : 0) | 0x10; + pci_conf[0x5f] = 0x10 | + (memory_region_find(io_as, 0x378, 1).mr ? 0x80 : 0); pci_conf[0x63] = 0x60; - pci_conf[0x67] = (isa_is_ioport_assigned(0x3f8) ? 0x08 : 0) | - (isa_is_ioport_assigned(0x2f8) ? 0x90 : 0); - + pci_conf[0x67] = (memory_region_find(io_as, 0x3f8, 1).mr ? 0x08 : 0) | + (memory_region_find(io_as, 0x2f8, 1).mr ? 0x90 : 0); } static int piix4_pm_initfn(PCIDevice *dev) |