Re: [PATCH v2 02/20] hw/pci-host/q35: Inline sysbus_add_io()
On 31/01/2023 12.53, Bernhard Beschow wrote: sysbus_add_io() just wraps memory_region_add_subregion() while also obscuring where the memory is attached. So use memory_region_add_subregion() directly and attach it to the existing memory region s->mch.address_space_io which is set as an alias to get_system_io() by the q35 machine. Signed-off-by: Bernhard Beschow --- hw/pci-host/q35.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 26390863d6..fa05844319 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -50,10 +50,12 @@ static void q35_host_realize(DeviceState *dev, Error **errp) Q35PCIHost *s = Q35_HOST_DEVICE(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev); -sysbus_add_io(sbd, MCH_HOST_BRIDGE_CONFIG_ADDR, >conf_mem); +memory_region_add_subregion(s->mch.address_space_io, +MCH_HOST_BRIDGE_CONFIG_ADDR, >conf_mem); sysbus_init_ioports(sbd, MCH_HOST_BRIDGE_CONFIG_ADDR, 4); -sysbus_add_io(sbd, MCH_HOST_BRIDGE_CONFIG_DATA, >data_mem); +memory_region_add_subregion(s->mch.address_space_io, +MCH_HOST_BRIDGE_CONFIG_DATA, >data_mem); sysbus_init_ioports(sbd, MCH_HOST_BRIDGE_CONFIG_DATA, 4); /* register q35 0xcf8 port as coalesced pio */ Reviewed-by: Thomas Huth
[PATCH v2 02/20] hw/pci-host/q35: Inline sysbus_add_io()
sysbus_add_io() just wraps memory_region_add_subregion() while also obscuring where the memory is attached. So use memory_region_add_subregion() directly and attach it to the existing memory region s->mch.address_space_io which is set as an alias to get_system_io() by the q35 machine. Signed-off-by: Bernhard Beschow --- hw/pci-host/q35.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 26390863d6..fa05844319 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -50,10 +50,12 @@ static void q35_host_realize(DeviceState *dev, Error **errp) Q35PCIHost *s = Q35_HOST_DEVICE(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev); -sysbus_add_io(sbd, MCH_HOST_BRIDGE_CONFIG_ADDR, >conf_mem); +memory_region_add_subregion(s->mch.address_space_io, +MCH_HOST_BRIDGE_CONFIG_ADDR, >conf_mem); sysbus_init_ioports(sbd, MCH_HOST_BRIDGE_CONFIG_ADDR, 4); -sysbus_add_io(sbd, MCH_HOST_BRIDGE_CONFIG_DATA, >data_mem); +memory_region_add_subregion(s->mch.address_space_io, +MCH_HOST_BRIDGE_CONFIG_DATA, >data_mem); sysbus_init_ioports(sbd, MCH_HOST_BRIDGE_CONFIG_DATA, 4); /* register q35 0xcf8 port as coalesced pio */ -- 2.39.1
