From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Markus Armbruster <armbru@redhat.com>, qemu-devel@nongnu.org
Cc: Alistair Francis <alistair.francis@wdc.com>
Subject: Re: [PATCH v2 45/58] sysbus: Convert to sysbus_realize() etc. with Coccinelle
Date: Tue, 9 Jun 2020 10:41:49 +0200 [thread overview]
Message-ID: <838581c2-8dc1-8391-76f3-538e83c35162@redhat.com> (raw)
In-Reply-To: <20200529134523.8477-46-armbru@redhat.com>
On 5/29/20 3:45 PM, Markus Armbruster wrote:
> Convert from qdev_realize(), qdev_realize_and_unref() with null @bus
> argument to sysbus_realize(), sysbus_realize_and_unref().
>
> Coccinelle script:
>
> @@
> expression dev, errp;
> @@
> - qdev_realize(DEVICE(dev), NULL, errp);
> + sysbus_realize(SYS_BUS_DEVICE(dev), errp);
YES YES YES!!!$!@#$
>
> @@
> expression sysbus_dev, dev, errp;
> @@
> + sysbus_dev = SYS_BUS_DEVICE(dev);
> - qdev_realize_and_unref(dev, NULL, errp);
> + sysbus_realize_and_unref(sysbus_dev, errp);
> - sysbus_dev = SYS_BUS_DEVICE(dev);
>
> @@
> expression sysbus_dev, dev, errp;
> expression expr;
> @@
> sysbus_dev = SYS_BUS_DEVICE(dev);
> ... when != dev = expr;
> - qdev_realize_and_unref(dev, NULL, errp);
> + sysbus_realize_and_unref(sysbus_dev, errp);
>
> @@
> expression dev, errp;
> @@
> - qdev_realize_and_unref(DEVICE(dev), NULL, errp);
> + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
>
> @@
> expression dev, errp;
> @@
> - qdev_realize_and_unref(dev, NULL, errp);
> + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
>
> Whitespace changes minimized manually.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> Acked-by: Alistair Francis <alistair.francis@wdc.com>
> ---
> hw/lm32/lm32.h | 6 ++---
> hw/lm32/milkymist-hw.h | 18 ++++++-------
> include/hw/char/cadence_uart.h | 2 +-
> include/hw/char/cmsdk-apb-uart.h | 2 +-
> include/hw/char/pl011.h | 4 +--
> include/hw/char/xilinx_uartlite.h | 2 +-
> include/hw/cris/etraxfs.h | 2 +-
> include/hw/misc/unimp.h | 2 +-
> include/hw/timer/cmsdk-apb-timer.h | 2 +-
> hw/alpha/typhoon.c | 2 +-
> hw/arm/exynos4210.c | 18 ++++++-------
> hw/arm/exynos4_boards.c | 2 +-
> hw/arm/highbank.c | 12 ++++-----
> hw/arm/integratorcp.c | 2 +-
> hw/arm/mps2-tz.c | 2 +-
> hw/arm/msf2-som.c | 2 +-
> hw/arm/musicpal.c | 4 +--
> hw/arm/netduino2.c | 2 +-
> hw/arm/netduinoplus2.c | 2 +-
> hw/arm/nseries.c | 4 +--
> hw/arm/omap1.c | 8 +++---
> hw/arm/omap2.c | 8 +++---
> hw/arm/pxa2xx.c | 4 +--
> hw/arm/pxa2xx_gpio.c | 2 +-
> hw/arm/pxa2xx_pic.c | 2 +-
> hw/arm/realview.c | 10 ++++----
> hw/arm/sbsa-ref.c | 12 ++++-----
> hw/arm/spitz.c | 2 +-
> hw/arm/stellaris.c | 6 ++---
> hw/arm/strongarm.c | 4 +--
> hw/arm/versatilepb.c | 8 +++---
> hw/arm/vexpress.c | 8 +++---
> hw/arm/virt.c | 18 ++++++-------
> hw/arm/xilinx_zynq.c | 16 ++++++------
> hw/arm/xlnx-versal-virt.c | 2 +-
> hw/arm/xlnx-versal.c | 2 +-
> hw/block/fdc.c | 4 +--
> hw/block/pflash_cfi01.c | 2 +-
> hw/block/pflash_cfi02.c | 2 +-
> hw/char/exynos4210_uart.c | 2 +-
> hw/char/mcf_uart.c | 2 +-
> hw/char/serial.c | 2 +-
> hw/core/empty_slot.c | 2 +-
> hw/core/sysbus.c | 2 +-
> hw/cris/axis_dev88.c | 2 +-
> hw/display/milkymist-tmu2.c | 2 +-
> hw/display/sm501.c | 2 +-
> hw/dma/pxa2xx_dma.c | 4 +--
> hw/dma/rc4030.c | 2 +-
> hw/dma/sparc32_dma.c | 8 +++---
> hw/hppa/dino.c | 2 +-
> hw/hppa/lasi.c | 2 +-
> hw/hppa/machine.c | 2 +-
> hw/i386/pc.c | 2 +-
> hw/i386/pc_q35.c | 2 +-
> hw/i386/pc_sysfw.c | 2 +-
> hw/i386/x86.c | 2 +-
> hw/intc/exynos4210_gic.c | 2 +-
> hw/intc/s390_flic.c | 2 +-
> hw/isa/isa-bus.c | 2 +-
> hw/m68k/mcf5208.c | 2 +-
> hw/m68k/mcf_intc.c | 2 +-
> hw/m68k/next-cube.c | 6 ++---
> hw/m68k/q800.c | 12 ++++-----
> hw/microblaze/petalogix_ml605_mmu.c | 10 ++++----
> hw/microblaze/petalogix_s3adsp1800_mmu.c | 6 ++---
> hw/mips/boston.c | 4 +--
> hw/mips/gt64xxx_pci.c | 2 +-
> hw/mips/jazz.c | 8 +++---
> hw/mips/malta.c | 2 +-
> hw/mips/mipssim.c | 4 +--
> hw/net/etraxfs_eth.c | 2 +-
> hw/net/fsl_etsec/etsec.c | 2 +-
> hw/net/lan9118.c | 2 +-
> hw/net/lasi_i82596.c | 2 +-
> hw/net/smc91c111.c | 2 +-
> hw/nios2/10m50_devboard.c | 6 ++---
> hw/nvram/fw_cfg.c | 4 +--
> hw/openrisc/openrisc_sim.c | 4 +--
> hw/pci-bridge/pci_expander_bridge.c | 2 +-
> hw/pci-host/bonito.c | 2 +-
> hw/pci-host/i440fx.c | 2 +-
> hw/pcmcia/pxa2xx.c | 2 +-
> hw/ppc/e500.c | 16 ++++++------
> hw/ppc/mac_newworld.c | 16 ++++++------
> hw/ppc/mac_oldworld.c | 6 ++---
> hw/ppc/pnv.c | 8 +++---
> hw/ppc/ppc440_uc.c | 4 +--
> hw/ppc/prep.c | 4 +--
> hw/ppc/sam460ex.c | 2 +-
> hw/ppc/spapr.c | 2 +-
> hw/ppc/spapr_irq.c | 2 +-
> hw/ppc/spapr_vio.c | 2 +-
> hw/ppc/virtex_ml507.c | 4 +--
> hw/riscv/sifive_clint.c | 2 +-
> hw/riscv/sifive_e_prci.c | 2 +-
> hw/riscv/sifive_plic.c | 2 +-
> hw/riscv/sifive_test.c | 2 +-
> hw/riscv/virt.c | 4 +--
> hw/rtc/m48t59.c | 2 +-
> hw/rtc/sun4v-rtc.c | 2 +-
> hw/s390x/ap-bridge.c | 2 +-
> hw/s390x/css-bridge.c | 2 +-
> hw/s390x/s390-virtio-ccw.c | 2 +-
> hw/s390x/sclp.c | 2 +-
> hw/sd/pxa2xx_mmci.c | 2 +-
> hw/sh4/r2d.c | 6 ++---
> hw/sparc/leon3.c | 10 ++++----
> hw/sparc/sun4m.c | 32 ++++++++++++------------
> hw/sparc64/sun4u.c | 12 ++++-----
> hw/xen/xen-bus.c | 2 +-
> hw/xen/xen-legacy-backend.c | 2 +-
> hw/xtensa/virt.c | 2 +-
> hw/xtensa/xtfpga.c | 4 +--
> 114 files changed, 257 insertions(+), 257 deletions(-)
[...]
> diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c
> index 725e5fd998..d0bdd01b9d 100644
> --- a/hw/core/empty_slot.c
> +++ b/hw/core/empty_slot.c
> @@ -66,7 +66,7 @@ void empty_slot_init(hwaddr addr, uint64_t slot_size)
> e = EMPTY_SLOT(dev);
> e->size = slot_size;
>
> - qdev_realize_and_unref(dev, NULL, &error_fatal);
> + sysbus_realize_and_unref(s, &error_fatal);
>
> sysbus_mmio_map(s, 0, addr);
Oops you need to rebase this one.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
__
_ / |
| \ \/_/
\_\| / __
\/_/__\ .--='/~\
____,__/__,_____,______)/ /{~}}}
-,-----,--\--,-----,---,\'-' {{~}}
__/\_ '--=.\}/
/_/ |\\
\/
next prev parent reply other threads:[~2020-06-09 8:43 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-29 13:44 [PATCH v2 00/58] qdev: Rework how we plug into the parent bus Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 01/58] qdev: Rename qbus_realize() to qbus_init() Markus Armbruster
2020-05-30 7:53 ` Philippe Mathieu-Daudé
2020-05-29 13:44 ` [PATCH v2 02/58] Revert "hw/prep: realize the PCI root bus as part of the prep init" Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 03/58] Revert "hw/versatile: realize the PCI root bus as part of the versatile init" Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 04/58] qdev: New qdev_new(), qdev_realize(), etc Markus Armbruster
2020-05-29 19:04 ` Alistair Francis
2020-06-09 7:59 ` Philippe Mathieu-Daudé
2020-06-09 9:52 ` Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 05/58] qdev: Put qdev_new() to use with Coccinelle Markus Armbruster
2020-06-09 7:45 ` Philippe Mathieu-Daudé
2020-05-29 13:44 ` [PATCH v2 06/58] qdev: Convert to qbus_realize(), qbus_unrealize() Markus Armbruster
2020-06-09 8:13 ` Philippe Mathieu-Daudé
2020-05-29 13:44 ` [PATCH v2 07/58] qdev: Convert to qdev_unrealize() with Coccinelle Markus Armbruster
2020-06-09 8:03 ` Philippe Mathieu-Daudé
2020-05-29 13:44 ` [PATCH v2 08/58] qdev: Convert to qdev_unrealize() manually Markus Armbruster
2020-06-09 8:04 ` Philippe Mathieu-Daudé
2020-05-29 13:44 ` [PATCH v2 09/58] qdev: Convert uses of qdev_create() with Coccinelle Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 10/58] qdev: Convert uses of qdev_create() manually Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 11/58] qdev: Convert uses of qdev_set_parent_bus() with Coccinelle Markus Armbruster
2020-06-09 8:08 ` Philippe Mathieu-Daudé
2020-05-29 13:44 ` [PATCH v2 12/58] qdev: Convert uses of qdev_set_parent_bus() manually Markus Armbruster
2020-06-09 8:12 ` Philippe Mathieu-Daudé
2020-06-09 10:00 ` Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 13/58] pci: New pci_new(), pci_realize_and_unref() etc Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 14/58] hw/ppc: Eliminate two superfluous QOM casts Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 15/58] pci: Convert uses of pci_create() etc. with Coccinelle Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 16/58] pci: Convert uses of pci_create() etc. manually Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 17/58] pci: pci_create(), pci_create_multifunction() are now unused, drop Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 18/58] isa: New isa_new(), isa_realize_and_unref() etc Markus Armbruster
2020-06-09 8:19 ` Philippe Mathieu-Daudé
2020-06-09 8:26 ` Philippe Mathieu-Daudé
2020-05-29 13:44 ` [PATCH v2 19/58] isa: Convert uses of isa_create() with Coccinelle Markus Armbruster
2020-05-30 5:07 ` Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 20/58] isa: Convert uses of isa_create(), isa_try_create() manually Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 21/58] isa: isa_create(), isa_try_create() are now unused, drop Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 22/58] ssi: ssi_auto_connect_slaves() never does anything, drop Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 23/58] ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 24/58] ssi: Convert last use of ssi_create_slave_no_init() manually Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 25/58] ssi: ssi_create_slave_no_init() is now unused, drop Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 26/58] usb: New usb_new(), usb_realize_and_unref() Markus Armbruster
2020-06-09 8:21 ` Philippe Mathieu-Daudé
2020-05-29 13:44 ` [PATCH v2 27/58] usb: Convert uses of usb_create() Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 28/58] usb: usb_create() is now unused, drop Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 29/58] usb: Eliminate usb_try_create_simple() Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 30/58] qdev: qdev_create(), qdev_try_create() are now unused, drop Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 31/58] auxbus: Rename aux_init_bus() to aux_bus_init() Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 32/58] auxbus: New aux_bus_realize(), pairing with aux_bus_init() Markus Armbruster
2020-05-29 13:44 ` [PATCH v2 33/58] auxbus: Convert a use of qdev_set_parent_bus() Markus Armbruster
2020-06-09 8:31 ` Philippe Mathieu-Daudé
2020-05-29 13:44 ` [PATCH v2 34/58] auxbus: Eliminate aux_create_slave() Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 35/58] qom: Tidy up a few object_initialize_child() calls Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 36/58] qom: Less verbose object_initialize_child() Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 37/58] macio: Convert use of qdev_set_parent_bus() Markus Armbruster
2020-06-09 8:33 ` Philippe Mathieu-Daudé
2020-05-29 13:45 ` [PATCH v2 38/58] macio: Eliminate macio_init_child_obj() Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 39/58] sysbus: Drop useless OBJECT() in sysbus_init_child_obj() calls Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 40/58] microbit: Tidy up sysbus_init_child_obj() @child argument Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 41/58] sysbus: Tidy up sysbus_init_child_obj()'s @childsize arg, part 1 Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 42/58] hw/arm/armsse: Pass correct child size to sysbus_init_child_obj() Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 43/58] sysbus: Tidy up sysbus_init_child_obj()'s @childsize arg, part 2 Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 44/58] sysbus: New sysbus_realize(), sysbus_realize_and_unref() Markus Armbruster
2020-06-09 8:35 ` Philippe Mathieu-Daudé
2020-05-29 13:45 ` [PATCH v2 45/58] sysbus: Convert to sysbus_realize() etc. with Coccinelle Markus Armbruster
2020-06-09 8:41 ` Philippe Mathieu-Daudé [this message]
2020-05-29 13:45 ` [PATCH v2 46/58] qdev: Drop qdev_realize() support for null bus Markus Armbruster
2020-06-09 8:45 ` Philippe Mathieu-Daudé
2020-06-09 10:05 ` Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 47/58] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1 Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 48/58] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 2 Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 49/58] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 3 Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 50/58] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 4 Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 51/58] sysbus: sysbus_init_child_obj() is now unused, drop Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 52/58] microbit: Eliminate two local variables in microbit_init() Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 53/58] s390x/event-facility: Simplify creation of SCLP event devices Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 54/58] qdev: Make qdev_realize() support bus-less devices Markus Armbruster
2020-05-30 7:59 ` Philippe Mathieu-Daudé
2020-05-29 13:45 ` [PATCH v2 55/58] qdev: Use qdev_realize() in qdev_device_add() Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 56/58] qdev: Convert bus-less devices to qdev_realize() with Coccinelle Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 57/58] qdev: qdev_init_nofail() is now unused, drop Markus Armbruster
2020-05-29 13:45 ` [PATCH v2 58/58] MAINTAINERS: Make section QOM cover hw/core/*bus.c as well Markus Armbruster
2020-05-30 7:56 ` Philippe Mathieu-Daudé
2020-05-29 13:48 ` [PATCH v2 00/58] qdev: Rework how we plug into the parent bus Markus Armbruster
2020-05-29 23:58 ` no-reply
2020-05-30 4:18 ` no-reply
2020-05-30 4:28 ` no-reply
2020-05-30 5:43 ` no-reply
2020-05-30 6:15 ` no-reply
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=838581c2-8dc1-8391-76f3-538e83c35162@redhat.com \
--to=philmd@redhat.com \
--cc=alistair.francis@wdc.com \
--cc=armbru@redhat.com \
--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).