From: Philippe Mathieu-Daudé <phi...@redhat.com> In the previous commits we removed all calls to these functions passing a NULL ISADevice argument. We can simplify and remove the use of the global isabus object.
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> Message-Id: <20210518215545.1793947-11-phi...@redhat.com> Signed-off-by: Bernhard Beschow <shen...@gmail.com> --- include/hw/isa/isa.h | 2 +- hw/isa/isa-bus.c | 30 +++++++++++++++++++++++------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 8dd2953211..486851e7cb 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -108,7 +108,7 @@ void isa_register_ioport(ISADevice *dev, MemoryRegion *io, uint16_t start); * function makes it easy to create multiple MemoryRegions for a single * device and use the legacy portio routines. * - * @dev: the ISADevice against which these are registered; may be NULL. + * @dev: the ISADevice against which these are registered * @piolist: the PortioList associated with the io ports * @start: the base I/O port against which the portio->offset is applied. * @portio: the ports, sorted by offset. diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index d3e2d9de35..8bae5cc473 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -81,8 +81,12 @@ void isa_bus_irqs(ISABus *bus, qemu_irq *irqs) */ qemu_irq isa_get_irq(ISADevice *dev, unsigned isairq) { - assert(!dev || ISA_BUS(qdev_get_parent_bus(DEVICE(dev))) == isabus); + ISABus *isabus; + + assert(dev); assert(isairq < ISA_NUM_IRQS); + isabus = isa_bus_from_device(dev); + return isabus->irqs[isairq]; } @@ -115,6 +119,11 @@ static inline void isa_init_ioport(ISADevice *dev, uint16_t ioport) void isa_register_ioport(ISADevice *dev, MemoryRegion *io, uint16_t start) { + ISABus *isabus; + + assert(dev); + isabus = isa_bus_from_device(dev); + memory_region_add_subregion(isabus->address_space_io, start, io); isa_init_ioport(dev, start); } @@ -124,6 +133,11 @@ void isa_register_portio_list(ISADevice *dev, const MemoryRegionPortio *pio_start, void *opaque, const char *name) { + ISABus *isabus; + + assert(dev); + isabus = isa_bus_from_device(dev); + /* START is how we should treat DEV, regardless of the actual contents of the portio array. This is how the old code actually handled e.g. the FDC device. */ @@ -243,18 +257,20 @@ static char *isabus_get_fw_dev_path(DeviceState *dev) MemoryRegion *isa_address_space(ISADevice *dev) { - if (dev) { - return isa_bus_from_device(dev)->address_space; - } + ISABus *isabus; + + assert(dev); + isabus = isa_bus_from_device(dev); return isabus->address_space; } MemoryRegion *isa_address_space_io(ISADevice *dev) { - if (dev) { - return isa_bus_from_device(dev)->address_space_io; - } + ISABus *isabus; + + assert(dev); + isabus = isa_bus_from_device(dev); return isabus->address_space_io; } -- 2.39.1