hw/sysbus: Inline and remove sysbus_add_io()
PATCH 1/1 hw/sysbus: Inline and remove sysbus_add_io()
sysbus_add_io(...) is a simple wrapper to memory_region_add_subregion(get_system_io(), ...). It is used in 3 places; inline it directly.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
--- include/hw/sysbus.h | 2 -- hw/core/sysbus.c | 6 ------ hw/i386/kvmvapic.c | 2 +- hw/mips/mipssim.c | 2 +- hw/nvram/fw_cfg.c | 5 +++-- 5 files changed, 5 insertions(+), 12 deletions(-)
include/hw/sysbus.h +0 -2
@@ -83,8 +83,6 @@ void sysbus_mmio_map(SysBusDevice *dev, int n, hwaddr addr);void sysbus_mmio_map_overlap (SysBusDevice *dev,int n,hwaddr addr,int priority);void sysbus_mmio_unmap (SysBusDevice *dev,int n); -void sysbus_add_io (SysBusDevice *dev,hwaddr addr, -MemoryRegion *mem);MemoryRegion *sysbus_address_space (SysBusDevice *dev);bool sysbus_realize (SysBusDevice *dev,Error **errp);
hw/core/sysbus.c +0 -6
@@ -298,12 +298,6 @@ static char *sysbus_get_fw_dev_path(DeviceState *dev)return g_strdup (qdev_fw_name (dev)); } -void sysbus_add_io (SysBusDevice *dev,hwaddr addr, -MemoryRegion *mem) -{ -memory_region_add_subregion (get_system_io (), addr, mem); -} -MemoryRegion *sysbus_address_space (SysBusDevice *dev) {return get_system_memory ();
hw/i386/kvmvapic.c +1 -1
@@ -727,7 +727,7 @@ static void vapic_realize(DeviceState *dev, Error **errp)VAPICROMState *s =VAPIC (dev);memory_region_init_io (&s->io,OBJECT (s), &vapic_ops, s,"kvmvapic" ,2 ); -sysbus_add_io (sbd,VAPIC_IO_PORT , &s->io); +memory_region_add_subregion (get_system_io (),VAPIC_IO_PORT , &s->io);sysbus_init_ioports (sbd,VAPIC_IO_PORT ,2 ); option_rom[nb_option_roms].name ="kvmvapic.bin" ;
hw/mips/mipssim.c +1 -1
@@ -226,7 +226,7 @@ mips_mipssim_init(MachineState *machine)qdev_prop_set_uint8 (dev,"endianness" ,DEVICE_LITTLE_ENDIAN );sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , env->irq[4 ]); -sysbus_add_io (SYS_BUS_DEVICE (dev),0x3f8 , +memory_region_add_subregion (get_system_io (),0x3f8 ,sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 )); }
hw/nvram/fw_cfg.c +3 -2
@@ -1142,6 +1142,7 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase,SysBusDevice *sbd;FWCfgIoState *ios;FWCfgState *s; +MemoryRegion *iomem =get_system_io ();bool dma_requested = dma_iobase && dma_as; dev =qdev_new (TYPE_FW_CFG_IO );
@@ -1155,7 +1156,7 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase, sbd =SYS_BUS_DEVICE (dev);sysbus_realize_and_unref (sbd, &error_fatal); ios =FW_CFG_IO (dev); -sysbus_add_io (sbd, iobase, &ios->comb_iomem); +memory_region_add_subregion (iomem, iobase, &ios->comb_iomem); s =FW_CFG (dev);
@@ -1163,7 +1164,7 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase,/* 64 bits for the address field */ s->dma_as = dma_as; s->dma_addr =0 ; -sysbus_add_io (sbd, dma_iobase, &s->dma_iomem); +memory_region_add_subregion (iomem, dma_iobase, &s->dma_iomem); }return s;
Signature · 1 line
2.41.0
Quoted 3 lines · Philippe Mathieu-Daudé
sysbus_add_io(...)is a simple wrapper tomemory_region_add_subregion(get_system_io(), ...). It is used in 3 places; inline it directly.
Rationale here is we want to move to an explicit I/O bus, rather that an implicit one. Besides in heterogeneous setup we can have more than one I/O bus.
Quoted 20 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/hw/sysbus.h | 2 -- hw/core/sysbus.c | 6 ------ hw/i386/kvmvapic.c | 2 +- hw/mips/mipssim.c | 2 +- hw/nvram/fw_cfg.c | 5 +++-- 5 files changed, 5 insertions(+), 12 deletions(-)include/hw/sysbus.h +0
-2@@ -83,8 +83,6 @@ void sysbus_mmio_map(SysBusDevice *dev, int n, hwaddr addr);void sysbus_mmio_map_overlap (SysBusDevice *dev,int n,hwaddr addr,int priority);void sysbus_mmio_unmap (SysBusDevice *dev,int n); -void sysbus_add_io (SysBusDevice *dev,hwaddr addr, -MemoryRegion *mem);MemoryRegion *sysbus_address_space (SysBusDevice *dev);
Quoted 5 lines · Philippe Mathieu-Daudé
sysbus_add_io(...)is a simple wrapper tomemory_region_add_subregion(get_system_io(), ...). It is used in 3 places; inline it directly.
Quoted 9 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/hw/sysbus.h | 2 -- hw/core/sysbus.c | 6 ------ hw/i386/kvmvapic.c | 2 +- hw/mips/mipssim.c | 2 +- hw/nvram/fw_cfg.c | 5 +++-- 5 files changed, 5 insertions(+), 12 deletions(-)
Reviewed-by Peter Maydell <[email protected]>
thanks
-- PMM