qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
	"Laurent Vivier" <laurent@vivier.eu>,
	"Thomas Huth" <huth@tuxfamily.org>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 6/6] hw/m68k/virt: Do not open-code sysbus_create_simple()
Date: Fri, 20 Oct 2023 17:06:26 +0200	[thread overview]
Message-ID: <20231020150627.56893-7-philmd@linaro.org> (raw)
In-Reply-To: <20231020150627.56893-1-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>
---
 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 da35e74bd9..31038b8bb0 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



  parent reply	other threads:[~2023-10-20 15:08 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-20 15:06 [PATCH 0/6] hw/m68k: Strengthen QOM/SysBus API uses Philippe Mathieu-Daudé
2023-10-20 15:06 ` [PATCH 1/6] hw/m68k/irqc: Pass CPU using QOM link property Philippe Mathieu-Daudé
2023-10-22  9:18   ` Thomas Huth
2023-10-20 15:06 ` [PATCH 2/6] hw/m68k/mcf5206: " Philippe Mathieu-Daudé
2023-10-22  9:26   ` Thomas Huth
2023-10-20 15:06 ` [PATCH 3/6] hw/m68k/mcf_intc: Expose MMIO region via SysBus API Philippe Mathieu-Daudé
2023-10-22  9:32   ` Thomas Huth
2023-10-20 15:06 ` [PATCH 4/6] hw/m68k/mcf_intc: Pass CPU using QOM link property Philippe Mathieu-Daudé
2023-10-22  9:36   ` Thomas Huth
2023-10-20 15:06 ` [PATCH 5/6] hw/m68k/next-cube: Do not open-code sysbus_create_simple() Philippe Mathieu-Daudé
2023-10-22  9:42   ` Thomas Huth
2023-10-20 15:06 ` Philippe Mathieu-Daudé [this message]
2023-10-22  9:43   ` [PATCH 6/6] hw/m68k/virt: " Thomas Huth
2023-10-20 21:40 ` [PATCH 0/6] hw/m68k: Strengthen QOM/SysBus API uses Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231020150627.56893-7-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=huth@tuxfamily.org \
    --cc=laurent@vivier.eu \
    --cc=mark.cave-ayland@ilande.co.uk \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).