To allow callers to use I/O MemoryRegion different than the global get_system_io(), pass it as argument.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- include/hw/nvram/fw_cfg.h | 4 ++-- hw/i386/fw_cfg.c | 3 ++- hw/i386/microvm.c | 3 ++- hw/i386/pc.c | 3 ++- hw/nvram/fw_cfg.c | 5 ++--- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index c4c49886754..7348cbfbc34 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -305,8 +305,8 @@ bool fw_cfg_add_file_from_generator(FWCfgState *s, Object *parent, const char *part, const char *filename, Error **errp); -FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase, - AddressSpace *dma_as); +FWCfgState *fw_cfg_init_io_dma(MemoryRegion *io, uint32_t iobase, + uint32_t dma_iobase, AddressSpace *dma_as); FWCfgState *fw_cfg_init_mem_nodma(hwaddr ctl_addr, hwaddr data_addr, unsigned data_width); FWCfgState *fw_cfg_init_mem_dma(hwaddr ctl_addr, diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c index 5c0bcd5f8a9..498da9ec69c 100644 --- a/hw/i386/fw_cfg.c +++ b/hw/i386/fw_cfg.c @@ -127,7 +127,8 @@ FWCfgState *fw_cfg_arch_create(MachineState *ms, const CPUArchIdList *cpus = mc->possible_cpu_arch_ids(ms); int nb_numa_nodes = ms->numa_state->num_nodes; - fw_cfg = fw_cfg_init_io_dma(FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4, + fw_cfg = fw_cfg_init_io_dma(get_system_io(), + FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4, &address_space_memory); fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, boot_cpus); diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 94d22a232ac..69f04d74a15 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -289,6 +289,7 @@ static void microvm_memory_init(MicrovmMachineState *mms) X86MachineState *x86ms = X86_MACHINE(mms); MemoryRegion *ram_below_4g, *ram_above_4g; MemoryRegion *system_memory = get_system_memory(); + MemoryRegion *io_memory = get_system_io(); FWCfgState *fw_cfg; ram_addr_t lowmem = 0xc0000000; /* 3G */ int i; @@ -319,7 +320,7 @@ static void microvm_memory_init(MicrovmMachineState *mms) e820_add_entry(0x100000000ULL, x86ms->above_4g_mem_size, E820_RAM); } - fw_cfg = fw_cfg_init_io_dma(FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4, + fw_cfg = fw_cfg_init_io_dma(io_memory, FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4, &address_space_memory); fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, machine->smp.cpus); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 2b8d3982c4a..5c52079be31 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -659,7 +659,8 @@ void xen_load_linux(PCMachineState *pcms) assert(MACHINE(pcms)->kernel_filename != NULL); - fw_cfg = fw_cfg_init_io_dma(FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4, + fw_cfg = fw_cfg_init_io_dma(get_system_io(), + FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4, &address_space_memory); fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, x86ms->boot_cpus); rom_set_fw(fw_cfg); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 3f0d337eb9c..34d7d107678 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -1019,14 +1019,13 @@ 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(uint32_t iobase, uint32_t dma_iobase, - AddressSpace *dma_as) +FWCfgState *fw_cfg_init_io_dma(MemoryRegion *iomem, uint32_t iobase, + uint32_t dma_iobase, AddressSpace *dma_as) { DeviceState *dev; 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); -- 2.51.0
