On 25/11/2024 15.05, Philippe Mathieu-Daudé wrote:
> No need to QOM-cast twice, since the intermediate value
> is not used.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> hw/riscv/virt.c | 20 +++++++++-----------
> 1 file changed, 9 insertions(+), 11 deletions(-)
>
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index 45a8c4f819..2feb851f15 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -1140,23 +1140,21 @@ static inline DeviceState *gpex_pcie_init(MemoryRegion *sys_mem,
> dev = qdev_new(TYPE_GPEX_HOST);
>
> /* Set GPEX object properties for the virt machine */
> - object_property_set_uint(OBJECT(GPEX_HOST(dev)), PCI_HOST_ECAM_BASE,
> + object_property_set_uint(OBJECT(dev), PCI_HOST_ECAM_BASE,
> ecam_base, NULL);
> - object_property_set_int(OBJECT(GPEX_HOST(dev)), PCI_HOST_ECAM_SIZE,
> + object_property_set_int(OBJECT(dev), PCI_HOST_ECAM_SIZE,
> ecam_size, NULL);
> - object_property_set_uint(OBJECT(GPEX_HOST(dev)),
> - PCI_HOST_BELOW_4G_MMIO_BASE,
> + object_property_set_uint(OBJECT(dev), PCI_HOST_BELOW_4G_MMIO_BASE,
> mmio_base, NULL);
> - object_property_set_int(OBJECT(GPEX_HOST(dev)), PCI_HOST_BELOW_4G_MMIO_SIZE,
> + object_property_set_int(OBJECT(dev), PCI_HOST_BELOW_4G_MMIO_SIZE,
> mmio_size, NULL);
> - object_property_set_uint(OBJECT(GPEX_HOST(dev)),
> - PCI_HOST_ABOVE_4G_MMIO_BASE,
> + object_property_set_uint(OBJECT(dev), PCI_HOST_ABOVE_4G_MMIO_BASE,
> high_mmio_base, NULL);
> - object_property_set_int(OBJECT(GPEX_HOST(dev)), PCI_HOST_ABOVE_4G_MMIO_SIZE,
> + object_property_set_int(OBJECT(dev), PCI_HOST_ABOVE_4G_MMIO_SIZE,
> high_mmio_size, NULL);
> - object_property_set_uint(OBJECT(GPEX_HOST(dev)), PCI_HOST_PIO_BASE,
> + object_property_set_uint(OBJECT(dev), PCI_HOST_PIO_BASE,
> pio_base, NULL);
> - object_property_set_int(OBJECT(GPEX_HOST(dev)), PCI_HOST_PIO_SIZE,
> + object_property_set_int(OBJECT(dev), PCI_HOST_PIO_SIZE,
> pio_size, NULL);
>
> sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
> @@ -1189,7 +1187,7 @@ static inline DeviceState *gpex_pcie_init(MemoryRegion *sys_mem,
> gpex_set_irq_num(GPEX_HOST(dev), i, PCIE_IRQ + i);
> }
>
> - GPEX_HOST(dev)->gpex_cfg.bus = PCI_HOST_BRIDGE(GPEX_HOST(dev))->bus;
> + GPEX_HOST(dev)->gpex_cfg.bus = PCI_HOST_BRIDGE(dev)->bus;
> return dev;
> }
>
Reviewed-by: Thomas Huth <thuth@redhat.com>