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 <arm...@redhat.com> > Acked-by: Alistair Francis <alistair.fran...@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é <phi...@redhat.com> __ _ / | | \ \/_/ \_\| / __ \/_/__\ .--='/~\ ____,__/__,_____,______)/ /{~}}} -,-----,--\--,-----,---,\'-' {{~}} __/\_ '--=.\}/ /_/ |\\ \/