Factor fw_cfg_init_io_internal() out of fw_cfg_init_io_dma(). In fw_cfg_init_io_dma(), assert DMA arguments are provided.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- hw/nvram/fw_cfg.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 34d7d107678..2699e593860 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -1019,8 +1019,9 @@ static void fw_cfg_common_realize(DeviceState *dev, Error **errp) qemu_add_machine_init_done_notifier(&s->machine_ready); } -FWCfgState *fw_cfg_init_io_dma(MemoryRegion *iomem, uint32_t iobase, - uint32_t dma_iobase, AddressSpace *dma_as) +static FWCfgState *fw_cfg_init_io_internal(MemoryRegion *iomem, + uint32_t iobase, uint32_t dma_iobase, + AddressSpace *dma_as) { DeviceState *dev; SysBusDevice *sbd; @@ -1053,6 +1054,13 @@ FWCfgState *fw_cfg_init_io_dma(MemoryRegion *iomem, uint32_t iobase, return s; } +FWCfgState *fw_cfg_init_io_dma(MemoryRegion *iomem, uint32_t iobase, + uint32_t dma_iobase, AddressSpace *dma_as) +{ + assert(dma_iobase); + return fw_cfg_init_io_internal(iomem, iobase, dma_iobase, dma_as); +} + static FWCfgState *fw_cfg_init_mem_internal(hwaddr ctl_addr, hwaddr data_addr, uint32_t data_width, hwaddr dma_addr, AddressSpace *dma_as) -- 2.51.0
