[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/10] hw/m68k/virt: Do not open-code sysbus_create_simple()
|
From: |
Thomas Huth |
|
Subject: |
[PULL 06/10] hw/m68k/virt: Do not open-code sysbus_create_simple() |
|
Date: |
Thu, 2 Nov 2023 11:05:39 +0100 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
Mechanical change using the following coccinelle script:
@@
identifier dev;
expression qom_type;
expression addr;
expression irq;
@@
- dev = qdev_new(qom_type);
- sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
- sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, addr);
- sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);
+ dev = sysbus_create_simple(qom_type, addr, irq);
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
Message-ID: <20231024083010.12453-7-philmd@linaro.org>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
---
hw/m68k/virt.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index e7dc188855..2e49e262ee 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -201,11 +201,8 @@ static void virt_init(MachineState *machine)
sysbus_connect_irq(sysbus, 0, PIC_GPIO(VIRT_GF_TTY_IRQ_BASE));
/* virt controller */
- dev = qdev_new(TYPE_VIRT_CTRL);
- sysbus = SYS_BUS_DEVICE(dev);
- sysbus_realize_and_unref(sysbus, &error_fatal);
- sysbus_mmio_map(sysbus, 0, VIRT_CTRL_MMIO_BASE);
- sysbus_connect_irq(sysbus, 0, PIC_GPIO(VIRT_CTRL_IRQ_BASE));
+ dev = sysbus_create_simple(TYPE_VIRT_CTRL, VIRT_CTRL_MMIO_BASE,
+ PIC_GPIO(VIRT_CTRL_IRQ_BASE));
/* virtio-mmio */
io_base = VIRT_VIRTIO_MMIO_BASE;
--
2.41.0
- [PULL 00/10] m68k patches, Thomas Huth, 2023/11/02
- [PULL 01/10] hw/m68k/irqc: Pass CPU using QOM link property, Thomas Huth, 2023/11/02
- [PULL 02/10] hw/m68k/mcf5206: Pass CPU using QOM link property, Thomas Huth, 2023/11/02
- [PULL 03/10] hw/m68k/mcf_intc: Expose MMIO region via SysBus API, Thomas Huth, 2023/11/02
- [PULL 04/10] hw/m68k/mcf_intc: Pass CPU using QOM link property, Thomas Huth, 2023/11/02
- [PULL 05/10] hw/m68k/next-cube: Do not open-code sysbus_create_simple(), Thomas Huth, 2023/11/02
- [PULL 08/10] hw/m68k/next-cube: Mirror BIOS to address 0, Thomas Huth, 2023/11/02
- [PULL 06/10] hw/m68k/virt: Do not open-code sysbus_create_simple(),
Thomas Huth <=
- [PULL 07/10] hw/char/mcf_uart: Have mcf_uart_create() return DeviceState, Thomas Huth, 2023/11/02
- [PULL 09/10] m68k: Instantiate the ESP SCSI controller for the NeXTcube machine, Thomas Huth, 2023/11/02
- [PULL 10/10] tests/avocado/machine_m68k_nextcube: Fix the download URL for the ROM image, Thomas Huth, 2023/11/02
- Re: [PULL 00/10] m68k patches, Stefan Hajnoczi, 2023/11/02