qdev: Rework how we plug into the parent bus
Subsystems (11)
cover qdev: Rework how we plug into the parent bus
Paolo recently suggested "to move the bus argument (and thus qdev_set_parent_bus) to qdev_init"[1], and that it "would be quite large but hopefully scriptable"[2]. Nerd sniped!
The series is big, but at least the bigger patches are all mechanical.
It is based on my "[PATCH 00/24] Fixes around device realization".
I'm abstaining from cc'ing maintainers on mechanical conversions. I still cc: for patches I deem interesting, with related patches thrown in for context. Let me know if you think I should cc: more widely.
PATCH 01-02 Preliminary cleanup
PATCH 03 New qdev infrastructure
Commit message explains why the current state is problematic, and how my work improves it.
PATCH 04-11 Convert direct users of qdev PATCH 12-16 Convert PCI PATCH 17-20 Convert ISA PATCH 21-24 Convert SSI PATCH 25-28 Convert USB PATCH 29 Garbage collection PATCH 30-32 Convert aux-bus PATCH 33-40 Clean up around child device initialization PATCH 41-49 Convert sysbus PATCH 50 Stop pretending recursive realization is about to become
real
PATCH 51-53 Convert bus-less devices
PATCH 54 Garbage collection
PATCH 55 Maintain MAINTAINERS
Enjoy!
[1]
Subject: Re: Infinite loop in bus_unparent(), qdev bug or qdev misuse?
Date: Mon, 4 May 2020 16:58:54 +0200
Message-ID: <[email protected]>
[2]
Subject: Re: Infinite loop in bus_unparent(), qdev bug or qdev misuse?
Date: Tue, 5 May 2020 18:26:57 +0200
Message-ID: <[email protected]>
Based-on: <[email protected]>
Cc: Michael S. Tsirkin <[email protected]>
Cc: Marcel Apfelbaum <[email protected]>
Cc: Alistair Francis <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: Mark Cave-Ayland <[email protected]>
Cc: David Gibson <[email protected]>
Markus Armbruster (55):
qdev: Rename qbus_realize() to qbus_init()
qdev: Drop redundant bus realization
qdev: New qdev_new(), qdev_realize(), etc.
qdev: Put qdev_new() to use with Coccinelle
qdev: Convert to qbus_realize(), qbus_unrealize()
qdev: Convert to qdev_unrealize() with Coccinelle
qdev: Convert to qdev_unrealize() manually
qdev: Convert uses of qdev_create() with Coccinelle
qdev: Convert uses of qdev_create() manually
qdev: Convert uses of qdev_set_parent_bus() with Coccinelle
qdev: Convert uses of qdev_set_parent_bus() manually
pci: New pci_new(), pci_realize_and_unref() etc. hw/ppc: Eliminate two superfluous QOM casts
pci: Convert uses of pci_create() etc. with Coccinelle
pci: Convert uses of pci_create() etc. manually
pci: pci_create(), pci_create_multifunction() are now unused, drop
isa: New isa_new(), isa_realize_and_unref() etc.
isa: Convert uses of isa_create() with Coccinelle
isa: Convert uses of isa_create(), isa_try_create() manually
isa: isa_create(), isa_try_create() are now unused, drop
ssi: ssi_auto_connect_slaves() never does anything, drop
ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle
ssi: Convert last use of ssi_create_slave_no_init() manually
ssi: ssi_create_slave_no_init() is now unused, drop
usb: New usb_new(), usb_realize_and_unref()
usb: Convert uses of usb_create()
usb: usb_create() is now unused, drop
usb: Eliminate usb_try_create_simple()
qdev: qdev_create(), qdev_try_create() are now unused, drop
auxbus: New aux_realize_bus(), pairing with aux_init_bus()
auxbus: Convert a use of qdev_set_parent_bus()
auxbus: Eliminate aux_create_slave()
qom: Tidy up a few object_initialize_child() calls
qom: Less verbose object_initialize_child()
macio: Convert use of qdev_set_parent_bus()
macio: Eliminate macio_init_child_obj()
sysbus: Drop useless OBJECT() in sysbus_init_child_obj() calls
microbit: Tidy up sysbus_init_child_obj() @child argument
sysbus: Tidy up sysbus_init_child_obj()'s @childsize arg, part 1 hw/arm/armsse: Pass correct child size to sysbus_init_child_obj()
sysbus: Tidy up sysbus_init_child_obj()'s @childsize arg, part 2
sysbus: New sysbus_realize(), sysbus_realize_and_unref()
sysbus: Convert to sysbus_realize() etc. with Coccinelle
qdev: Drop qdev_realize() support for null bus
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 2
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 3
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 4
sysbus: sysbus_init_child_obj() is now unused, drop s390x/event-facility: Simplify creation of SCLP event devices
qdev: Make qdev_realize() support bus-less devices
qdev: Use qdev_realize() in qdev_device_add()
qdev: Convert bus-less devices to qdev_realize() with Coccinelle
qdev: qdev_init_nofail() is now unused, drop
MAINTAINERS: Make section QOM cover hw/core/*bus.c as well
hw/lm32/lm32.h | 13 +- hw/lm32/milkymist-hw.h | 37 ++--- include/hw/audio/pcspk.h | 5 +- include/hw/char/cadence_uart.h | 5 +- include/hw/char/cmsdk-apb-uart.h | 4 +- include/hw/char/pl011.h | 9 +- include/hw/char/xilinx_uartlite.h | 4 +- include/hw/cris/etraxfs.h | 4 +- include/hw/isa/isa.h | 5 +- include/hw/misc/auxbus.h | 14 +- include/hw/misc/unimp.h | 5 +- include/hw/net/ne2000-isa.h | 5 +- include/hw/pci/pci.h | 6 +- include/hw/qdev-core.h | 13 +- include/hw/ssi/ssi.h | 5 - include/hw/sysbus.h | 19 +-- include/hw/timer/cmsdk-apb-timer.h | 4 +- include/hw/timer/i8254.h | 9 +- include/hw/usb.h | 6 +- include/qom/object.h | 30 +++- hw/acpi/pcihp.c | 2 +- hw/acpi/piix4.c | 6 +- hw/alpha/typhoon.c | 4 +- hw/arm/allwinner-a10.c | 50 +++---- hw/arm/allwinner-h3.c | 57 +++----- hw/arm/armsse.c | 174 +++++++++-------------- hw/arm/armv7m.c | 12 +- hw/arm/aspeed.c | 18 ++- hw/arm/aspeed_ast2600.c | 110 ++++++-------- hw/arm/aspeed_soc.c | 84 +++++------ hw/arm/bcm2835_peripherals.c | 71 ++++----- hw/arm/bcm2836.c | 17 +-- hw/arm/cubieboard.c | 6 +- hw/arm/digic.c | 16 +-- hw/arm/digic_boards.c | 2 +- hw/arm/exynos4210.c | 48 +++---- hw/arm/exynos4_boards.c | 11 +- hw/arm/fsl-imx25.c | 60 ++++---- hw/arm/fsl-imx31.c | 39 +++-- hw/arm/fsl-imx6.c | 76 ++++------ hw/arm/fsl-imx6ul.c | 105 +++++--------- hw/arm/fsl-imx7.c | 100 +++++-------- hw/arm/highbank.c | 28 ++-- hw/arm/imx25_pdk.c | 10 +- hw/arm/integratorcp.c | 6 +- hw/arm/kzm.c | 5 +- hw/arm/mcimx6ul-evk.c | 7 +- hw/arm/mcimx7d-sabre.c | 7 +- hw/arm/microbit.c | 12 +- hw/arm/mps2-tz.c | 79 +++++----- hw/arm/mps2.c | 26 ++-- hw/arm/msf2-soc.c | 25 ++-- hw/arm/msf2-som.c | 12 +- hw/arm/musca.c | 60 ++++---- hw/arm/musicpal.c | 8 +- hw/arm/netduino2.c | 4 +- hw/arm/netduinoplus2.c | 4 +- hw/arm/nrf51_soc.c | 30 ++-- hw/arm/nseries.c | 8 +- hw/arm/omap1.c | 16 +-- hw/arm/omap2.c | 16 +-- hw/arm/orangepi.c | 6 +- hw/arm/pxa2xx.c | 8 +- hw/arm/pxa2xx_gpio.c | 5 +- hw/arm/pxa2xx_pic.c | 5 +- hw/arm/raspi.c | 10 +- hw/arm/realview.c | 22 +-- hw/arm/sabrelite.c | 6 +- hw/arm/sbsa-ref.c | 26 ++-- hw/arm/spitz.c | 4 +- hw/arm/stellaris.c | 12 +- hw/arm/stm32f205_soc.c | 34 ++--- hw/arm/stm32f405_soc.c | 45 +++--- hw/arm/strongarm.c | 9 +- hw/arm/versatilepb.c | 18 +-- hw/arm/vexpress.c | 18 +-- hw/arm/virt.c | 38 ++--- hw/arm/xilinx_zynq.c | 44 +++--- hw/arm/xlnx-versal-virt.c | 15 +- hw/arm/xlnx-versal.c | 53 +++---- hw/arm/xlnx-zcu102.c | 26 ++-- hw/arm/xlnx-zynqmp.c | 92 +++++------- hw/audio/intel-hda.c | 4 +- hw/block/fdc.c | 16 +-- hw/block/nand.c | 4 +- hw/block/pflash_cfi01.c | 4 +- hw/block/pflash_cfi02.c | 4 +- hw/block/xen-block.c | 4 +- hw/char/exynos4210_uart.c | 5 +- hw/char/mcf_uart.c | 5 +- hw/char/parallel-isa.c | 5 +- hw/char/serial-isa.c | 9 +- hw/char/serial-pci-multi.c | 8 +- hw/char/serial-pci.c | 7 +- hw/char/serial.c | 14 +- hw/char/spapr_vty.c | 4 +- hw/core/bus.c | 23 ++- hw/core/cpu.c | 2 +- hw/core/empty_slot.c | 5 +- hw/core/qdev.c | 132 +++++++++-------- hw/core/sysbus.c | 27 ++-- hw/cpu/a15mpcore.c | 5 +- hw/cpu/a9mpcore.c | 23 ++- hw/cpu/arm11mpcore.c | 18 ++- hw/cpu/realview_mpcore.c | 10 +- hw/cris/axis_dev88.c | 4 +- hw/display/ati.c | 4 +- hw/display/milkymist-tmu2.c | 4 +- hw/display/sm501.c | 12 +- hw/display/virtio-gpu-pci.c | 3 +- hw/display/virtio-vga.c | 3 +- hw/display/xlnx_dp.c | 11 +- hw/dma/i8257.c | 9 +- hw/dma/pxa2xx_dma.c | 8 +- hw/dma/rc4030.c | 5 +- hw/dma/sparc32_dma.c | 16 +-- hw/dma/xilinx_axidma.c | 9 +- hw/hppa/dino.c | 4 +- hw/hppa/lasi.c | 4 +- hw/hppa/machine.c | 4 +- hw/hyperv/hyperv.c | 2 +- hw/i2c/core.c | 5 +- hw/i2c/smbus_eeprom.c | 4 +- hw/i386/amd_iommu.c | 3 +- hw/i386/pc.c | 12 +- hw/i386/pc_q35.c | 14 +- hw/i386/pc_sysfw.c | 4 +- hw/i386/x86.c | 8 +- hw/ide/isa.c | 5 +- hw/ide/microdrive.c | 3 +- hw/ide/qdev.c | 4 +- hw/intc/armv7m_nvic.c | 15 +- hw/intc/exynos4210_gic.c | 5 +- hw/intc/i8259_common.c | 5 +- hw/intc/pnv_xive.c | 10 +- hw/intc/realview_gic.c | 4 +- hw/intc/s390_flic.c | 6 +- hw/intc/spapr_xive.c | 10 +- hw/intc/xics.c | 2 +- hw/intc/xive.c | 2 +- hw/isa/isa-bus.c | 27 ++-- hw/isa/isa-superio.c | 20 +-- hw/isa/piix4.c | 3 +- hw/isa/vt82c686.c | 13 +- hw/m68k/mcf5208.c | 4 +- hw/m68k/mcf_intc.c | 5 +- hw/m68k/next-cube.c | 12 +- hw/m68k/q800.c | 36 ++--- hw/microblaze/petalogix_ml605_mmu.c | 26 ++-- hw/microblaze/petalogix_s3adsp1800_mmu.c | 14 +- hw/microblaze/xlnx-zynqmp-pmu.c | 21 ++- hw/mips/boston.c | 13 +- hw/mips/cps.c | 20 ++- hw/mips/gt64xxx_pci.c | 5 +- hw/mips/mips_fulong2e.c | 6 +- hw/mips/mips_jazz.c | 16 +-- hw/mips/mips_malta.c | 9 +- hw/mips/mips_mipssim.c | 8 +- hw/misc/auxbus.c | 16 +-- hw/misc/mac_via.c | 12 +- hw/misc/macio/cuda.c | 7 +- hw/misc/macio/macio.c | 56 +++----- hw/misc/macio/pmu.c | 7 +- hw/net/etraxfs_eth.c | 4 +- hw/net/fsl_etsec/etsec.c | 5 +- hw/net/lan9118.c | 5 +- hw/net/lasi_i82596.c | 5 +- hw/net/smc91c111.c | 5 +- hw/net/spapr_llan.c | 4 +- hw/net/xilinx_axienet.c | 9 +- hw/nios2/10m50_devboard.c | 12 +- hw/nvram/fw_cfg.c | 8 +- hw/openrisc/openrisc_sim.c | 8 +- hw/pci-bridge/dec.c | 6 +- hw/pci-bridge/pci_expander_bridge.c | 8 +- hw/pci-host/bonito.c | 9 +- hw/pci-host/designware.c | 6 +- hw/pci-host/gpex.c | 6 +- hw/pci-host/i440fx.c | 4 +- hw/pci-host/pnv_phb3.c | 21 ++- hw/pci-host/pnv_phb4.c | 11 +- hw/pci-host/pnv_phb4_pec.c | 8 +- hw/pci-host/prep.c | 7 +- hw/pci-host/q35.c | 6 +- hw/pci-host/sabre.c | 13 +- hw/pci-host/versatile.c | 4 +- hw/pci-host/xilinx-pcie.c | 6 +- hw/pci/pci.c | 31 ++-- hw/pci/pcie.c | 2 +- hw/pci/shpc.c | 2 +- hw/pcmcia/pxa2xx.c | 5 +- hw/ppc/e500.c | 32 ++--- hw/ppc/mac_newworld.c | 46 +++--- hw/ppc/mac_oldworld.c | 26 ++-- hw/ppc/pnv.c | 103 ++++++-------- hw/ppc/pnv_bmc.c | 2 +- hw/ppc/pnv_core.c | 2 +- hw/ppc/pnv_psi.c | 10 +- hw/ppc/ppc440_uc.c | 8 +- hw/ppc/prep.c | 35 +++-- hw/ppc/sam460ex.c | 4 +- hw/ppc/spapr.c | 27 ++-- hw/ppc/spapr_cpu_core.c | 2 +- hw/ppc/spapr_drc.c | 2 +- hw/ppc/spapr_iommu.c | 2 +- hw/ppc/spapr_irq.c | 6 +- hw/ppc/spapr_pci.c | 3 +- hw/ppc/spapr_vio.c | 4 +- hw/ppc/virtex_ml507.c | 9 +- hw/riscv/riscv_hart.c | 7 +- hw/riscv/sifive_clint.c | 5 +- hw/riscv/sifive_e.c | 20 +-- hw/riscv/sifive_e_prci.c | 5 +- hw/riscv/sifive_plic.c | 5 +- hw/riscv/sifive_test.c | 5 +- hw/riscv/sifive_u.c | 52 +++---- hw/riscv/spike.c | 21 ++- hw/riscv/virt.c | 15 +- hw/rtc/m48t59-isa.c | 7 +- hw/rtc/m48t59.c | 5 +- hw/rtc/mc146818rtc.c | 4 +- hw/rtc/sun4v-rtc.c | 5 +- hw/s390x/ap-bridge.c | 4 +- hw/s390x/css-bridge.c | 6 +- hw/s390x/event-facility.c | 59 ++++---- hw/s390x/s390-pci-bus.c | 8 +- hw/s390x/s390-skeys.c | 2 +- hw/s390x/s390-stattrib.c | 2 +- hw/s390x/s390-virtio-ccw.c | 16 +-- hw/s390x/sclp.c | 12 +- hw/s390x/tod.c | 2 +- hw/s390x/vhost-vsock-ccw.c | 3 +- hw/s390x/virtio-ccw-9p.c | 3 +- hw/s390x/virtio-ccw-balloon.c | 3 +- hw/s390x/virtio-ccw-blk.c | 3 +- hw/s390x/virtio-ccw-crypto.c | 3 +- hw/s390x/virtio-ccw-gpu.c | 3 +- hw/s390x/virtio-ccw-input.c | 3 +- hw/s390x/virtio-ccw-net.c | 3 +- hw/s390x/virtio-ccw-rng.c | 3 +- hw/s390x/virtio-ccw-scsi.c | 6 +- hw/s390x/virtio-ccw-serial.c | 3 +- hw/scsi/scsi-bus.c | 4 +- hw/scsi/spapr_vscsi.c | 4 +- hw/sd/aspeed_sdhci.c | 2 +- hw/sd/milkymist-memcard.c | 4 +- hw/sd/pxa2xx_mmci.c | 8 +- hw/sd/ssi-sd.c | 4 +- hw/sh4/r2d.c | 12 +- hw/sparc/leon3.c | 20 +-- hw/sparc/sun4m.c | 64 ++++----- hw/sparc64/sun4u.c | 50 ++++--- hw/ssi/aspeed_smc.c | 1 - hw/ssi/imx_spi.c | 2 - hw/ssi/mss-spi.c | 1 - hw/ssi/ssi.c | 43 +----- hw/ssi/xilinx_spi.c | 1 - hw/ssi/xilinx_spips.c | 4 - hw/usb/bus.c | 52 +++---- hw/usb/dev-serial.c | 4 +- hw/virtio/vhost-scsi-pci.c | 3 +- hw/virtio/vhost-user-blk-pci.c | 3 +- hw/virtio/vhost-user-fs-pci.c | 3 +- hw/virtio/vhost-user-scsi-pci.c | 3 +- hw/virtio/vhost-vsock-pci.c | 3 +- hw/virtio/virtio-9p-pci.c | 3 +- hw/virtio/virtio-balloon-pci.c | 3 +- hw/virtio/virtio-blk-pci.c | 3 +- hw/virtio/virtio-crypto-pci.c | 3 +- hw/virtio/virtio-input-pci.c | 3 +- hw/virtio/virtio-iommu-pci.c | 3 +- hw/virtio/virtio-net-pci.c | 3 +- hw/virtio/virtio-pmem-pci.c | 3 +- hw/virtio/virtio-rng-pci.c | 3 +- hw/virtio/virtio-scsi-pci.c | 3 +- hw/virtio/virtio-serial-pci.c | 3 +- hw/virtio/virtio.c | 5 +- hw/xen/xen-bus.c | 4 +- hw/xen/xen-legacy-backend.c | 7 +- hw/xtensa/virt.c | 4 +- hw/xtensa/xtfpga.c | 8 +- migration/migration.c | 2 +- qdev-monitor.c | 8 +- qom/object.c | 19 ++- target/i386/cpu.c | 3 +- tests/test-qdev-global-props.c | 8 +- MAINTAINERS | 2 + 287 files changed, 1942 insertions(+), 2348 deletions(-)
Signature · 1 line
2.21.1
PATCH 1/55 qdev: Rename qbus_realize() to qbus_init()
qbus_realize() does not actually realize. Rename it to qbus_init().
--- hw/core/bus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
hw/core/bus.c +3 -3
@@ -95,7 +95,7 @@ static void bus_reset_child_foreach(Object *obj, ResettableChildCallback cb, } } -static void qbus_realize (BusState *bus,DeviceState *parent,const char *name) +static void qbus_init (BusState *bus,DeviceState *parent,const char *name) {const char *typename =object_get_typename (OBJECT (bus));BusClass *bc;
@@ -156,7 +156,7 @@ void qbus_create_inplace(void *bus, size_t size, const char *typename, DeviceState *parent, const char *name) {object_initialize (bus ,size ,typename ); -qbus_realize (bus, parent, name); +qbus_init (bus, parent, name); }BusState *qbus_create (const char *typename,DeviceState *parent,const char *name)
@@ -164,7 +164,7 @@ BusState *qbus_create(const char *typename, DeviceState *parent, const char *namBusState *bus; bus =BUS (object_new (typename)); -qbus_realize (bus, parent, name); +qbus_init (bus, parent, name);return bus; }
Signature · 1 line
2.21.1
PATCH 2/55 qdev: Drop redundant bus realization
In reply to Markus ArmbrusterRealizing a device automatically realizes its buses, in device_set_realized(). Realizing them in realize methods is redundant, unless the methods themselves require them to be realized early. None do. Drop the redundant bus realiziations.
--- hw/pci-host/prep.c | 1 - hw/pci-host/versatile.c | 1 - 2 files changed, 2 deletions(-)
hw/pci-host/prep.c +0 -1
@@ -268,7 +268,6 @@ static void raven_pcihost_realizefn(DeviceState *d, Error **errp)memory_region_add_subregion (address_space_mem,0xbffffff0 , &s->pci_intack);/* TODO Remove once realize propagates to child devices. */ -object_property_set_bool (OBJECT (&s->pci_bus), true,"realized" , errp);object_property_set_bool (OBJECT (&s->pci_dev), true,"realized" , errp); }
hw/pci-host/versatile.c +0 -1
@@ -458,7 +458,6 @@ static void pci_vpb_realize(DeviceState *dev, Error **errp) }/* TODO Remove once realize propagates to child devices. */ -object_property_set_bool (OBJECT (&s->pci_bus), true,"realized" , errp);object_property_set_bool (OBJECT (&s->pci_dev), true,"realized" , errp); }
Signature · 1 line
2.21.1
Re: [PATCH 02/55] qdev: Drop redundant bus realization
+Marcel
Quoted 4 lines · Markus Armbruster
Realizing a device automatically realizes its buses, in
device_set_realized(). Realizing them in realize methods is redundant, unless the methods themselves require them to be realized early. None do. Drop the redundant bus realiziations.
Typo realiziations-> realizations.
So you are reverting commits 685f9a3428f & b1af7959a66... I don't understand them, Marcel can you review this patch?
Quoted 32 lines
Signed-off-by Markus Armbruster <[email protected]>--- hw/pci-host/prep.c | 1 - hw/pci-host/versatile.c | 1 - 2 files changed, 2 deletions(-)hw/pci-host/prep.c +0
-1@@ -268,7 +268,6 @@ static void raven_pcihost_realizefn(DeviceState *d, Error **errp)memory_region_add_subregion (address_space_mem,0xbffffff0 , &s->pci_intack);/* TODO Remove once realize propagates to child devices. */ -object_property_set_bool (OBJECT (&s->pci_bus), true,"realized" , errp);object_property_set_bool (OBJECT (&s->pci_dev), true,"realized" , errp); }hw/pci-host/versatile.c +0
-1@@ -458,7 +458,6 @@ static void pci_vpb_realize(DeviceState *dev, Error **errp) }/* TODO Remove once realize propagates to child devices. */ -object_property_set_bool (OBJECT (&s->pci_bus), true,"realized" , errp);object_property_set_bool (OBJECT (&s->pci_dev), true,"realized" , errp); }
Re: [PATCH 02/55] qdev: Drop redundant bus realization
Quoted 9 lines · Philippe Mathieu-Daudé
+Marcel
Quoted 4 lines · Markus Armbruster
Realizing a device automatically realizes its buses, in
device_set_realized(). Realizing them in realize methods is redundant, unless the methods themselves require them to be realized early. None do. Drop the redundant bus realiziations.Typo realiziations-> realizations.
Will fix, thanks!
Quoted 1 line
So you are reverting commits
685f9a3428f&b1af7959a66...
I should've checked where these lines come from.
Quoted 31 lines
I don't understand them, Marcel can you review this patch?
Quoted 29 lines
Signed-off-by Markus Armbruster <[email protected]>--- hw/pci-host/prep.c | 1 - hw/pci-host/versatile.c | 1 - 2 files changed, 2 deletions(-)hw/pci-host/prep.c +0
-1@@ -268,7 +268,6 @@ static void raven_pcihost_realizefn(DeviceState *d, Error **errp)memory_region_add_subregion (address_space_mem,0xbffffff0 , &s->pci_intack);/* TODO Remove once realize propagates to child devices. */ -object_property_set_bool (OBJECT (&s->pci_bus), true,"realized" , errp);object_property_set_bool (OBJECT (&s->pci_dev), true,"realized" , errp); } diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.cindex
cfb9a78ea6..28817dbeec100644hw/pci-host/versatile.c +0
-1@@ -458,7 +458,6 @@ static void pci_vpb_realize(DeviceState *dev, Error **errp) }/* TODO Remove once realize propagates to child devices. */ -object_property_set_bool (OBJECT (&s->pci_bus), true,"realized" , errp);object_property_set_bool (OBJECT (&s->pci_dev), true,"realized" , errp); }
PATCH 3/55 qdev: New qdev_new(), qdev_realize(), etc.
In reply to Markus ArmbrusterWe commonly plug devices into their bus right when we create them, like this:
dev = qdev_create(bus, type_name);
Note that @dev is a weak reference. The reference from @bus to @dev is the only strong one.
We realize at some later time, either with
object_property_set_bool(OBJECT(dev), true, "realized", errp);
or its convenience wrapper
qdev_init_nofail(dev);
If @dev still has no QOM parent then, realizing makes the /machine/unattached/ orphanage its QOM parent.
Note that the device returned by qdev_create() is plugged into a bus, but doesn't have a QOM parent, yet. Until it acquires one, unrealizing the bus will hang in bus_unparent():
while ((kid = QTAILQ_FIRST(&bus->children)) != NULL) {
DeviceState *dev = kid->child;
object_unparent(OBJECT(dev));
}object_unparent() does nothing when its argument has no QOM parent, and the loop spins forever.
Device state "no QOM parent, but plugged into bus" is dangerous.
Paolo suggested to delay plugging into the bus until realize. We need to plug into the parent bus before we call the device's realize method, in case it uses the parent bus. So the dangerous state still exists, but only within realization, where we can manage it safely.
This commit creates infrastructure to do this:
dev = qdev_new(type_name);
...
qdev_realize_and_unref(dev, bus, errp)Note that @dev becomes a strong reference here. qdev_realize_and_unref() drops it. There is also plain qdev_realize(), which doesn't drop it.
The remainder of this series will convert all users to this new interface.
--- include/hw/qdev-core.h | 11 ++++- hw/core/bus.c | 14 +++++++ hw/core/qdev.c | 94 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 1 deletion(-)
include/hw/qdev-core.h +10 -1
@@ -57,7 +57,7 @@ typedef void (*BusUnrealize)(BusState *bus);* After successful realization, setting static properties will fail. * * As an interim step, the #DeviceState:realized property can also be -* set with qdev_init_nofail(). +* set with qdev_realize() or qdev_init_nofail(). * In the future, devices will propagate this state change to their children * and along busses they expose. * The point in time will be deferred to machine creation, so that values
@@ -322,7 +322,13 @@ compat_props_add(GPtrArray *arr,DeviceState *qdev_create (BusState *bus,const char *name);DeviceState *qdev_try_create (BusState *bus,const char *name); +DeviceState *qdev_new (const char *name); +DeviceState *qdev_try_new (const char *name);void qdev_init_nofail (DeviceState *dev); +bool qdev_realize (DeviceState *dev,BusState *bus,Error **errp); +bool qdev_realize_and_unref (DeviceState *dev,BusState *bus,Error **errp); +void qdev_unrealize (DeviceState *dev); +void qdev_set_legacy_instance_id (DeviceState *dev,int alias_id,int required_for_version);HotplugHandler *qdev_get_bus_hotplug_handler (DeviceState *dev);
@@ -411,6 +417,9 @@ typedef int (qdev_walkerfn)(DeviceState *dev, void *opaque);void qbus_create_inplace (void *bus,size_t size,const char *typename,DeviceState *parent,const char *name);BusState *qbus_create (const char *typename,DeviceState *parent,const char *name); +bool qbus_realize (BusState *bus,Error **errp); +void qbus_unrealize (BusState *bus); +/* Returns > 0 if either devfn or busfn skip walk somewhere in cursion, * < 0 if either devfn or busfn terminate walk somewhere in cursion, * 0 otherwise. */
hw/core/bus.c +14 -0
@@ -169,6 +169,20 @@ BusState *qbus_create(const char *typename, DeviceState *parent, const char *namreturn bus; } +bool qbus_realize (BusState *bus,Error **errp) +{ +Error *err =NULL ; + +object_property_set_bool (OBJECT (bus), true,"realized" , &err); +error_propagate (errp, err); +return !err; +} + +void qbus_unrealize (BusState *bus) +{ +object_property_set_bool (OBJECT (bus), true,"realized" , &error_abort); +} +static bool bus_get_realized (Object *obj,Error **errp) {BusState *bus =BUS (obj);
hw/core/qdev.c +94 -0
112 lines not on this page · raw message
Signature · 1 line
2.21.1
Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc.
Quoted 112 lines · Markus Armbruster
We commonly plug devices into their bus right when we create them, like this:
dev = qdev_create(bus, type_name);Note that @dev is a weak reference. The reference from @bus to @dev is the only strong one.
We realize at some later time, either with
object_property_set_bool(OBJECT(dev), true, "realized", errp);or its convenience wrapper
qdev_init_nofail(dev);If @dev still has no QOM parent then, realizing makes the /machine/unattached/ orphanage its QOM parent.
Note that the device returned by
qdev_create()is plugged into a bus, but doesn't have a QOM parent, yet. Until it acquires one, unrealizing the bus will hang inbus_unparent():while ((kid = QTAILQ_FIRST(&bus->children)) != NULL) { DeviceState *dev = kid->child; object_unparent(OBJECT(dev)); }
object_unparent()does nothing when its argument has no QOM parent, and the loop spins forever.Device state "no QOM parent, but plugged into bus" is dangerous.
Paolo suggested to delay plugging into the bus until realize. We need to plug into the parent bus before we call the device's realize method, in case it uses the parent bus. So the dangerous state still exists, but only within realization, where we can manage it safely.
This commit creates infrastructure to do this:
dev = qdev_new(type_name); ... qdev_realize_and_unref(dev, bus, errp)Note that @dev becomes a strong reference here.
qdev_realize_and_unref()drops it. There is also plainqdev_realize(), which doesn't drop it.The remainder of this series will convert all users to this new interface.
Cc Michael S. Tsirkin <[email protected]>Cc Marcel Apfelbaum <[email protected]>Cc Alistair Francis <[email protected]>Cc Gerd Hoffmann <[email protected]>Cc Mark Cave-Ayland <[email protected]>Cc David Gibson <[email protected]>Signed-off-by Markus Armbruster <[email protected]>--- include/hw/qdev-core.h | 11 ++++- hw/core/bus.c | 14 +++++++ hw/core/qdev.c | 94 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 1 deletion(-)include/hw/qdev-core.h +10
-1@@ -57,7 +57,7 @@ typedef void (*BusUnrealize)(BusState *bus);* After successful realization, setting static properties will fail. * * As an interim step, the #DeviceState:realized property can also be -* set with qdev_init_nofail(). +* set with qdev_realize() or qdev_init_nofail(). * In the future, devices will propagate this state change to their children * and along busses they expose. * The point in time will be deferred to machine creation, so that values @@ -322,7 +322,13 @@ compat_props_add(GPtrArray *arr,DeviceState *qdev_create (BusState *bus,const char *name);DeviceState *qdev_try_create (BusState *bus,const char *name); +DeviceState *qdev_new (const char *name); +DeviceState *qdev_try_new (const char *name);void qdev_init_nofail (DeviceState *dev); +bool qdev_realize (DeviceState *dev,BusState *bus,Error **errp); +bool qdev_realize_and_unref (DeviceState *dev,BusState *bus,Error **errp); +void qdev_unrealize (DeviceState *dev); +void qdev_set_legacy_instance_id (DeviceState *dev,int alias_id,int required_for_version);HotplugHandler *qdev_get_bus_hotplug_handler (DeviceState *dev);@@ -411,6 +417,9 @@ typedef int (qdev_walkerfn)(DeviceState *dev, void *opaque);void qbus_create_inplace (void *bus,size_t size,const char *typename,DeviceState *parent,const char *name);BusState *qbus_create (const char *typename,DeviceState *parent,const char *name); +bool qbus_realize (BusState *bus,Error **errp); +void qbus_unrealize (BusState *bus); +/* Returns > 0 if either devfn or busfn skip walk somewhere in cursion, * < 0 if either devfn or busfn terminate walk somewhere in cursion, * 0 otherwise. */ hw/core/bus.c +2
-0@@ -169,6 +169,20 @@ BusState *qbus_create(const char *typename, DeviceState *parent, const char *namreturn bus; } +bool qbus_realize (BusState *bus,Error **errp) +{
hw/core/bus.c BusState *qbus_create(const char *typename, DeviceState *parent, const char *nam · line 183
Quoted 10 lines
hw/core/bus.c +10
-0+Error *err =NULL ; + +object_property_set_bool (OBJECT (bus), true,"realized" , &err); +error_propagate (errp, err); +return !err; +} + +void qbus_unrealize (BusState *bus) +{ +object_property_set_bool (OBJECT (bus), true,"realized" , &error_abort);
Not false?
Alistair
Quoted 128 lines
hw/core/bus.c +2
-0+} +static bool bus_get_realized (Object *obj,Error **errp) {BusState *bus =BUS (obj);hw/core/qdev.c +94
-1@@ -176,6 +176,32 @@ DeviceState *qdev_try_create(BusState *bus, const char *type)return dev; } +/* +* Create a device on the heap. +* A type @name must exist. +* This only initializes the device state structure and allows +* properties to be set. The device still needs to be realized. See +* qdev-core.h. +*/ +DeviceState *qdev_new (const char *name) +{ +return DEVICE (object_new (name)); +} + +/* +* Try to create a device on the heap. +* This is like qdev_new(), except it returns %NULL when type @name +* does not exist. +*/ +DeviceState *qdev_try_new (const char *name) +{ +if (!object_class_by_name (name)) { +return NULL ; + } + +return DEVICE (object_new (name)); +} + static QTAILQ_HEAD(, DeviceListener) device_listeners =QTAILQ_HEAD_INITIALIZER (device_listeners);@@ -427,6 +453,70 @@ void qdev_init_nofail(DeviceState *dev)object_unref (OBJECT (dev)); } +/* +* Realize @dev. +* @dev must not be plugged into a bus. +* Plug @dev into @bus if non-null, else into the main system bus. +* This takes a reference to @dev. +* If @dev has no QOM parent, make one up, taking another reference. +* On success, return true. +* On failure, store an error through @errp and return false. +*/ +bool qdev_realize (DeviceState *dev,BusState *bus,Error **errp) +{ +Error *err =NULL ; + +assert (!dev->realized && !dev->parent_bus); + +if (!bus) { +/* +* Assert that the device really is a SysBusDevice before we +* put it onto the sysbus. Non-sysbus devices which aren't +* being put onto a bus should be realized with +* object_property_set_bool(OBJECT(dev), true, "realized", +* errp); +*/ +g_assert (object_dynamic_cast (OBJECT (dev),TYPE_SYS_BUS_DEVICE )); + bus =sysbus_get_default (); + } + +qdev_set_parent_bus (dev, bus); + +object_ref (OBJECT (dev)); +object_property_set_bool (OBJECT (dev), true,"realized" , &err); +if (err) { +error_propagate_prepend (errp, err, +"Initialization of device %s failed: " , +object_get_typename (OBJECT (dev))); + } +object_unref (OBJECT (dev)); +return !err; +} + +/* +* Realize @dev and drop a reference. +* This is like qdev_realize(), except it steals a reference rather +* than take one to plug @dev into @bus. On failure, it drops that +* reference instead. Intended use: +* dev = qdev_new(); +* [...] +* qdev_realize_and_unref(dev, bus, errp); +* Now @dev can go away without further ado. +*/ +bool qdev_realize_and_unref (DeviceState *dev,BusState *bus,Error **errp) +{ +bool ret; + + ret =qdev_realize (dev, bus, errp); +object_unref (OBJECT (dev)); +return ret; +} + +void qdev_unrealize (DeviceState *dev) +{ +object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); +} +static int qdev_assert_realized_properly (Object *obj,void *opaque) {DeviceState *dev =DEVICE (object_dynamic_cast (obj,TYPE_DEVICE ));@@ -1002,6 +1092,10 @@ post_realize_fail: fail:error_propagate (errp, local_err);if (unattached_parent) { +/* +* Beware, this doesn't just revert +* object_property_add_child(), it also runs bus_remove()! +*/ object_unparent (OBJECT (dev)); unattached_count--; } --2.21.1
Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc.
Quoted 126 lines · Alistair Francis
Quoted 112 lines · Markus Armbruster
We commonly plug devices into their bus right when we create them, like this:
dev = qdev_create(bus, type_name);Note that @dev is a weak reference. The reference from @bus to @dev is the only strong one.
We realize at some later time, either with
object_property_set_bool(OBJECT(dev), true, "realized", errp);or its convenience wrapper
qdev_init_nofail(dev);If @dev still has no QOM parent then, realizing makes the /machine/unattached/ orphanage its QOM parent.
Note that the device returned by
qdev_create()is plugged into a bus, but doesn't have a QOM parent, yet. Until it acquires one, unrealizing the bus will hang inbus_unparent():while ((kid = QTAILQ_FIRST(&bus->children)) != NULL) { DeviceState *dev = kid->child; object_unparent(OBJECT(dev)); }
object_unparent()does nothing when its argument has no QOM parent, and the loop spins forever.Device state "no QOM parent, but plugged into bus" is dangerous.
Paolo suggested to delay plugging into the bus until realize. We need to plug into the parent bus before we call the device's realize method, in case it uses the parent bus. So the dangerous state still exists, but only within realization, where we can manage it safely.
This commit creates infrastructure to do this:
dev = qdev_new(type_name); ... qdev_realize_and_unref(dev, bus, errp)Note that @dev becomes a strong reference here.
qdev_realize_and_unref()drops it. There is also plainqdev_realize(), which doesn't drop it.The remainder of this series will convert all users to this new interface.
Cc Michael S. Tsirkin <[email protected]>Cc Marcel Apfelbaum <[email protected]>Cc Alistair Francis <[email protected]>Cc Gerd Hoffmann <[email protected]>Cc Mark Cave-Ayland <[email protected]>Cc David Gibson <[email protected]>Signed-off-by Markus Armbruster <[email protected]>--- include/hw/qdev-core.h | 11 ++++- hw/core/bus.c | 14 +++++++ hw/core/qdev.c | 94 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 1 deletion(-)include/hw/qdev-core.h +10
-1@@ -57,7 +57,7 @@ typedef void (*BusUnrealize)(BusState *bus);* After successful realization, setting static properties will fail. * * As an interim step, the #DeviceState:realized property can also be -* set with qdev_init_nofail(). +* set with qdev_realize() or qdev_init_nofail(). * In the future, devices will propagate this state change to their children * and along busses they expose. * The point in time will be deferred to machine creation, so that values @@ -322,7 +322,13 @@ compat_props_add(GPtrArray *arr,DeviceState *qdev_create (BusState *bus,const char *name);DeviceState *qdev_try_create (BusState *bus,const char *name); +DeviceState *qdev_new (const char *name); +DeviceState *qdev_try_new (const char *name);void qdev_init_nofail (DeviceState *dev); +bool qdev_realize (DeviceState *dev,BusState *bus,Error **errp); +bool qdev_realize_and_unref (DeviceState *dev,BusState *bus,Error **errp); +void qdev_unrealize (DeviceState *dev); +void qdev_set_legacy_instance_id (DeviceState *dev,int alias_id,int required_for_version);HotplugHandler *qdev_get_bus_hotplug_handler (DeviceState *dev);@@ -411,6 +417,9 @@ typedef int (qdev_walkerfn)(DeviceState *dev, void *opaque);void qbus_create_inplace (void *bus,size_t size,const char *typename,DeviceState *parent,const char *name);BusState *qbus_create (const char *typename,DeviceState *parent,const char *name); +bool qbus_realize (BusState *bus,Error **errp); +void qbus_unrealize (BusState *bus); +/* Returns > 0 if either devfn or busfn skip walk somewhere in cursion, * < 0 if either devfn or busfn terminate walk somewhere in cursion, * 0 otherwise. */ hw/core/bus.c +2
-0@@ -169,6 +169,20 @@ BusState *qbus_create(const char *typename, DeviceState *parent, const char *namreturn bus; } +bool qbus_realize (BusState *bus,Error **errp) +{hw/core/bus.c BusState *qbus_create(const char *typename, DeviceState *parent, const char *nam · line 183
Quoted 10 lines
hw/core/bus.c +10
-0+Error *err =NULL ; + +object_property_set_bool (OBJECT (bus), true,"realized" , &err); +error_propagate (errp, err); +return !err; +} + +void qbus_unrealize (BusState *bus) +{ +object_property_set_bool (OBJECT (bus), true,"realized" , &error_abort);Not false?
Quoted 1 line
Alistair
Reasons it's &error_abort:
1. PATCH 06 and 07 transform variations of
object_property_set_bool(..., false, "realized", &error_abort);
to
qdev_unrealize(...);
No untransformed unrealization remain. Thus, we always abort on unrealization error before this series.
2. If unrealize could fail, we'd be in deep trouble. Recent commit b69c3c21a5 "qdev: Unrealize must not fail" explains:
Devices may have component devices and buses.
Device realization may fail. Realization is recursive: a device's realize() method realizes its components, and device_set_realized() realizes its buses (which should in turn realize the devices on that bus, except bus_set_realized() doesn't implement that, yet).
When realization of a component or bus fails, we need to roll back:
unrealize everything we realized so far. If any of these unrealizes failed, the device would be left in an inconsistent state. Must not happen.
device_set_realized() lets it happen: it ignores errors in the roll back code starting at label child_realize_fail.
Since realization is recursive, unrealization must be recursive, too. But how could a partly failed unrealize be rolled back? We'd have to re-realize, which can fail. This design is fundamentally broken.
device_set_realized() does not roll back at all. Instead, it keeps unrealizing, ignoring further errors.
It can screw up even for a device with no buses: if the lone dc->unrealize() fails, it still unregisters vmstate, and calls listeners' unrealize() callback.
bus_set_realized() does not roll back either. Instead, it stops unrealizing.
Fortunately, no unrealize method can fail, as we'll see below.
Clearer now?
With any luck, people will use the simpler qdev_unrealize() and qbus_unrealize(), which is the form that doesn't let them get the error handling wrong. I like it when interfaces make misuse hard :)
Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc.
Quoted 129 lines · Markus Armbruster
Quoted 126 lines · Alistair Francis
Quoted 112 lines · Markus Armbruster
We commonly plug devices into their bus right when we create them, like this:
dev = qdev_create(bus, type_name);Note that @dev is a weak reference. The reference from @bus to @dev is the only strong one.
We realize at some later time, either with
object_property_set_bool(OBJECT(dev), true, "realized", errp);or its convenience wrapper
qdev_init_nofail(dev);If @dev still has no QOM parent then, realizing makes the /machine/unattached/ orphanage its QOM parent.
Note that the device returned by
qdev_create()is plugged into a bus, but doesn't have a QOM parent, yet. Until it acquires one, unrealizing the bus will hang inbus_unparent():while ((kid = QTAILQ_FIRST(&bus->children)) != NULL) { DeviceState *dev = kid->child; object_unparent(OBJECT(dev)); }
object_unparent()does nothing when its argument has no QOM parent, and the loop spins forever.Device state "no QOM parent, but plugged into bus" is dangerous.
Paolo suggested to delay plugging into the bus until realize. We need to plug into the parent bus before we call the device's realize method, in case it uses the parent bus. So the dangerous state still exists, but only within realization, where we can manage it safely.
This commit creates infrastructure to do this:
dev = qdev_new(type_name); ... qdev_realize_and_unref(dev, bus, errp)Note that @dev becomes a strong reference here.
qdev_realize_and_unref()drops it. There is also plainqdev_realize(), which doesn't drop it.The remainder of this series will convert all users to this new interface.
Cc Michael S. Tsirkin <[email protected]>Cc Marcel Apfelbaum <[email protected]>Cc Alistair Francis <[email protected]>Cc Gerd Hoffmann <[email protected]>Cc Mark Cave-Ayland <[email protected]>Cc David Gibson <[email protected]>Signed-off-by Markus Armbruster <[email protected]>--- include/hw/qdev-core.h | 11 ++++- hw/core/bus.c | 14 +++++++ hw/core/qdev.c | 94 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 1 deletion(-)include/hw/qdev-core.h +10
-1@@ -57,7 +57,7 @@ typedef void (*BusUnrealize)(BusState *bus);* After successful realization, setting static properties will fail. * * As an interim step, the #DeviceState:realized property can also be -* set with qdev_init_nofail(). +* set with qdev_realize() or qdev_init_nofail(). * In the future, devices will propagate this state change to their children * and along busses they expose. * The point in time will be deferred to machine creation, so that values @@ -322,7 +322,13 @@ compat_props_add(GPtrArray *arr,DeviceState *qdev_create (BusState *bus,const char *name);DeviceState *qdev_try_create (BusState *bus,const char *name); +DeviceState *qdev_new (const char *name); +DeviceState *qdev_try_new (const char *name);void qdev_init_nofail (DeviceState *dev); +bool qdev_realize (DeviceState *dev,BusState *bus,Error **errp); +bool qdev_realize_and_unref (DeviceState *dev,BusState *bus,Error **errp); +void qdev_unrealize (DeviceState *dev); +void qdev_set_legacy_instance_id (DeviceState *dev,int alias_id,int required_for_version);HotplugHandler *qdev_get_bus_hotplug_handler (DeviceState *dev);@@ -411,6 +417,9 @@ typedef int (qdev_walkerfn)(DeviceState *dev, void *opaque);void qbus_create_inplace (void *bus,size_t size,const char *typename,DeviceState *parent,const char *name);BusState *qbus_create (const char *typename,DeviceState *parent,const char *name); +bool qbus_realize (BusState *bus,Error **errp); +void qbus_unrealize (BusState *bus); +/* Returns > 0 if either devfn or busfn skip walk somewhere in cursion, * < 0 if either devfn or busfn terminate walk somewhere in cursion, * 0 otherwise. */ hw/core/bus.c +2
-0@@ -169,6 +169,20 @@ BusState *qbus_create(const char *typename, DeviceState *parent, const char *namreturn bus; } +bool qbus_realize (BusState *bus,Error **errp) +{hw/core/bus.c BusState *qbus_create(const char *typename, DeviceState *parent, const char *nam · line 183
Quoted 10 lines
hw/core/bus.c +10
-0+Error *err =NULL ; + +object_property_set_bool (OBJECT (bus), true,"realized" , &err); +error_propagate (errp, err); +return !err; +} + +void qbus_unrealize (BusState *bus) +{ +object_property_set_bool (OBJECT (bus), true,"realized" , &error_abort);Not false?
Quoted 3 lines
Quoted 1 line
Alistair
Reasons it's
&error_abort:
I meant why is this not setting the bool to false instead of true?
Quoted 22 lines
1. PATCH 06 and 07 transform variations of
object_property_set_bool(..., false, "realized", &error_abort);to
qdev_unrealize(...);No untransformed unrealization remain. Thus, we always abort on unrealization error before this series.
2. If unrealize could fail, we'd be in deep trouble. Recent commit
b69c3c21a5"qdev: Unrealize must not fail" explains:Devices may have component devices and buses.
Device realization may fail. Realization is recursive: a device's
realize()method realizes its components, anddevice_set_realized()realizes its buses (which should in turn realize the devices on that bus, exceptbus_set_realized()doesn't implement that, yet).
Quoted 4 lines
When realization of a component or bus fails, we need to roll back:
unrealize everything we realized so far. If any of these unrealizes failed, the device would be left in an inconsistent state. Must not happen.
Makes sense. Maybe worth putting this in a comment here?
Quoted 15 lines
device_set_realized()lets it happen: it ignores errors in the roll back code starting at labelchild_realize_fail.Since realization is recursive, unrealization must be recursive, too. But how could a partly failed unrealize be rolled back? We'd have to re-realize, which can fail. This design is fundamentally broken.
device_set_realized()does not roll back at all. Instead, it keeps unrealizing, ignoring further errors.It can screw up even for a device with no buses: if the lone
dc->unrealize()fails, it still unregisters vmstate, and calls listeners'unrealize()callback.
Quoted 6 lines
bus_set_realized()does not roll back either. Instead, it stops unrealizing.Fortunately, no unrealize method can fail, as we'll see below.
Clearer now?
Clear on the error_abort.
Quoted 4 lines
With any luck, people will use the simpler
qdev_unrealize()andqbus_unrealize(), which is the form that doesn't let them get the error handling wrong. I like it when interfaces make misuse hard :)
Sounds good :)
Alistair
Quoted 1 line
Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc.
Quoted 130 lines · Alistair Francis
Quoted 129 lines · Markus Armbruster
Quoted 126 lines · Alistair Francis
Quoted 112 lines · Markus Armbruster
We commonly plug devices into their bus right when we create them, like this:
dev = qdev_create(bus, type_name);Note that @dev is a weak reference. The reference from @bus to @dev is the only strong one.
We realize at some later time, either with
object_property_set_bool(OBJECT(dev), true, "realized", errp);or its convenience wrapper
qdev_init_nofail(dev);If @dev still has no QOM parent then, realizing makes the /machine/unattached/ orphanage its QOM parent.
Note that the device returned by
qdev_create()is plugged into a bus, but doesn't have a QOM parent, yet. Until it acquires one, unrealizing the bus will hang inbus_unparent():while ((kid = QTAILQ_FIRST(&bus->children)) != NULL) { DeviceState *dev = kid->child; object_unparent(OBJECT(dev)); }
object_unparent()does nothing when its argument has no QOM parent, and the loop spins forever.Device state "no QOM parent, but plugged into bus" is dangerous.
Paolo suggested to delay plugging into the bus until realize. We need to plug into the parent bus before we call the device's realize method, in case it uses the parent bus. So the dangerous state still exists, but only within realization, where we can manage it safely.
This commit creates infrastructure to do this:
dev = qdev_new(type_name); ... qdev_realize_and_unref(dev, bus, errp)Note that @dev becomes a strong reference here.
qdev_realize_and_unref()drops it. There is also plainqdev_realize(), which doesn't drop it.The remainder of this series will convert all users to this new interface.
Cc Michael S. Tsirkin <[email protected]>Cc Marcel Apfelbaum <[email protected]>Cc Alistair Francis <[email protected]>Cc Gerd Hoffmann <[email protected]>Cc Mark Cave-Ayland <[email protected]>Cc David Gibson <[email protected]>Signed-off-by Markus Armbruster <[email protected]>--- include/hw/qdev-core.h | 11 ++++- hw/core/bus.c | 14 +++++++ hw/core/qdev.c | 94 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 1 deletion(-)include/hw/qdev-core.h +10
-1@@ -57,7 +57,7 @@ typedef void (*BusUnrealize)(BusState *bus);* After successful realization, setting static properties will fail. * * As an interim step, the #DeviceState:realized property can also be -* set with qdev_init_nofail(). +* set with qdev_realize() or qdev_init_nofail(). * In the future, devices will propagate this state change to their children * and along busses they expose. * The point in time will be deferred to machine creation, so that values @@ -322,7 +322,13 @@ compat_props_add(GPtrArray *arr,DeviceState *qdev_create (BusState *bus,const char *name);DeviceState *qdev_try_create (BusState *bus,const char *name); +DeviceState *qdev_new (const char *name); +DeviceState *qdev_try_new (const char *name);void qdev_init_nofail (DeviceState *dev); +bool qdev_realize (DeviceState *dev,BusState *bus,Error **errp); +bool qdev_realize_and_unref (DeviceState *dev,BusState *bus,Error **errp); +void qdev_unrealize (DeviceState *dev); +void qdev_set_legacy_instance_id (DeviceState *dev,int alias_id,int required_for_version);HotplugHandler *qdev_get_bus_hotplug_handler (DeviceState *dev);@@ -411,6 +417,9 @@ typedef int (qdev_walkerfn)(DeviceState *dev, void *opaque);void qbus_create_inplace (void *bus,size_t size,const char *typename,DeviceState *parent,const char *name);BusState *qbus_create (const char *typename,DeviceState *parent,const char *name); +bool qbus_realize (BusState *bus,Error **errp); +void qbus_unrealize (BusState *bus); +/* Returns > 0 if either devfn or busfn skip walk somewhere in cursion, * < 0 if either devfn or busfn terminate walk somewhere in cursion, * 0 otherwise. */ hw/core/bus.c +2
-0@@ -169,6 +169,20 @@ BusState *qbus_create(const char *typename, DeviceState *parent, const char *namreturn bus; } +bool qbus_realize (BusState *bus,Error **errp) +{hw/core/bus.c BusState *qbus_create(const char *typename, DeviceState *parent, const char *nam · line 183
Quoted 10 lines
hw/core/bus.c +10
-0+Error *err =NULL ; + +object_property_set_bool (OBJECT (bus), true,"realized" , &err); +error_propagate (errp, err); +return !err; +} + +void qbus_unrealize (BusState *bus) +{ +object_property_set_bool (OBJECT (bus), true,"realized" , &error_abort);Not false?
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Alistair
Reasons it's
&error_abort:I meant why is this not setting the bool to false instead of true?
Pasto, I'm blind, tests didn't save me, but you did. Thanks!
[...]
Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc.
In reply to Markus Armbrusterhw/core/qdev.c void qdev_init_nofail(DeviceState *dev) · line 492
Quoted 9 lines · Markus Armbruster
hw/core/qdev.c +9
-0+ +object_ref (OBJECT (dev)); +object_property_set_bool (OBJECT (dev), true,"realized" , &err); +if (err) { +error_propagate_prepend (errp, err, +"Initialization of device %s failed: " , +object_get_typename (OBJECT (dev))); + } +object_unref (OBJECT (dev));
Why is the ref/unref pair needed? Should it be done in the realized setter instead?
Paolo
Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc.
Quoted 11 lines · Paolo Bonzini
hw/core/qdev.c void qdev_init_nofail(DeviceState *dev) · line 492
Quoted 9 lines · Markus Armbruster
hw/core/qdev.c +9
-0+ +object_ref (OBJECT (dev)); +object_property_set_bool (OBJECT (dev), true,"realized" , &err); +if (err) { +error_propagate_prepend (errp, err, +"Initialization of device %s failed: " , +object_get_typename (OBJECT (dev))); + } +object_unref (OBJECT (dev));
Quoted 2 lines
Why is the ref/unref pair needed? Should it be done in the realized setter instead?
Copied from qdev_init_nofail(), where it is necessary (I figured out why the hard way). It doesn't seem to be necessary here, though. Thanks!
Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc.
Quoted 10 lines · Markus Armbruster
Quoted 10 lines · Markus Armbruster
Quoted 9 lines
hw/core/qdev.c +9
-0+ +object_ref (OBJECT (dev)); +object_property_set_bool (OBJECT (dev), true,"realized" , &err); +if (err) { +error_propagate_prepend (errp, err, +"Initialization of device %s failed: " , +object_get_typename (OBJECT (dev))); + } +object_unref (OBJECT (dev));
Quoted 4 lines
Quoted 2 lines
Why is the ref/unref pair needed? Should it be done in the realized setter instead?
Copied from
qdev_init_nofail(), where it is necessary (I figured out why the hard way). It doesn't seem to be necessary here, though. Thanks!
Why is it necessary there? It seems a bit iffy.
Paolo
Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc.
Quoted 11 lines · Paolo Bonzini
Quoted 10 lines · Markus Armbruster
Quoted 10 lines · Markus Armbruster
Quoted 9 lines
hw/core/qdev.c +9
-0+ +object_ref (OBJECT (dev)); +object_property_set_bool (OBJECT (dev), true,"realized" , &err); +if (err) { +error_propagate_prepend (errp, err, +"Initialization of device %s failed: " , +object_get_typename (OBJECT (dev))); + } +object_unref (OBJECT (dev));
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Why is the ref/unref pair needed? Should it be done in the realized setter instead?
Copied from
qdev_init_nofail(), where it is necessary (I figured out why the hard way). It doesn't seem to be necessary here, though. Thanks!Why is it necessary there? It seems a bit iffy.
My exact thoughts a few days back. One debugging session later, I understood, and put them right back. Glad we have tests :)
When object_property_set_bool() fails in qdev_init_nofail(), the reference count can drop to zero. Certainly surprised me. Have a look:
dev = qdev_create(bus, type_name);
// @dev is a weak reference, and @bus holds the only strong one
...
qdev_init_nofail(dev);In qdev_init_nofail():
// object_ref(OBJECT(dev));
object_property_set_bool(OBJECT(dev), true, "realized", &err);This is a fancy way to call device_set_realized(). If something goes wrong there, we execute
fail:
error_propagate(errp, local_err);
if (unattached_parent) {
/*
* Beware, this doesn't just revert
* object_property_add_child(), it also runs bus_remove()!
*/
object_unparent(OBJECT(dev));
unattached_count--;
}and bus_remove() drops the reference count to zero.
Back in qdev_init_nofail(), we then use after free:
if (err) {
error_reportf_err(err, "Initialization of device %s failed: ",
---> object_get_typename(OBJECT(dev)));
exit(1);
}
// object_unref(OBJECT(dev));The ref/unref keeps around @dev long enough for adding @dev's type name to the error message.
The equivalent new pattern doesn't have this issue:
dev = qdev_new(type_name);
// @dev is the only reference
...
qdev_realize_and_unref(dev, bus, errp);In qdev_realize(), called via qdev_realize_and_unref():
qdev_set_parent_bus(dev, bus);
// @bus now holds the second reference
// object_ref(OBJECT(dev));
object_property_set_bool(OBJECT(dev), true, "realized", &err);In device_set_realized(), the reference count drops to one, namely @dev's reference. That one goes away only in qdev_realize_and_unref(), after we added @dev's type name to the error message.
However, a boring drive to the supermarket gave me this scenario:
dev = qdev_new(type_name);
// @dev is the only reference
...
object_property_add_child(parent, name, OBJECT(dev));
// @parent holds the second reference
object_unref(dev);
// unusual, but not wrong; @parent holds the only reference now
...
qdev_realize(dev, bus, errp);Here, the reference count can drop to zero when device_set_realized() fails, and qdev_realize()'s object_get_typename() is a use after free.
Best to keep the ref/unref, I think.
Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc.
Quoted 14 lines · Markus Armbruster
If something goes
wrong there, we executefail: error_propagate(errp, local_err); if (unattached_parent) { /* * Beware, this doesn't just revert * object_property_add_child(), it also runs bus_remove()! */ object_unparent(OBJECT(dev)); unattached_count--; }
Quoted 1 line
and
bus_remove()drops the reference count to zero.
Whoa whoa... I didn't expect this from a failure to realize.
I think we should move the whole /machine/unattached dance into qdev_realize, and just assert that a device being realized already has a parent. Then the ref/unref _will_ be unnecessary. In the meanwhile, I agree to either keep it or move it inside device_set_realized.
Thanks,
Paolo
Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc.
Quoted 15 lines · Paolo Bonzini
Quoted 14 lines · Markus Armbruster
If something goes
wrong there, we executefail: error_propagate(errp, local_err); if (unattached_parent) { /* * Beware, this doesn't just revert * object_property_add_child(), it also runs bus_remove()! */ object_unparent(OBJECT(dev)); unattached_count--; }
Quoted 3 lines
Quoted 1 line
and
bus_remove()drops the reference count to zero.Whoa whoa... I didn't expect this from a failure to realize.
Me neither. But by the time I understood what's going on here, my appetite for big, structural QOM changes was pretty much gone, so I merely added the "Beware" comment.
Quoted 4 lines
I think we should move the whole /machine/unattached dance into
qdev_realize, and just assert that a device being realized already has a parent. Then the ref/unref _will_ be unnecessary. In the meanwhile, I agree to either keep it or move it insidedevice_set_realized.
Could be done on top. I might try for v2, if I can find the time.
Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc.
Il lun 25 mag 2020, 08:30 Markus Armbruster <[email protected]> ha scritto:
Quoted 7 lines
Quoted 4 lines
I think we should move the whole /machine/unattached dance into
qdev_realize, and just assert that a device being realized already has a parent. Then the ref/unref _will_ be unnecessary. In the meanwhile, I agree to either keep it or move it insidedevice_set_realized.Could be done on top. I might try for v2, if I can find the time.
Certainly on top.
Paolo
Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc.
In reply to Markus ArmbrusterQuoted 95 lines · Markus Armbruster
Quoted 11 lines · Paolo Bonzini
Quoted 10 lines · Markus Armbruster
Quoted 10 lines · Markus Armbruster
Quoted 9 lines
hw/core/qdev.c +9
-0+ +object_ref (OBJECT (dev)); +object_property_set_bool (OBJECT (dev), true,"realized" , &err); +if (err) { +error_propagate_prepend (errp, err, +"Initialization of device %s failed: " , +object_get_typename (OBJECT (dev))); + } +object_unref (OBJECT (dev));Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Why is the ref/unref pair needed? Should it be done in the realized setter instead?
Copied from
qdev_init_nofail(), where it is necessary (I figured out why the hard way). It doesn't seem to be necessary here, though. Thanks!Why is it necessary there? It seems a bit iffy.
My exact thoughts a few days back. One debugging session later, I understood, and put them right back. Glad we have tests :)
When
object_property_set_bool()fails inqdev_init_nofail(), the reference count can drop to zero. Certainly surprised me. Have a look:dev = qdev_create(bus, type_name); // @dev is a weak reference, and @bus holds the only strong one ... qdev_init_nofail(dev);In
qdev_init_nofail():// object_ref(OBJECT(dev)); object_property_set_bool(OBJECT(dev), true, "realized", &err);This is a fancy way to call
device_set_realized(). If something goes wrong there, we executefail: error_propagate(errp, local_err); if (unattached_parent) { /* * Beware, this doesn't just revert * object_property_add_child(), it also runs bus_remove()! */ object_unparent(OBJECT(dev)); unattached_count--; }and
bus_remove()drops the reference count to zero.Back in
qdev_init_nofail(), we then use after free:if (err) {
error_reportf_err(err, "Initialization of device %s failed: ",---> object_get_typename(OBJECT(dev))); exit(1); } // object_unref(OBJECT(dev));The ref/unref keeps around @dev long enough for adding @dev's type name to the error message.
The equivalent new pattern doesn't have this issue:
dev = qdev_new(type_name); // @dev is the only reference ... qdev_realize_and_unref(dev, bus, errp);In
qdev_realize(), called viaqdev_realize_and_unref():qdev_set_parent_bus(dev, bus); // @bus now holds the second reference // object_ref(OBJECT(dev)); object_property_set_bool(OBJECT(dev), true, "realized", &err);In
device_set_realized(), the reference count drops to one, namely @dev's reference. That one goes away only inqdev_realize_and_unref(), after we added @dev's type name to the error message.However, a boring drive to the supermarket gave me this scenario:
dev = qdev_new(type_name); // @dev is the only reference ... object_property_add_child(parent, name, OBJECT(dev)); // @parent holds the second reference object_unref(dev); // unusual, but not wrong; @parent holds the only reference now ... qdev_realize(dev, bus, errp);
Quoted 4 lines
Here, the reference count can drop to zero when
device_set_realized()fails, and qdev_realize()'sobject_get_typename()is a use after free.Best to keep the ref/unref, I think.
Actually, best to get rid of the "Initialization of device FOO failed: " prefix, because:
$ qemu-system-x86_64 -device virtio-blk
qemu-system-x86_64: -device virtio-blk: Initialization of device virtio-blk-pci failed: Initialization of device virtio-blk-device failed: drive property not setUgly as sin.
The prefix exists for cases like this:
$ qemu-system-x86_64 -vga cirrus -global cirrus-vga.vgamem_mb=99
qemu-system-x86_64: Initialization of device cirrus-vga failed: Invalid cirrus_vga ram size '99'Ideally, we'd point to the user configuration that caused the failure, in this case -global cirrus-vga.vgamem_mb=99. But that would be work, so we made do with mentioning the device type.
Prefix pileup is not possible with qdev_init_nofail(), because the error is immediately fatal there.
With qdev_realize(), realize failure commonly ripples through QOM composition tree parents all the way to board initialization, and the prefix gets added at every step.
If we want to keep the prefix, we could keep qdev_init_nofail(), then figure out when to use it instead of qdev_realize(). That's a lot of work. I doubt it's worthwhile now.
I'll drop it. Speak up if you want me to reconsider.
Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc.
In reply to Markus ArmbrusterQuoted 5 lines
This commit creates infrastructure to do this:
dev = qdev_new(type_name); ... qdev_realize_and_unref(dev, bus, errp)
Note that this also allows to solve some initialization order issues, specifically you can easily create devices (then do object operations like adding/aliasing properties) before the bus is created.
PATCH 4/55 qdev: Put qdev_new() to use with Coccinelle
In reply to Markus ArmbrusterLet's start simple and put qdev_new() to use. Coccinelle script:
@ depends on !(file in "hw/core/qdev.c")@
expression type_name;
@@
- DEVICE(object_new(type_name))
+ qdev_new(type_name)
--- hw/block/nand.c | 2 +- hw/misc/auxbus.c | 2 +- qdev-monitor.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
hw/block/nand.c +1 -1
@@ -644,7 +644,7 @@ DeviceState *nand_init(BlockBackend *blk, int manf_id, int chip_id)if (nand_flash_ids[chip_id].size ==0 ) {hw_error ("%s: Unsupported NAND chip ID.\n" , __func__); } - dev =DEVICE (object_new (TYPE_NAND )); + dev =qdev_new (TYPE_NAND );qdev_prop_set_uint8 (dev,"manufacturer_id" , manf_id);qdev_prop_set_uint8 (dev,"chip_id" , chip_id);if (blk) {
hw/misc/auxbus.c +1 -1
@@ -273,7 +273,7 @@ DeviceState *aux_create_slave(AUXBus *bus, const char *type) {DeviceState *dev; - dev =DEVICE (object_new (type)); + dev =qdev_new (type);assert (dev);qdev_set_parent_bus (dev, &bus->qbus);return dev;
qdev-monitor.c +1 -1
@@ -652,7 +652,7 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp) }/* create device */ - dev =DEVICE (object_new (driver)); + dev =qdev_new (driver);/* Check whether the hotplug is allowed by the machine */ if (qdev_hotplug && !qdev_hotplug_allowed (dev, &err)) {
Signature · 1 line
2.21.1
PATCH 5/55 qdev: Convert to qbus_realize(), qbus_unrealize()
In reply to Markus ArmbrusterI'm going to convert device realization to qdev_realize() with the help of Coccinelle. Convert bus realization to qbus_realize() first, to get it out of Coccinelle's way. Readability improves.
--- hw/core/qdev.c | 10 +++------- hw/pci/pci.c | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-)
hw/core/qdev.c +3 -7
@@ -1028,9 +1028,7 @@ static void device_set_realized(Object *obj, bool value, Error **errp)resettable_state_clear (&dev->reset); QLIST_FOREACH(bus, &dev->child_bus, sibling) { -object_property_set_bool (OBJECT (bus), true,"realized" , - &local_err); -if (local_err !=NULL ) { +if (!qbus_realize (bus, errp)) { goto child_realize_fail; } }
@@ -1055,8 +1053,7 @@ static void device_set_realized(Object *obj, bool value, Error **errp) }else if (!value && dev->realized) { QLIST_FOREACH(bus, &dev->child_bus, sibling) { -object_property_set_bool (OBJECT (bus), false,"realized" , - &error_abort); +qbus_unrealize (bus); }if (qdev_get_vmsd (dev)) {vmstate_unregister (VMSTATE_IF (dev),qdev_get_vmsd (dev), dev);
@@ -1074,8 +1071,7 @@ static void device_set_realized(Object *obj, bool value, Error **errp) child_realize_fail: QLIST_FOREACH(bus, &dev->child_bus, sibling) { -object_property_set_bool (OBJECT (bus), false,"realized" , - &error_abort); +qbus_unrealize (bus); }if (qdev_get_vmsd (dev)) {
hw/pci/pci.c +1 -1
@@ -456,7 +456,7 @@ void pci_root_bus_cleanup(PCIBus *bus) {pci_bus_uninit (bus);/* the caller of the unplug hotplug handler will delete this device */ -object_property_set_bool (OBJECT (bus), false,"realized" , &error_abort); +qbus_unrealize (BUS (bus)); } void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq,
Signature · 1 line
2.21.1
PATCH 6/55 qdev: Convert to qdev_unrealize() with Coccinelle
In reply to Markus ArmbrusterFor readability, and consistency with qbus_realize().
Coccinelle script:
@ depends on !(file in "hw/core/qdev.c")@
typedef DeviceState;
DeviceState *dev;
symbol false, error_abort;
@@
- object_property_set_bool(OBJECT(dev), false, "realized", &error_abort);
+ qdev_unrealize(dev);
@ depends on !(file in "hw/core/qdev.c")@
expression dev;
symbol false, error_abort;
@@
- object_property_set_bool(OBJECT(dev), false, "realized", &error_abort);
+ qdev_unrealize(DEVICE(dev));--- hw/acpi/pcihp.c | 2 +- hw/char/serial-pci-multi.c | 2 +- hw/char/serial-pci.c | 2 +- hw/core/bus.c | 3 +-- hw/i386/pc.c | 4 ++-- hw/pci/pcie.c | 2 +- hw/pci/shpc.c | 2 +- hw/ppc/spapr.c | 8 ++++---- hw/ppc/spapr_pci.c | 3 +-- hw/s390x/css-bridge.c | 2 +- hw/s390x/s390-pci-bus.c | 4 ++-- 11 files changed, 16 insertions(+), 18 deletions(-)
hw/acpi/pcihp.c +1 -1
@@ -266,7 +266,7 @@ void acpi_pcihp_device_unplug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, {trace_acpi_pci_unplug (PCI_SLOT (PCI_DEVICE (dev)->devfn),acpi_pcihp_get_bsel (pci_get_bus (PCI_DEVICE (dev)))); -object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); +qdev_unrealize (dev); } void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev,
hw/char/serial-pci-multi.c +1 -1
@@ -56,7 +56,7 @@ static void multi_serial_pci_exit(PCIDevice *dev)for (i =0 ; i < pci->ports; i++) { s = pci->state + i; -object_property_set_bool (OBJECT (s), false,"realized" , &error_abort); +qdev_unrealize (DEVICE (s));memory_region_del_subregion (&pci->iobar, &s->io);g_free (pci->name[i]); }
hw/char/serial-pci.c +1 -1
@@ -68,7 +68,7 @@ static void serial_pci_exit(PCIDevice *dev)PCISerialState *pci =DO_UPCAST (PCISerialState, dev, dev);SerialState *s = &pci->state; -object_property_set_bool (OBJECT (s), false,"realized" , &error_abort); +qdev_unrealize (DEVICE (s));qemu_free_irq (s->irq); }
hw/core/bus.c +1 -2
@@ -205,8 +205,7 @@ static void bus_set_realized(Object *obj, bool value, Error **errp) }else if (!value && bus->realized) { QTAILQ_FOREACH(kid, &bus->children, sibling) {DeviceState *dev = kid->child; -object_property_set_bool (OBJECT (dev), false,"realized" , - &error_abort); +qdev_unrealize (dev); }if (bc->unrealize) { bc->unrealize (bus);
hw/i386/pc.c +2 -2
@@ -1385,7 +1385,7 @@ static void pc_memory_unplug(HotplugHandler *hotplug_dev, }pc_dimm_unplug (PC_DIMM (dev),MACHINE (pcms)); -object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); +qdev_unrealize (dev); out:error_propagate (errp, local_err); }
@@ -1493,7 +1493,7 @@ static void pc_cpu_unplug_cb(HotplugHandler *hotplug_dev, found_cpu =pc_find_cpu_slot (MACHINE (pcms), cpu->apic_id,NULL ); found_cpu->cpu =NULL ; -object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); +qdev_unrealize (dev);/* decrement the number of CPUs */ x86ms->boot_cpus--;
hw/pci/pcie.c +1 -1
@@ -457,7 +457,7 @@ void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,void pcie_cap_slot_unplug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) { -object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); +qdev_unrealize (dev); }static void pcie_unplug_device (PCIBus *bus,PCIDevice *dev,void *opaque)
hw/pci/shpc.c +1 -1
@@ -547,7 +547,7 @@ void shpc_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,void shpc_device_unplug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) { -object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); +qdev_unrealize (dev); } void shpc_device_unplug_request_cb(HotplugHandler *hotplug_dev,
hw/ppc/spapr.c +4 -4
@@ -3670,7 +3670,7 @@ static void spapr_memory_unplug(HotplugHandler *hotplug_dev, DeviceState *dev)SpaprDimmState *ds =spapr_pending_dimm_unplugs_find (spapr,PC_DIMM (dev));pc_dimm_unplug (PC_DIMM (dev),MACHINE (hotplug_dev)); -object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); +qdev_unrealize (dev);spapr_pending_dimm_unplugs_remove (spapr, ds); }
@@ -3763,7 +3763,7 @@ static void spapr_core_unplug(HotplugHandler *hotplug_dev, DeviceState *dev)assert (core_slot); core_slot->cpu =NULL ; -object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); +qdev_unrealize (dev); } static
@@ -4036,7 +4036,7 @@ void spapr_phb_release(DeviceState *dev)static void spapr_phb_unplug (HotplugHandler *hotplug_dev,DeviceState *dev) { -object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); +qdev_unrealize (dev); } static void spapr_phb_unplug_request(HotplugHandler *hotplug_dev,
@@ -4072,7 +4072,7 @@ static void spapr_tpm_proxy_unplug(HotplugHandler *hotplug_dev, DeviceState *dev {SpaprMachineState *spapr =SPAPR_MACHINE (OBJECT (hotplug_dev)); -object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); +qdev_unrealize (dev);object_unparent (OBJECT (dev)); spapr->tpm_proxy =NULL ; }
hw/ppc/spapr_pci.c +1 -2
@@ -1587,8 +1587,7 @@ static void spapr_pci_unplug(HotplugHandler *plug_handler,return ; } -object_property_set_bool (OBJECT (plugged_dev), false,"realized" , - &error_abort); +qdev_unrealize (plugged_dev); } static void spapr_pci_unplug_request(HotplugHandler *plug_handler,
hw/s390x/css-bridge.c +1 -1
@@ -54,7 +54,7 @@ static void ccw_device_unplug(HotplugHandler *hotplug_dev,css_generate_sch_crws (sch->cssid, sch->ssid, sch->schid,1 ,0 ); -object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); +qdev_unrealize (dev); }static void virtual_css_bus_reset (BusState *qbus)
hw/s390x/s390-pci-bus.c +2 -2
@@ -1003,7 +1003,7 @@ static void s390_pcihost_unplug(HotplugHandler *hotplug_dev, DeviceState *dev, pbdev->fh, pbdev->fid); bus =pci_get_bus (pci_dev); devfn = pci_dev->devfn; -object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); +qdev_unrealize (dev);s390_pci_msix_free (pbdev);s390_pci_iommu_free (s, bus, devfn);
@@ -1014,7 +1014,7 @@ static void s390_pcihost_unplug(HotplugHandler *hotplug_dev, DeviceState *dev, pbdev->fid =0 ;QTAILQ_REMOVE (&s->zpci_devs, pbdev, link);g_hash_table_remove (s->zpci_table, &pbdev->idx); -object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); +qdev_unrealize (dev); } }
Signature · 1 line
2.21.1
PATCH 7/55 qdev: Convert to qdev_unrealize() manually
In reply to Markus Armbruster--- include/hw/qdev-core.h | 1 - hw/core/qdev.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-)
include/hw/qdev-core.h +0 -1
@@ -328,7 +328,6 @@ void qdev_init_nofail(DeviceState *dev);bool qdev_realize (DeviceState *dev,BusState *bus,Error **errp);bool qdev_realize_and_unref (DeviceState *dev,BusState *bus,Error **errp);void qdev_unrealize (DeviceState *dev); -void qdev_set_legacy_instance_id (DeviceState *dev,int alias_id,int required_for_version);HotplugHandler *qdev_get_bus_hotplug_handler (DeviceState *dev);
hw/core/qdev.c +7 -7
@@ -421,7 +421,7 @@ static void device_reset_child_foreach(Object *obj, ResettableChildCallback cb,void qdev_simple_device_unplug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) { -object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); +qdev_unrealize (dev); }/*
@@ -493,6 +493,11 @@ bool qdev_realize(DeviceState *dev, BusState *bus, Error **errp)return !err; } +void qdev_unrealize (DeviceState *dev) +{ +object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); +} +/* * Realize @dev and drop a reference. * This is like qdev_realize(), except it steals a reference rather
@@ -512,11 +517,6 @@ bool qdev_realize_and_unref(DeviceState *dev, BusState *bus, Error **errp)return ret; } -void qdev_unrealize (DeviceState *dev) -{ -object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); -} -static int qdev_assert_realized_properly (Object *obj,void *opaque) {DeviceState *dev =DEVICE (object_dynamic_cast (obj,TYPE_DEVICE ));
@@ -1187,7 +1187,7 @@ static void device_unparent(Object *obj)BusState *bus;if (dev->realized) { -object_property_set_bool (obj, false,"realized" , &error_abort); +qdev_unrealize (dev); }while (dev->num_child_bus) { bus =QLIST_FIRST (&dev->child_bus);
Signature · 1 line
2.21.1
Re: [PATCH 07/55] qdev: Convert to qdev_unrealize() manually
Quoted 14 lines · Markus Armbruster
hw/core/qdev.c +5
-0@@ -493,6 +493,11 @@ bool qdev_realize(DeviceState *dev, BusState *bus, Error **errp)return !err; } +void qdev_unrealize (DeviceState *dev) +{ +object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); +} +/* * Realize @dev and drop a reference. * This is like qdev_realize(), except it steals a reference rather @@ -512,11 +517,6 @@ bool qdev_realize_and_unref(DeviceState *dev, BusState *bus, Error **errp)return ret;
hw/core/qdev.c bool qdev_realize_and_unref(DeviceState *dev, BusState *bus, Error **errp) · line 522
Quoted 10 lines
hw/core/qdev.c +0
-5} -void qdev_unrealize (DeviceState *dev) -{ -object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); -} -static int qdev_assert_realized_properly (Object *obj,void *opaque) {DeviceState *dev =DEVICE (object_dynamic_cast (obj,TYPE_DEVICE ));
Stray change (to squash in patch 3)?
Paolo
Re: [PATCH 07/55] qdev: Convert to qdev_unrealize() manually
Quoted 17 lines · Paolo Bonzini
Quoted 16 lines · Markus Armbruster
hw/core/qdev.c +5
-0@@ -493,6 +493,11 @@ bool qdev_realize(DeviceState *dev, BusState *bus, Error **errp)return !err; } +void qdev_unrealize (DeviceState *dev) +{ +object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); +} +/* * Realize @dev and drop a reference. * This is like qdev_realize(), except it steals a reference rather @@ -512,11 +517,6 @@ bool qdev_realize_and_unref(DeviceState *dev, BusState *bus, Error **errp)return ret; }
Quoted 10 lines
hw/core/qdev.c bool qdev_realize_and_unref(DeviceState *dev, BusState *bus, Error **errp) · line 522
Quoted 8 lines
hw/core/qdev.c +0
-5-void qdev_unrealize (DeviceState *dev) -{ -object_property_set_bool (OBJECT (dev), false,"realized" , &error_abort); -} -static int qdev_assert_realized_properly (Object *obj,void *opaque) {DeviceState *dev =DEVICE (object_dynamic_cast (obj,TYPE_DEVICE ));Stray change (to squash in patch 3)?
Accident while reordering my patches for clarity. Thanks!
PATCH 8/55 qdev: Convert uses of qdev_create() with Coccinelle
In reply to Markus ArmbrusterThis is the transformation explained in the commit before previous. Takes care of just one pattern that needs conversion. More to come in this series.
Coccinelle script:
@ depends on !(file in "hw/arm/highbank.c")@
expression bus, type_name, dev;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
...
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev;
identifier DOWN;
@@
- dev = DOWN(qdev_create(bus, type_name));
+ dev = DOWN(qdev_new(type_name));
...
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name;
identifier dev;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
...
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name;
type T;
identifier dev, DOWN;
@@
- T *dev = DOWN(qdev_create(bus, type_name));
+ T *dev = DOWN(qdev_new(type_name));
...
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name, dev, errp;
symbol true;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
...
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
@@
expression bus, type_name, errp;
identifier dev;
symbol true;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
...
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);The first rule exempts hw/arm/highbank.c, because it matches along two control flow paths there, with different @type_name. Covered by the next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
--- hw/lm32/lm32.h | 13 ++--- hw/lm32/milkymist-hw.h | 37 +++++++------- include/hw/char/cadence_uart.h | 5 +- include/hw/char/cmsdk-apb-uart.h | 4 +- include/hw/char/pl011.h | 9 ++-- include/hw/char/xilinx_uartlite.h | 4 +- include/hw/cris/etraxfs.h | 4 +- include/hw/misc/unimp.h | 5 +- include/hw/timer/cmsdk-apb-timer.h | 4 +- hw/alpha/typhoon.c | 4 +- hw/arm/aspeed.c | 7 +-- hw/arm/cubieboard.c | 4 +- hw/arm/exynos4210.c | 41 +++++++-------- hw/arm/exynos4_boards.c | 4 +- hw/arm/highbank.c | 20 ++++---- hw/arm/imx25_pdk.c | 5 +- hw/arm/integratorcp.c | 4 +- hw/arm/mcimx6ul-evk.c | 5 +- hw/arm/mcimx7d-sabre.c | 5 +- hw/arm/mps2-tz.c | 4 +- hw/arm/msf2-som.c | 4 +- hw/arm/musicpal.c | 8 +-- hw/arm/netduino2.c | 4 +- hw/arm/netduinoplus2.c | 4 +- hw/arm/nseries.c | 8 +-- hw/arm/omap1.c | 16 +++--- hw/arm/omap2.c | 16 +++--- hw/arm/orangepi.c | 4 +- hw/arm/pxa2xx.c | 8 +-- hw/arm/pxa2xx_gpio.c | 5 +- hw/arm/pxa2xx_pic.c | 5 +- hw/arm/raspi.c | 4 +- hw/arm/realview.c | 20 ++++---- hw/arm/sbsa-ref.c | 20 ++++---- hw/arm/spitz.c | 4 +- hw/arm/stellaris.c | 12 ++--- hw/arm/strongarm.c | 9 ++-- hw/arm/versatilepb.c | 16 +++--- hw/arm/vexpress.c | 16 +++--- hw/arm/virt.c | 32 ++++++------ hw/arm/xilinx_zynq.c | 38 +++++++------- hw/arm/xlnx-versal-virt.c | 9 ++-- hw/arm/xlnx-versal.c | 4 +- hw/arm/xlnx-zcu102.c | 5 +- hw/audio/intel-hda.c | 4 +- hw/block/fdc.c | 12 ++--- hw/block/pflash_cfi01.c | 4 +- hw/block/pflash_cfi02.c | 4 +- hw/char/exynos4210_uart.c | 5 +- hw/char/mcf_uart.c | 5 +- hw/char/serial.c | 4 +- hw/char/spapr_vty.c | 4 +- hw/core/empty_slot.c | 5 +- hw/core/sysbus.c | 4 +- hw/cris/axis_dev88.c | 4 +- hw/display/ati.c | 4 +- hw/display/milkymist-tmu2.c | 4 +- hw/display/sm501.c | 8 +-- hw/dma/pxa2xx_dma.c | 8 +-- hw/dma/rc4030.c | 5 +- hw/dma/sparc32_dma.c | 16 +++--- hw/hppa/dino.c | 4 +- hw/hppa/lasi.c | 4 +- hw/hppa/machine.c | 4 +- hw/i2c/core.c | 5 +- hw/i2c/smbus_eeprom.c | 4 +- hw/i386/pc_q35.c | 4 +- hw/i386/x86.c | 6 +-- hw/ide/qdev.c | 4 +- hw/intc/exynos4210_gic.c | 5 +- hw/intc/s390_flic.c | 6 +-- hw/isa/isa-bus.c | 4 +- hw/m68k/mcf5208.c | 4 +- hw/m68k/mcf_intc.c | 5 +- hw/m68k/next-cube.c | 12 ++--- hw/m68k/q800.c | 36 ++++++------- hw/microblaze/petalogix_ml605_mmu.c | 20 ++++---- hw/microblaze/petalogix_s3adsp1800_mmu.c | 12 ++--- hw/mips/boston.c | 8 +-- hw/mips/gt64xxx_pci.c | 5 +- hw/mips/mips_jazz.c | 16 +++--- hw/mips/mips_malta.c | 4 +- hw/mips/mips_mipssim.c | 8 +-- hw/net/etraxfs_eth.c | 4 +- hw/net/fsl_etsec/etsec.c | 5 +- hw/net/lan9118.c | 5 +- hw/net/lasi_i82596.c | 5 +- hw/net/smc91c111.c | 5 +- hw/net/spapr_llan.c | 4 +- hw/nios2/10m50_devboard.c | 12 ++--- hw/nvram/fw_cfg.c | 8 +-- hw/openrisc/openrisc_sim.c | 8 +-- hw/pci-bridge/pci_expander_bridge.c | 4 +- hw/pci-host/bonito.c | 5 +- hw/pci-host/i440fx.c | 4 +- hw/pcmcia/pxa2xx.c | 5 +- hw/ppc/e500.c | 32 ++++++------ hw/ppc/mac_newworld.c | 40 +++++++-------- hw/ppc/mac_oldworld.c | 20 ++++---- hw/ppc/pnv.c | 4 +- hw/ppc/ppc440_uc.c | 8 +-- hw/ppc/prep.c | 9 ++-- hw/ppc/sam460ex.c | 4 +- hw/ppc/spapr.c | 8 +-- hw/ppc/spapr_irq.c | 4 +- hw/ppc/spapr_vio.c | 4 +- hw/ppc/virtex_ml507.c | 9 ++-- hw/riscv/sifive_clint.c | 5 +- hw/riscv/sifive_e_prci.c | 5 +- hw/riscv/sifive_plic.c | 5 +- hw/riscv/sifive_test.c | 5 +- hw/riscv/virt.c | 4 +- hw/rtc/m48t59.c | 5 +- hw/rtc/sun4v-rtc.c | 5 +- hw/s390x/ap-bridge.c | 4 +- hw/s390x/css-bridge.c | 4 +- hw/s390x/s390-virtio-ccw.c | 12 ++--- hw/scsi/scsi-bus.c | 4 +- hw/scsi/spapr_vscsi.c | 4 +- hw/sd/milkymist-memcard.c | 4 +- hw/sd/pxa2xx_mmci.c | 8 +-- hw/sd/ssi-sd.c | 4 +- hw/sh4/r2d.c | 12 ++--- hw/sparc/leon3.c | 12 ++--- hw/sparc/sun4m.c | 64 ++++++++++++------------ hw/sparc64/sun4u.c | 24 ++++----- hw/xen/xen-bus.c | 4 +- hw/xen/xen-legacy-backend.c | 4 +- hw/xtensa/virt.c | 4 +- hw/xtensa/xtfpga.c | 8 +-- 130 files changed, 597 insertions(+), 568 deletions(-)
hw/lm32/lm32.h +7 -6
@@ -3,14 +3,15 @@#include "hw/char/lm32_juart.h" #include "hw/qdev-properties.h" +#include "qapi/error.h" static inline DeviceState *lm32_pic_init (qemu_irq cpu_irq) {DeviceState *dev;SysBusDevice *d; - dev =qdev_create (NULL ,"lm32-pic" ); -qdev_init_nofail (dev); + dev =qdev_new ("lm32-pic" ); +qdev_realize_and_unref (dev,NULL , &error_fatal); d =SYS_BUS_DEVICE (dev);sysbus_connect_irq (d,0 , cpu_irq);
@@ -21,9 +22,9 @@ static inline DeviceState *lm32_juart_init(Chardev *chr) {DeviceState *dev; - dev =qdev_create (NULL ,TYPE_LM32_JUART ); + dev =qdev_new (TYPE_LM32_JUART );qdev_prop_set_chr (dev,"chardev" , chr); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);return dev; }
@@ -35,10 +36,10 @@ static inline DeviceState *lm32_uart_create(hwaddr addr,DeviceState *dev;SysBusDevice *s; - dev =qdev_create (NULL ,"lm32-uart" ); + dev =qdev_new ("lm32-uart" ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (s,0 , addr);sysbus_connect_irq (s,0 , irq);return dev;
hw/lm32/milkymist-hw.h +19 -18
@@ -3,6 +3,7 @@#include "hw/qdev-core.h" #include "net/net.h" +#include "qapi/error.h" static inline DeviceState *milkymist_uart_create(hwaddr base, qemu_irq irq,
@@ -10,9 +11,9 @@ static inline DeviceState *milkymist_uart_create(hwaddr base, {DeviceState *dev; - dev =qdev_create (NULL ,"milkymist-uart" ); + dev =qdev_new ("milkymist-uart" );qdev_prop_set_chr (dev,"chardev" , chr); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq);
@@ -23,8 +24,8 @@ static inline DeviceState *milkymist_hpdmc_create(hwaddr base) {DeviceState *dev; - dev =qdev_create (NULL ,"milkymist-hpdmc" ); -qdev_init_nofail (dev); + dev =qdev_new ("milkymist-hpdmc" ); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return dev;
@@ -34,8 +35,8 @@ static inline DeviceState *milkymist_memcard_create(hwaddr base) {DeviceState *dev; - dev =qdev_create (NULL ,"milkymist-memcard" ); -qdev_init_nofail (dev); + dev =qdev_new ("milkymist-memcard" ); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return dev;
@@ -46,10 +47,10 @@ static inline DeviceState *milkymist_vgafb_create(hwaddr base, {DeviceState *dev; - dev =qdev_create (NULL ,"milkymist-vgafb" ); + dev =qdev_new ("milkymist-vgafb" );qdev_prop_set_uint32 (dev,"fb_offset" , fb_offset);qdev_prop_set_uint32 (dev,"fb_mask" , fb_mask); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return dev;
@@ -62,12 +63,12 @@ static inline DeviceState *milkymist_sysctl_create(hwaddr base, {DeviceState *dev; - dev =qdev_create (NULL ,"milkymist-sysctl" ); + dev =qdev_new ("milkymist-sysctl" );qdev_prop_set_uint32 (dev,"frequency" , freq_hz);qdev_prop_set_uint32 (dev,"systemid" , system_id);qdev_prop_set_uint32 (dev,"capabilities" , capabilities);qdev_prop_set_uint32 (dev,"gpio_strappings" , gpio_strappings); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , gpio_irq);sysbus_connect_irq (SYS_BUS_DEVICE (dev),1 , timer0_irq);
@@ -81,8 +82,8 @@ static inline DeviceState *milkymist_pfpu_create(hwaddr base, {DeviceState *dev; - dev =qdev_create (NULL ,"milkymist-pfpu" ); -qdev_init_nofail (dev); + dev =qdev_new ("milkymist-pfpu" ); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq);return dev;
@@ -94,8 +95,8 @@ static inline DeviceState *milkymist_ac97_create(hwaddr base, {DeviceState *dev; - dev =qdev_create (NULL ,"milkymist-ac97" ); -qdev_init_nofail (dev); + dev =qdev_new ("milkymist-ac97" ); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , crrequest_irq);sysbus_connect_irq (SYS_BUS_DEVICE (dev),1 , crreply_irq);
@@ -111,9 +112,9 @@ static inline DeviceState *milkymist_minimac2_create(hwaddr base,DeviceState *dev;qemu_check_nic_model (&nd_table[0 ],"minimac2" ); - dev =qdev_create (NULL ,"milkymist-minimac2" ); + dev =qdev_new ("milkymist-minimac2" );qdev_set_nic_properties (dev, &nd_table[0 ]); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);sysbus_mmio_map (SYS_BUS_DEVICE (dev),1 , buffers_base);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , rx_irq);
@@ -128,10 +129,10 @@ static inline DeviceState *milkymist_softusb_create(hwaddr base, {DeviceState *dev; - dev =qdev_create (NULL ,"milkymist-softusb" ); + dev =qdev_new ("milkymist-softusb" );qdev_prop_set_uint32 (dev,"pmem_size" , pmem_size);qdev_prop_set_uint32 (dev,"dmem_size" , dmem_size); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);sysbus_mmio_map (SYS_BUS_DEVICE (dev),1 , pmem_base);sysbus_mmio_map (SYS_BUS_DEVICE (dev),2 , dmem_base);
include/hw/char/cadence_uart.h +3 -2
@@ -22,6 +22,7 @@#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" +#include "qapi/error.h" #include "qemu/timer.h" #define CADENCE_UART_RX_FIFO_SIZE 16
@@ -59,10 +60,10 @@ static inline DeviceState *cadence_uart_create(hwaddr addr,DeviceState *dev;SysBusDevice *s; - dev =qdev_create (NULL ,TYPE_CADENCE_UART ); + dev =qdev_new (TYPE_CADENCE_UART ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (s,0 , addr);sysbus_connect_irq (s,0 , irq);
include/hw/char/cmsdk-apb-uart.h +2 -2
@@ -62,11 +62,11 @@ static inline DeviceState *cmsdk_apb_uart_create(hwaddr addr,DeviceState *dev;SysBusDevice *s; - dev =qdev_create (NULL ,TYPE_CMSDK_APB_UART ); + dev =qdev_new (TYPE_CMSDK_APB_UART ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr);qdev_prop_set_uint32 (dev,"pclk-frq" , pclk_frq); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (s,0 , addr);sysbus_connect_irq (s,0 , txint);sysbus_connect_irq (s,1 , rxint);
include/hw/char/pl011.h +5 -4
@@ -18,6 +18,7 @@#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" +#include "qapi/error.h" #define TYPE_PL011 "pl011"#define PL011 (obj) OBJECT_CHECK(PL011State, (obj), TYPE_PL011)
@@ -57,10 +58,10 @@ static inline DeviceState *pl011_create(hwaddr addr,DeviceState *dev;SysBusDevice *s; - dev =qdev_create (NULL ,"pl011" ); + dev =qdev_new ("pl011" ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (s,0 , addr);sysbus_connect_irq (s,0 , irq);
@@ -74,10 +75,10 @@ static inline DeviceState *pl011_luminary_create(hwaddr addr,DeviceState *dev;SysBusDevice *s; - dev =qdev_create (NULL ,"pl011_luminary" ); + dev =qdev_new ("pl011_luminary" ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (s,0 , addr);sysbus_connect_irq (s,0 , irq);
include/hw/char/xilinx_uartlite.h +2 -2
@@ -25,10 +25,10 @@ static inline DeviceState *xilinx_uartlite_create(hwaddr addr,DeviceState *dev;SysBusDevice *s; - dev =qdev_create (NULL ,"xlnx.xps-uartlite" ); + dev =qdev_new ("xlnx.xps-uartlite" ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (s,0 , addr);sysbus_connect_irq (s,0 , irq);
include/hw/cris/etraxfs.h +2 -2
@@ -41,10 +41,10 @@ static inline DeviceState *etraxfs_ser_create(hwaddr addr,DeviceState *dev;SysBusDevice *s; - dev =qdev_create (NULL ,"etraxfs,serial" ); + dev =qdev_new ("etraxfs,serial" ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (s,0 , addr);sysbus_connect_irq (s,0 , irq);return dev;
include/hw/misc/unimp.h +3 -2
@@ -10,6 +10,7 @@#include "hw/qdev-properties.h" #include "hw/sysbus.h" +#include "qapi/error.h" #define TYPE_UNIMPLEMENTED_DEVICE "unimplemented-device"
@@ -40,11 +41,11 @@ static inline void create_unimplemented_device(const char *name, hwaddr base, hwaddr size) { -DeviceState *dev =qdev_create (NULL ,TYPE_UNIMPLEMENTED_DEVICE ); +DeviceState *dev =qdev_new (TYPE_UNIMPLEMENTED_DEVICE );qdev_prop_set_string (dev,"name" , name);qdev_prop_set_uint64 (dev,"size" , size); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map_overlap (SYS_BUS_DEVICE (dev),0 , base,-1000 ); }
include/hw/timer/cmsdk-apb-timer.h +2 -2
@@ -48,10 +48,10 @@ static inline DeviceState *cmsdk_apb_timer_create(hwaddr addr,DeviceState *dev;SysBusDevice *s; - dev =qdev_create (NULL ,TYPE_CMSDK_APB_TIMER ); + dev =qdev_new (TYPE_CMSDK_APB_TIMER ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_uint32 (dev,"pclk-frq" , pclk_frq); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (s,0 , addr);sysbus_connect_irq (s,0 , timerint);return dev;
hw/alpha/typhoon.c +2 -2
@@ -826,7 +826,7 @@ PCIBus *typhoon_init(MemoryRegion *ram, ISABus **isa_bus, qemu_irq *p_rtc_irq,PCIBus *b;int i; - dev =qdev_create (NULL ,TYPE_TYPHOON_PCI_HOST_BRIDGE ); + dev =qdev_new (TYPE_TYPHOON_PCI_HOST_BRIDGE ); s =TYPHOON_PCI_HOST_BRIDGE (dev); phb =PCI_HOST_BRIDGE (dev);
@@ -889,7 +889,7 @@ PCIBus *typhoon_init(MemoryRegion *ram, ISABus **isa_bus, qemu_irq *p_rtc_irq, &s->pchip.reg_mem, &s->pchip.reg_io, 0, 64, TYPE_PCI_BUS); phb->bus = b; -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);/* Host memory as seen from the PCI side, via the IOMMU. */ memory_region_init_iommu(&s->pchip.iommu, sizeof(s->pchip.iommu),
hw/arm/aspeed.c +4 -3
@@ -241,13 +241,14 @@ static void sdhci_attach_drive(SDHCIState *sdhci, DriveInfo *dinfo) {DeviceState *card; - card =qdev_create (qdev_get_child_bus (DEVICE (sdhci),"sd-bus" ), -TYPE_SD_CARD ); + card =qdev_new (TYPE_SD_CARD );if (dinfo) {qdev_prop_set_drive (card,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); } -object_property_set_bool (OBJECT (card), true,"realized" , &error_fatal); +qdev_realize_and_unref (card, +qdev_get_child_bus (DEVICE (sdhci),"sd-bus" ), + &error_fatal); }static void aspeed_machine_init (MachineState *machine)
hw/arm/cubieboard.c +2 -2
@@ -92,9 +92,9 @@ static void cubieboard_init(MachineState *machine) bus =qdev_get_child_bus (DEVICE (a10),"sd-bus" );/* Plug in SD card */ - carddev =qdev_create (bus,TYPE_SD_CARD ); + carddev =qdev_new (TYPE_SD_CARD );qdev_prop_set_drive (carddev,"drive" , blk, &error_fatal); -object_property_set_bool (OBJECT (carddev), true,"realized" , &error_fatal); +qdev_realize_and_unref (carddev, bus, &error_fatal);memory_region_add_subregion (get_system_memory (),AW_A10_SDRAM_BASE , machine->ram);
hw/arm/exynos4210.c +21 -20
113 lines not on this page · raw message
hw/arm/exynos4_boards.c +2 -2
@@ -81,10 +81,10 @@ static void lan9215_init(uint32_t base, qemu_irq irq)/* This should be a 9215 but the 9118 is close enough */ if (nd_table[0 ].used) {qemu_check_nic_model (&nd_table[0 ],"lan9118" ); - dev =qdev_create (NULL ,TYPE_LAN9118 ); + dev =qdev_new (TYPE_LAN9118 );qdev_set_nic_properties (dev, &nd_table[0 ]);qdev_prop_set_uint32 (dev,"mode_16bit" ,1 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);sysbus_mmio_map (s,0 , base);sysbus_connect_irq (s,0 , irq);
hw/arm/highbank.c +10 -10
@@ -311,8 +311,8 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)switch (machine_id) {case CALXEDA_HIGHBANK : - dev =qdev_create (NULL ,"l2x0" ); -qdev_init_nofail (dev); + dev =qdev_new ("l2x0" ); +qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev);sysbus_mmio_map (busdev,0 ,0xfff12000 );
@@ -338,17 +338,17 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) pic[n] =qdev_get_gpio_in (dev, n); } - dev =qdev_create (NULL ,"sp804" ); + dev =qdev_new ("sp804" );qdev_prop_set_uint32 (dev,"freq0" ,150000000 );qdev_prop_set_uint32 (dev,"freq1" ,150000000 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev);sysbus_mmio_map (busdev,0 ,0xfff34000 );sysbus_connect_irq (busdev,0 , pic[18 ]);pl011_create (0xfff36000 , pic[20 ],serial_hd (0 )); - dev =qdev_create (NULL ,TYPE_HIGHBANK_REGISTERS ); -qdev_init_nofail (dev); + dev =qdev_new (TYPE_HIGHBANK_REGISTERS ); +qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev);sysbus_mmio_map (busdev,0 ,0xfff3c000 );
@@ -363,18 +363,18 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)if (nd_table[0 ].used) {qemu_check_nic_model (&nd_table[0 ],"xgmac" ); - dev =qdev_create (NULL ,"xgmac" ); + dev =qdev_new ("xgmac" );qdev_set_nic_properties (dev, &nd_table[0 ]); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0xfff50000 );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[77 ]);sysbus_connect_irq (SYS_BUS_DEVICE (dev),1 , pic[78 ]);sysbus_connect_irq (SYS_BUS_DEVICE (dev),2 , pic[79 ]);qemu_check_nic_model (&nd_table[1 ],"xgmac" ); - dev =qdev_create (NULL ,"xgmac" ); + dev =qdev_new ("xgmac" );qdev_set_nic_properties (dev, &nd_table[1 ]); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0xfff51000 );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[80 ]);sysbus_connect_irq (SYS_BUS_DEVICE (dev),1 , pic[81 ]);
hw/arm/imx25_pdk.c +2 -3
@@ -130,10 +130,9 @@ static void imx25_pdk_init(MachineState *machine) di =drive_get_next (IF_SD ); blk = di ?blk_by_legacy_dinfo (di) :NULL ; bus =qdev_get_child_bus (DEVICE (&s->soc.esdhc[i]),"sd-bus" ); - carddev =qdev_create (bus,TYPE_SD_CARD ); + carddev =qdev_new (TYPE_SD_CARD );qdev_prop_set_drive (carddev,"drive" , blk, &error_fatal); -object_property_set_bool (OBJECT (carddev), true, -"realized" , &error_fatal); +qdev_realize_and_unref (carddev, bus, &error_fatal); }/*
hw/arm/integratorcp.c +2 -2
@@ -613,9 +613,9 @@ static void integratorcp_init(MachineState *machine) 0, ram_size);memory_region_add_subregion (address_space_mem,0x80000000 , ram_alias); - dev =qdev_create (NULL ,TYPE_INTEGRATOR_CM ); + dev =qdev_new (TYPE_INTEGRATOR_CM );qdev_prop_set_uint32 (dev,"memsz" , ram_size >>20 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map ((SysBusDevice *)dev,0 ,0x10000000 ); dev = sysbus_create_varargs(TYPE_INTEGRATOR_PIC, 0x14000000,
hw/arm/mcimx6ul-evk.c +2 -3
@@ -54,10 +54,9 @@ static void mcimx6ul_evk_init(MachineState *machine) di =drive_get_next (IF_SD ); blk = di ?blk_by_legacy_dinfo (di) :NULL ; bus =qdev_get_child_bus (DEVICE (&s->usdhc[i]),"sd-bus" ); - carddev =qdev_create (bus,TYPE_SD_CARD ); + carddev =qdev_new (TYPE_SD_CARD );qdev_prop_set_drive (carddev,"drive" , blk, &error_fatal); -object_property_set_bool (OBJECT (carddev), true, -"realized" , &error_fatal); +qdev_realize_and_unref (carddev, bus, &error_fatal); }if (!qtest_enabled ()) {
hw/arm/mcimx7d-sabre.c +2 -3
@@ -56,10 +56,9 @@ static void mcimx7d_sabre_init(MachineState *machine) di =drive_get_next (IF_SD ); blk = di ?blk_by_legacy_dinfo (di) :NULL ; bus =qdev_get_child_bus (DEVICE (&s->usdhc[i]),"sd-bus" ); - carddev =qdev_create (bus,TYPE_SD_CARD ); + carddev =qdev_new (TYPE_SD_CARD );qdev_prop_set_drive (carddev,"drive" , blk, &error_fatal); -object_property_set_bool (OBJECT (carddev), true, -"realized" , &error_fatal); +qdev_realize_and_unref (carddev, bus, &error_fatal); }if (!qtest_enabled ()) {
hw/arm/mps2-tz.c +2 -2
@@ -246,9 +246,9 @@ static MemoryRegion *make_eth_dev(MPS2TZMachineState *mms, void *opaque,* except that it doesn't support the checksum-offload feature. */ qemu_check_nic_model (nd,"lan9118" ); - mms->lan9118 =qdev_create (NULL ,TYPE_LAN9118 ); + mms->lan9118 =qdev_new (TYPE_LAN9118 );qdev_set_nic_properties (mms->lan9118, nd); -qdev_init_nofail (mms->lan9118); +qdev_realize_and_unref (mms->lan9118,NULL , &error_fatal); s =SYS_BUS_DEVICE (mms->lan9118);sysbus_connect_irq (s,0 ,get_sse_irq_in (mms,16 ));
hw/arm/msf2-som.c +2 -2
@@ -61,7 +61,7 @@ static void emcraft_sf2_s2s010_init(MachineState *machine) &error_fatal);memory_region_add_subregion (sysmem,DDR_BASE_ADDRESS , ddr); - dev =qdev_create (NULL ,TYPE_MSF2_SOC ); + dev =qdev_new (TYPE_MSF2_SOC );qdev_prop_set_string (dev,"part-name" ,"M2S010" );qdev_prop_set_string (dev,"cpu-type" , mc->default_cpu_type);
@@ -77,7 +77,7 @@ static void emcraft_sf2_s2s010_init(MachineState *machine)qdev_prop_set_uint32 (dev,"apb0div" ,2 );qdev_prop_set_uint32 (dev,"apb1div" ,2 ); -object_property_set_bool (OBJECT (dev), true,"realized" , &error_fatal); +qdev_realize_and_unref (dev,NULL , &error_fatal); soc =MSF2_SOC (dev);
hw/arm/musicpal.c +4 -4
@@ -1651,9 +1651,9 @@ static void musicpal_init(MachineState *machine)sysbus_create_simple (TYPE_MV88W8618_FLASHCFG ,MP_FLASHCFG_BASE ,NULL );qemu_check_nic_model (&nd_table[0 ],"mv88w8618" ); - dev =qdev_create (NULL ,TYPE_MV88W8618_ETH ); + dev =qdev_new (TYPE_MV88W8618_ETH );qdev_set_nic_properties (dev, &nd_table[0 ]); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,MP_ETH_BASE );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[MP_ETH_IRQ ]);
@@ -1688,11 +1688,11 @@ static void musicpal_init(MachineState *machine) } wm8750_dev =i2c_create_slave (i2c,TYPE_WM8750 ,MP_WM_ADDR ); - dev =qdev_create (NULL ,TYPE_MV88W8618_AUDIO ); + dev =qdev_new (TYPE_MV88W8618_AUDIO ); s =SYS_BUS_DEVICE (dev);object_property_set_link (OBJECT (dev),OBJECT (wm8750_dev),"wm8750" ,NULL ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (s,0 ,MP_AUDIO_BASE );sysbus_connect_irq (s,0 , pic[MP_AUDIO_IRQ ]);
hw/arm/netduino2.c +2 -2
@@ -34,9 +34,9 @@ static void netduino2_init(MachineState *machine) {DeviceState *dev; - dev =qdev_create (NULL ,TYPE_STM32F205_SOC ); + dev =qdev_new (TYPE_STM32F205_SOC );qdev_prop_set_string (dev,"cpu-type" ,ARM_CPU_TYPE_NAME ("cortex-m3" )); -object_property_set_bool (OBJECT (dev), true,"realized" , &error_fatal); +qdev_realize_and_unref (dev,NULL , &error_fatal);armv7m_load_kernel (ARM_CPU (first_cpu), machine->kernel_filename,FLASH_SIZE );
hw/arm/netduinoplus2.c +2 -2
@@ -34,9 +34,9 @@ static void netduinoplus2_init(MachineState *machine) {DeviceState *dev; - dev =qdev_create (NULL ,TYPE_STM32F405_SOC ); + dev =qdev_new (TYPE_STM32F405_SOC );qdev_prop_set_string (dev,"cpu-type" ,ARM_CPU_TYPE_NAME ("cortex-m4" )); -object_property_set_bool (OBJECT (dev), true,"realized" , &error_fatal); +qdev_realize_and_unref (dev,NULL , &error_fatal); armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename,
hw/arm/nseries.c +4 -4
@@ -174,7 +174,7 @@ static void n8x0_nand_setup(struct n800_s *s)char *otp_region;DriveInfo *dinfo; - s->nand =qdev_create (NULL ,"onenand" ); + s->nand =qdev_new ("onenand" );qdev_prop_set_uint16 (s->nand,"manufacturer_id" ,NAND_MFR_SAMSUNG );/* Either 0x40 or 0x48 are OK for the device ID */ qdev_prop_set_uint16 (s->nand,"device_id" ,0x48 );
@@ -185,7 +185,7 @@ static void n8x0_nand_setup(struct n800_s *s)qdev_prop_set_drive (s->nand,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); } -qdev_init_nofail (s->nand); +qdev_realize_and_unref (s->nand,NULL , &error_fatal);sysbus_connect_irq (SYS_BUS_DEVICE (s->nand),0 ,qdev_get_gpio_in (s->mpu->gpio,N8X0_ONENAND_GPIO )); omap_gpmc_attach(s->mpu->gpmc, N8X0_ONENAND_CS,
@@ -802,9 +802,9 @@ static void n8x0_uart_setup(struct n800_s *s)static void n8x0_usb_setup (struct n800_s *s) {SysBusDevice *dev; - s->usb =qdev_create (NULL ,"tusb6010" ); + s->usb =qdev_new ("tusb6010" ); dev =SYS_BUS_DEVICE (s->usb); -qdev_init_nofail (s->usb); +qdev_realize_and_unref (s->usb,NULL , &error_fatal);sysbus_connect_irq (dev,0 ,qdev_get_gpio_in (s->mpu->gpio,N8X0_TUSB_INT_GPIO ));/* Using the NOR interface */
hw/arm/omap1.c +8 -8
@@ -3887,20 +3887,20 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *dram,omap_clkm_init (system_memory,0xfffece00 ,0xe1008000 , s); - s->ih[0 ] =qdev_create (NULL ,"omap-intc" ); + s->ih[0 ] =qdev_new ("omap-intc" );qdev_prop_set_uint32 (s->ih[0 ],"size" ,0x100 );omap_intc_set_iclk (OMAP_INTC (s->ih[0 ]),omap_findclk (s,"arminth_ck" )); -qdev_init_nofail (s->ih[0 ]); +qdev_realize_and_unref (s->ih[0 ],NULL , &error_fatal); busdev =SYS_BUS_DEVICE (s->ih[0 ]);sysbus_connect_irq (busdev,0 ,qdev_get_gpio_in (DEVICE (s->cpu),ARM_CPU_IRQ ));sysbus_connect_irq (busdev,1 ,qdev_get_gpio_in (DEVICE (s->cpu),ARM_CPU_FIQ ));sysbus_mmio_map (busdev,0 ,0xfffecb00 ); - s->ih[1 ] =qdev_create (NULL ,"omap-intc" ); + s->ih[1 ] =qdev_new ("omap-intc" );qdev_prop_set_uint32 (s->ih[1 ],"size" ,0x800 );omap_intc_set_iclk (OMAP_INTC (s->ih[1 ]),omap_findclk (s,"arminth_ck" )); -qdev_init_nofail (s->ih[1 ]); +qdev_realize_and_unref (s->ih[1 ],NULL , &error_fatal); busdev =SYS_BUS_DEVICE (s->ih[1 ]);sysbus_connect_irq (busdev,0 ,qdev_get_gpio_in (s->ih[0 ],OMAP_INT_15XX_IH2_IRQ ));
@@ -4010,10 +4010,10 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *dram,qdev_get_gpio_in (s->ih[1 ],OMAP_INT_MPUIO ), s->wakeup, omap_findclk(s, "clk32-kHz")); - s->gpio =qdev_create (NULL ,"omap-gpio" ); + s->gpio =qdev_new ("omap-gpio" );qdev_prop_set_int32 (s->gpio,"mpu_model" , s->mpu_model);omap_gpio_set_clk (OMAP1_GPIO (s->gpio),omap_findclk (s,"arm_gpio_ck" )); -qdev_init_nofail (s->gpio); +qdev_realize_and_unref (s->gpio,NULL , &error_fatal);sysbus_connect_irq (SYS_BUS_DEVICE (s->gpio),0 ,qdev_get_gpio_in (s->ih[0 ],OMAP_INT_GPIO_BANK1 ));sysbus_mmio_map (SYS_BUS_DEVICE (s->gpio),0 ,0xfffce000 );
@@ -4028,10 +4028,10 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *dram, s->pwt =omap_pwt_init (system_memory,0xfffb6000 ,omap_findclk (s,"armxor_ck" )); - s->i2c[0 ] =qdev_create (NULL ,"omap_i2c" ); + s->i2c[0 ] =qdev_new ("omap_i2c" );qdev_prop_set_uint8 (s->i2c[0 ],"revision" ,0x11 );omap_i2c_set_fclk (OMAP_I2C (s->i2c[0 ]),omap_findclk (s,"mpuper_ck" )); -qdev_init_nofail (s->i2c[0 ]); +qdev_realize_and_unref (s->i2c[0 ],NULL , &error_fatal); busdev =SYS_BUS_DEVICE (s->i2c[0 ]);sysbus_connect_irq (busdev,0 ,qdev_get_gpio_in (s->ih[1 ],OMAP_INT_I2C ));sysbus_connect_irq (busdev,1 , s->drq[OMAP_DMA_I2C_TX ]);
hw/arm/omap2.c +8 -8
@@ -2306,11 +2306,11 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sdram, s->l4 =omap_l4_init (sysmem,OMAP2_L4_BASE ,54 );/* Actually mapped at any 2K boundary in the ARM11 private-peripheral if */ - s->ih[0 ] =qdev_create (NULL ,"omap2-intc" ); + s->ih[0 ] =qdev_new ("omap2-intc" );qdev_prop_set_uint8 (s->ih[0 ],"revision" ,0x21 );omap_intc_set_fclk (OMAP_INTC (s->ih[0 ]),omap_findclk (s,"mpu_intc_fclk" ));omap_intc_set_iclk (OMAP_INTC (s->ih[0 ]),omap_findclk (s,"mpu_intc_iclk" )); -qdev_init_nofail (s->ih[0 ]); +qdev_realize_and_unref (s->ih[0 ],NULL , &error_fatal); busdev =SYS_BUS_DEVICE (s->ih[0 ]);sysbus_connect_irq (busdev,0 ,qdev_get_gpio_in (DEVICE (s->cpu),ARM_CPU_IRQ ));
@@ -2423,11 +2423,11 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sdram,omap_findclk (s,"clk32-kHz" ), omap_findclk(s, "core_l4_iclk")); - s->i2c[0 ] =qdev_create (NULL ,"omap_i2c" ); + s->i2c[0 ] =qdev_new ("omap_i2c" );qdev_prop_set_uint8 (s->i2c[0 ],"revision" ,0x34 );omap_i2c_set_iclk (OMAP_I2C (s->i2c[0 ]),omap_findclk (s,"i2c1.iclk" ));omap_i2c_set_fclk (OMAP_I2C (s->i2c[0 ]),omap_findclk (s,"i2c1.fclk" )); -qdev_init_nofail (s->i2c[0 ]); +qdev_realize_and_unref (s->i2c[0 ],NULL , &error_fatal); busdev =SYS_BUS_DEVICE (s->i2c[0 ]);sysbus_connect_irq (busdev,0 ,qdev_get_gpio_in (s->ih[0 ],OMAP_INT_24XX_I2C1_IRQ ));
@@ -2435,11 +2435,11 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sdram,sysbus_connect_irq (busdev,2 , s->drq[OMAP24XX_DMA_I2C1_RX ]);sysbus_mmio_map (busdev,0 ,omap_l4_region_base (omap_l4tao (s->l4,5 ),0 )); - s->i2c[1 ] =qdev_create (NULL ,"omap_i2c" ); + s->i2c[1 ] =qdev_new ("omap_i2c" );qdev_prop_set_uint8 (s->i2c[1 ],"revision" ,0x34 );omap_i2c_set_iclk (OMAP_I2C (s->i2c[1 ]),omap_findclk (s,"i2c2.iclk" ));omap_i2c_set_fclk (OMAP_I2C (s->i2c[1 ]),omap_findclk (s,"i2c2.fclk" )); -qdev_init_nofail (s->i2c[1 ]); +qdev_realize_and_unref (s->i2c[1 ],NULL , &error_fatal); busdev =SYS_BUS_DEVICE (s->i2c[1 ]);sysbus_connect_irq (busdev,0 ,qdev_get_gpio_in (s->ih[0 ],OMAP_INT_24XX_I2C2_IRQ ));
@@ -2447,7 +2447,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sdram,sysbus_connect_irq (busdev,2 , s->drq[OMAP24XX_DMA_I2C2_RX ]);sysbus_mmio_map (busdev,0 ,omap_l4_region_base (omap_l4tao (s->l4,6 ),0 )); - s->gpio =qdev_create (NULL ,"omap2-gpio" ); + s->gpio =qdev_new ("omap2-gpio" );qdev_prop_set_int32 (s->gpio,"mpu_model" , s->mpu_model);omap2_gpio_set_iclk (OMAP2_GPIO (s->gpio),omap_findclk (s,"gpio_iclk" ));omap2_gpio_set_fclk (OMAP2_GPIO (s->gpio),0 ,omap_findclk (s,"gpio1_dbclk" ));
@@ -2458,7 +2458,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sdram,omap2_gpio_set_fclk (OMAP2_GPIO (s->gpio),4 ,omap_findclk (s,"gpio5_dbclk" )); } -qdev_init_nofail (s->gpio); +qdev_realize_and_unref (s->gpio,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (s->gpio);sysbus_connect_irq (busdev,0 ,qdev_get_gpio_in (s->ih[0 ],OMAP_INT_24XX_GPIO_BANK1 ));
hw/arm/orangepi.c +2 -2
@@ -94,9 +94,9 @@ static void orangepi_init(MachineState *machine) bus =qdev_get_child_bus (DEVICE (h3),"sd-bus" );/* Plug in SD card */ - carddev =qdev_create (bus,TYPE_SD_CARD ); + carddev =qdev_new (TYPE_SD_CARD );qdev_prop_set_drive (carddev,"drive" , blk, &error_fatal); -object_property_set_bool (OBJECT (carddev), true,"realized" , &error_fatal); +qdev_realize_and_unref (carddev, bus, &error_fatal);/* SDRAM */ memory_region_add_subregion(get_system_memory(), h3->memmap[AW_H3_SDRAM],
hw/arm/pxa2xx.c +4 -4
@@ -1486,10 +1486,10 @@ PXA2xxI2CState *pxa2xx_i2c_init(hwaddr base,PXA2xxI2CState *s;I2CBus *i2cbus; - dev =qdev_create (NULL ,TYPE_PXA2XX_I2C ); + dev =qdev_new (TYPE_PXA2XX_I2C );qdev_prop_set_uint32 (dev,"size" , region_size +1 );qdev_prop_set_uint32 (dev,"offset" , base & region_size); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); i2c_dev =SYS_BUS_DEVICE (dev);sysbus_mmio_map (i2c_dev,0 , base & ~region_size);
@@ -2041,9 +2041,9 @@ static PXA2xxFIrState *pxa2xx_fir_init(MemoryRegion *sysmem,DeviceState *dev;SysBusDevice *sbd; - dev =qdev_create (NULL ,TYPE_PXA2XX_FIR ); + dev =qdev_new (TYPE_PXA2XX_FIR );qdev_prop_set_chr (dev,"chardev" , chr); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); sbd =SYS_BUS_DEVICE (dev);sysbus_mmio_map (sbd,0 , base);sysbus_connect_irq (sbd,0 , irq);
hw/arm/pxa2xx_gpio.c +3 -2
@@ -15,6 +15,7 @@#include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/arm/pxa.h" +#include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h"
@@ -268,10 +269,10 @@ DeviceState *pxa2xx_gpio_init(hwaddr base,CPUState *cs =CPU (cpu);DeviceState *dev; - dev =qdev_create (NULL ,TYPE_PXA2XX_GPIO ); + dev =qdev_new (TYPE_PXA2XX_GPIO );qdev_prop_set_int32 (dev,"lines" , lines);qdev_prop_set_int32 (dev,"ncpu" , cs->cpu_index); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,
hw/arm/pxa2xx_pic.c +3 -2
@@ -9,6 +9,7 @@*/ #include "qemu/osdep.h" +#include "qapi/error.h" #include "qemu/module.h" #include "cpu.h" #include "hw/arm/pxa.h"
@@ -267,7 +268,7 @@ static int pxa2xx_pic_post_load(void *opaque, int version_id)DeviceState *pxa2xx_pic_init (hwaddr base,ARMCPU *cpu) { -DeviceState *dev =qdev_create (NULL ,TYPE_PXA2XX_PIC ); +DeviceState *dev =qdev_new (TYPE_PXA2XX_PIC );PXA2xxPICState *s =PXA2XX_PIC (dev); s->cpu = cpu;
@@ -279,7 +280,7 @@ DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu) s->is_fiq[0 ] =0 ; s->is_fiq[1 ] =0 ; -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);qdev_init_gpio_in (dev, pxa2xx_pic_set_irq,PXA2XX_PIC_SRCS );
hw/arm/raspi.c +2 -2
@@ -297,9 +297,9 @@ static void raspi_machine_init(MachineState *machine)error_report ("No SD bus found in SOC object" );exit (1 ); } - carddev =qdev_create (bus,TYPE_SD_CARD ); + carddev =qdev_new (TYPE_SD_CARD );qdev_prop_set_drive (carddev,"drive" , blk, &error_fatal); -object_property_set_bool (OBJECT (carddev), true,"realized" , &error_fatal); +qdev_realize_and_unref (carddev, bus, &error_fatal); vcram_size =object_property_get_uint (OBJECT (&s->soc),"vcram-size" , &error_abort);
hw/arm/realview.c +10 -10
@@ -161,16 +161,16 @@ static void realview_init(MachineState *machine, } sys_id = is_pb ?0x01780500 :0xc1400400 ; - sysctl =qdev_create (NULL ,"realview_sysctl" ); + sysctl =qdev_new ("realview_sysctl" );qdev_prop_set_uint32 (sysctl,"sys_id" , sys_id);qdev_prop_set_uint32 (sysctl,"proc_id" , proc_id); -qdev_init_nofail (sysctl); +qdev_realize_and_unref (sysctl,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (sysctl),0 ,0x10000000 );if (is_mpcore) { - dev =qdev_create (NULL , is_pb ?TYPE_A9MPCORE_PRIV :"realview_mpcore" ); + dev =qdev_new (is_pb ?TYPE_A9MPCORE_PRIV :"realview_mpcore" );qdev_prop_set_uint32 (dev,"num-cpu" , smp_cpus); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev);sysbus_mmio_map (busdev,0 , periphbase);for (n =0 ; n < smp_cpus; n++) {
@@ -188,9 +188,9 @@ static void realview_init(MachineState *machine, pic[n] =qdev_get_gpio_in (dev, n); } - pl041 =qdev_create (NULL ,"pl041" ); + pl041 =qdev_new ("pl041" );qdev_prop_set_uint32 (pl041,"nc_fifo_depth" ,512 ); -qdev_init_nofail (pl041); +qdev_realize_and_unref (pl041,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (pl041),0 ,0x10004000 );sysbus_connect_irq (SYS_BUS_DEVICE (pl041),0 , pic[19 ]);
@@ -203,10 +203,10 @@ static void realview_init(MachineState *machine,pl011_create (0x1000c000 , pic[15 ],serial_hd (3 ));/* DMA controller is optional, apparently. */ - dev =qdev_create (NULL ,"pl081" ); + dev =qdev_new ("pl081" );object_property_set_link (OBJECT (dev),OBJECT (sysmem),"downstream" , &error_fatal); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev);sysbus_mmio_map (busdev,0 ,0x10030000 );sysbus_connect_irq (busdev,0 , pic[24 ]);
@@ -239,9 +239,9 @@ static void realview_init(MachineState *machine,sysbus_create_simple ("pl031" ,0x10017000 , pic[10 ]);if (!is_pb) { - dev =qdev_create (NULL ,"realview_pci" ); + dev =qdev_new ("realview_pci" ); busdev =SYS_BUS_DEVICE (dev); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (busdev,0 ,0x10019000 );/* PCI controller registers */ sysbus_mmio_map (busdev,1 ,0x60000000 );/* PCI self-config */ sysbus_mmio_map (busdev,2 ,0x61000000 );/* PCI config */
hw/arm/sbsa-ref.c +10 -10
@@ -339,7 +339,7 @@ static void create_gic(SBSAMachineState *sms) gictype =gicv3_class_name (); - sms->gic =qdev_create (NULL , gictype); + sms->gic =qdev_new (gictype);qdev_prop_set_uint32 (sms->gic,"revision" ,3 );qdev_prop_set_uint32 (sms->gic,"num-cpu" , smp_cpus);/*
@@ -356,7 +356,7 @@ static void create_gic(SBSAMachineState *sms)qdev_prop_set_uint32 (sms->gic,"len-redist-region-count" ,1 );qdev_prop_set_uint32 (sms->gic,"redist-region-count[0]" , redist0_count); -qdev_init_nofail (sms->gic); +qdev_realize_and_unref (sms->gic,NULL , &error_fatal); gicbusdev =SYS_BUS_DEVICE (sms->gic);sysbus_mmio_map (gicbusdev,0 , sbsa_ref_memmap[SBSA_GIC_DIST ].base);sysbus_mmio_map (gicbusdev,1 , sbsa_ref_memmap[SBSA_GIC_REDIST ].base);
@@ -409,11 +409,11 @@ static void create_uart(const SBSAMachineState *sms, int uart, {hwaddr base = sbsa_ref_memmap[uart].base;int irq = sbsa_ref_irqmap[uart]; -DeviceState *dev =qdev_create (NULL ,TYPE_PL011 ); +DeviceState *dev =qdev_new (TYPE_PL011 );SysBusDevice *s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);memory_region_add_subregion (mem, base,sysbus_mmio_get_region (s,0 ));sysbus_connect_irq (s,0 ,qdev_get_gpio_in (sms->gic, irq));
@@ -464,9 +464,9 @@ static void create_ahci(const SBSAMachineState *sms)AHCIState *ahci;int i; - dev =qdev_create (NULL ,"sysbus-ahci" ); + dev =qdev_new ("sysbus-ahci" );qdev_prop_set_uint32 (dev,"num-ports" ,NUM_SATA_PORTS ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 ,qdev_get_gpio_in (sms->gic, irq));
@@ -497,11 +497,11 @@ static void create_smmu(const SBSAMachineState *sms, PCIBus *bus)DeviceState *dev;int i; - dev =qdev_create (NULL ,"arm-smmuv3" ); + dev =qdev_new ("arm-smmuv3" );object_property_set_link (OBJECT (dev),OBJECT (bus),"primary-bus" , &error_abort); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);for (i =0 ; i <NUM_SMMU_IRQS ; i++) { sysbus_connect_irq(SYS_BUS_DEVICE(dev), i,
@@ -525,8 +525,8 @@ static void create_pcie(SBSAMachineState *sms)PCIHostState *pci;int i; - dev =qdev_create (NULL ,TYPE_GPEX_HOST ); -qdev_init_nofail (dev); + dev =qdev_new (TYPE_GPEX_HOST ); +qdev_realize_and_unref (dev,NULL , &error_fatal);/* Map ECAM space */ ecam_alias =g_new0 (MemoryRegion,1 );
hw/arm/spitz.c +2 -2
@@ -155,7 +155,7 @@ static void sl_flash_register(PXA2xxState *cpu, int size) {DeviceState *dev; - dev =qdev_create (NULL ,TYPE_SL_NAND ); + dev =qdev_new (TYPE_SL_NAND );qdev_prop_set_uint8 (dev,"manf_id" ,NAND_MFR_SAMSUNG );if (size ==FLASH_128M )
@@ -163,7 +163,7 @@ static void sl_flash_register(PXA2xxState *cpu, int size)else if (size ==FLASH_1024M )qdev_prop_set_uint8 (dev,"chip_id" ,0xf1 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,FLASH_BASE ); }
hw/arm/stellaris.c +6 -6
@@ -1308,14 +1308,14 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board) &error_fatal);memory_region_add_subregion (system_memory,0x20000000 , sram); - nvic =qdev_create (NULL ,TYPE_ARMV7M ); + nvic =qdev_new (TYPE_ARMV7M );qdev_prop_set_uint32 (nvic,"num-irq" ,NUM_IRQ_LINES );qdev_prop_set_string (nvic,"cpu-type" , ms->cpu_type);qdev_prop_set_bit (nvic,"enable-bitband" , true);object_property_set_link (OBJECT (nvic),OBJECT (get_system_memory ()),"memory" , &error_abort);/* This will exit with an error if the user passed us a bad cpu_type */ -qdev_init_nofail (nvic); +qdev_realize_and_unref (nvic,NULL , &error_fatal);qdev_connect_gpio_out_named (nvic,"SYSRESETREQ" ,0 ,qemu_allocate_irq (&do_sys_reset,NULL ,0 ));
@@ -1347,13 +1347,13 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board)if (board->dc1 & (1 <<3 )) {/* watchdog present */ - dev =qdev_create (NULL ,TYPE_LUMINARY_WATCHDOG ); + dev =qdev_new (TYPE_LUMINARY_WATCHDOG );/* system_clock_scale is valid now */ uint32_t mainclk =NANOSECONDS_PER_SECOND / system_clock_scale;qdev_prop_set_uint32 (dev,"wdogclk-frq" , mainclk); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0x40000000u );
@@ -1425,9 +1425,9 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board)qemu_check_nic_model (&nd_table[0 ],"stellaris" ); - enet =qdev_create (NULL ,"stellaris_enet" ); + enet =qdev_new ("stellaris_enet" );qdev_set_nic_properties (enet, &nd_table[0 ]); -qdev_init_nofail (enet); +qdev_realize_and_unref (enet,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (enet),0 ,0x40048000 );sysbus_connect_irq (SYS_BUS_DEVICE (enet),0 ,qdev_get_gpio_in (nvic,42 )); }
hw/arm/strongarm.c +5 -4
@@ -42,6 +42,7 @@#include "chardev/char-serial.h" #include "sysemu/sysemu.h" #include "hw/ssi/ssi.h" +#include "qapi/error.h" #include "qemu/cutils.h" #include "qemu/log.h"
@@ -644,8 +645,8 @@ static DeviceState *strongarm_gpio_init(hwaddr base,DeviceState *dev;int i; - dev =qdev_create (NULL ,TYPE_STRONGARM_GPIO ); -qdev_init_nofail (dev); + dev =qdev_new (TYPE_STRONGARM_GPIO ); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);for (i =0 ; i <12 ; i++)
@@ -1626,9 +1627,9 @@ StrongARMState *sa1110_init(const char *cpu_type) s->ppc =sysbus_create_varargs (TYPE_STRONGARM_PPC ,0x90060000 ,NULL );for (i =0 ; sa_serial[i].io_base; i++) { -DeviceState *dev =qdev_create (NULL ,TYPE_STRONGARM_UART ); +DeviceState *dev =qdev_new (TYPE_STRONGARM_UART );qdev_prop_set_chr (dev,"chardev" ,serial_hd (i)); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , sa_serial[i].io_base); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,
hw/arm/versatilepb.c +8 -8
@@ -223,10 +223,10 @@ static void versatile_init(MachineState *machine, int board_id)/* SDRAM at address zero. */ memory_region_add_subregion (sysmem,0 , machine->ram); - sysctl =qdev_create (NULL ,"realview_sysctl" ); + sysctl =qdev_new ("realview_sysctl" );qdev_prop_set_uint32 (sysctl,"sys_id" ,0x41007004 );qdev_prop_set_uint32 (sysctl,"proc_id" ,0x02000000 ); -qdev_init_nofail (sysctl); +qdev_realize_and_unref (sysctl,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (sysctl),0 ,0x10000000 ); dev = sysbus_create_varargs("pl190", 0x10140000,
@@ -245,9 +245,9 @@ static void versatile_init(MachineState *machine, int board_id)sysbus_create_simple ("pl050_keyboard" ,0x10006000 , sic[3 ]);sysbus_create_simple ("pl050_mouse" ,0x10007000 , sic[4 ]); - dev =qdev_create (NULL ,"versatile_pci" ); + dev =qdev_new ("versatile_pci" ); busdev =SYS_BUS_DEVICE (dev); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (busdev,0 ,0x10001000 );/* PCI controller regs */ sysbus_mmio_map (busdev,1 ,0x41000000 );/* PCI self-config */ sysbus_mmio_map (busdev,2 ,0x42000000 );/* PCI config */
@@ -286,10 +286,10 @@ static void versatile_init(MachineState *machine, int board_id)pl011_create (0x101f3000 , pic[14 ],serial_hd (2 ));pl011_create (0x10009000 , sic[6 ],serial_hd (3 )); - dev =qdev_create (NULL ,"pl080" ); + dev =qdev_new ("pl080" );object_property_set_link (OBJECT (dev),OBJECT (sysmem),"downstream" , &error_fatal); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev);sysbus_mmio_map (busdev,0 ,0x10130000 );sysbus_connect_irq (busdev,0 , pic[17 ]);
@@ -319,9 +319,9 @@ static void versatile_init(MachineState *machine, int board_id)i2c_create_slave (i2c,"ds1338" ,0x68 );/* Add PL041 AACI Interface to the LM4549 codec */ - pl041 =qdev_create (NULL ,"pl041" ); + pl041 =qdev_new ("pl041" );qdev_prop_set_uint32 (pl041,"nc_fifo_depth" ,512 ); -qdev_init_nofail (pl041); +qdev_realize_and_unref (pl041,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (pl041),0 ,0x10004000 );sysbus_connect_irq (SYS_BUS_DEVICE (pl041),0 , sic[24 ]);
hw/arm/vexpress.c +8 -8
@@ -236,9 +236,9 @@ static void init_cpus(MachineState *ms, const char *cpu_type,* this must happen after the CPUs are created because a15mpcore_priv * wires itself up to the CPU's generic_timer gpio out lines. */ - dev =qdev_create (NULL , privdev); + dev =qdev_new (privdev);qdev_prop_set_uint32 (dev,"num-cpu" , smp_cpus); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev);sysbus_mmio_map (busdev,0 , periphbase);
@@ -514,7 +514,7 @@ static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt)static PFlashCFI01 *ve_pflash_cfi01_register (hwaddr base,const char *name,DriveInfo *di) { -DeviceState *dev =qdev_create (NULL ,TYPE_PFLASH_CFI01 ); +DeviceState *dev =qdev_new (TYPE_PFLASH_CFI01 );if (di) { qdev_prop_set_drive(dev, "drive", blk_by_legacy_dinfo(di),
@@ -532,7 +532,7 @@ static PFlashCFI01 *ve_pflash_cfi01_register(hwaddr base, const char *name,qdev_prop_set_uint16 (dev,"id2" ,0x00 );qdev_prop_set_uint16 (dev,"id3" ,0x00 );qdev_prop_set_string (dev,"name" , name); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return PFLASH_CFI01 (dev);
@@ -593,7 +593,7 @@ static void vexpress_common_init(MachineState *machine) sys_id =0x1190f500 ; - sysctl =qdev_create (NULL ,"realview_sysctl" ); + sysctl =qdev_new ("realview_sysctl" );qdev_prop_set_uint32 (sysctl,"sys_id" , sys_id);qdev_prop_set_uint32 (sysctl,"proc_id" , daughterboard->proc_id); qdev_prop_set_uint32(sysctl, "len-db-voltage",
@@ -610,15 +610,15 @@ static void vexpress_common_init(MachineState *machine)qdev_prop_set_uint32 (sysctl, propname, daughterboard->clocks[i]);g_free (propname); } -qdev_init_nofail (sysctl); +qdev_realize_and_unref (sysctl,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (sysctl),0 , map[VE_SYSREGS ]);/* VE_SP810: not modelled */ /* VE_SERIALPCI: not modelled */ - pl041 =qdev_create (NULL ,"pl041" ); + pl041 =qdev_new ("pl041" );qdev_prop_set_uint32 (pl041,"nc_fifo_depth" ,512 ); -qdev_init_nofail (pl041); +qdev_realize_and_unref (pl041,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (pl041),0 , map[VE_PL041 ]);sysbus_connect_irq (SYS_BUS_DEVICE (pl041),0 , pic[11 ]);
hw/arm/virt.c +16 -16
@@ -572,14 +572,14 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms) event |=ACPI_GED_NVDIMM_HOTPLUG_EVT ; } - dev =qdev_create (NULL ,TYPE_ACPI_GED ); + dev =qdev_new (TYPE_ACPI_GED );qdev_prop_set_uint32 (dev,"ged-event" , event);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , vms->memmap[VIRT_ACPI_GED ].base);sysbus_mmio_map (SYS_BUS_DEVICE (dev),1 , vms->memmap[VIRT_PCDIMM_ACPI ].base);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 ,qdev_get_gpio_in (vms->gic, irq)); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);return dev; }
@@ -594,11 +594,11 @@ static void create_its(VirtMachineState *vms)return ; } - dev =qdev_create (NULL , itsclass); + dev =qdev_new (itsclass);object_property_set_link (OBJECT (dev),OBJECT (vms->gic),"parent-gicv3" , &error_abort); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , vms->memmap[VIRT_GIC_ITS ].base);fdt_add_its_gic_node (vms);
@@ -610,11 +610,11 @@ static void create_v2m(VirtMachineState *vms)int irq = vms->irqmap[VIRT_GIC_V2M ];DeviceState *dev; - dev =qdev_create (NULL ,"arm-gicv2m" ); + dev =qdev_new ("arm-gicv2m" );sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , vms->memmap[VIRT_GIC_V2M ].base);qdev_prop_set_uint32 (dev,"base-spi" , irq);qdev_prop_set_uint32 (dev,"num-spi" ,NUM_GICV2M_SPIS ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);for (i =0 ; i <NUM_GICV2M_SPIS ; i++) { sysbus_connect_irq(SYS_BUS_DEVICE(dev), i,
@@ -636,7 +636,7 @@ static void create_gic(VirtMachineState *vms) gictype = (type ==3 ) ?gicv3_class_name () :gic_class_name (); - vms->gic =qdev_create (NULL , gictype); + vms->gic =qdev_new (gictype);qdev_prop_set_uint32 (vms->gic,"revision" , type);qdev_prop_set_uint32 (vms->gic,"num-cpu" , smp_cpus);/* Note that the num-irq property counts both internal and external
@@ -671,7 +671,7 @@ static void create_gic(VirtMachineState *vms) vms->virt); } } -qdev_init_nofail (vms->gic); +qdev_realize_and_unref (vms->gic,NULL , &error_fatal); gicbusdev =SYS_BUS_DEVICE (vms->gic);sysbus_mmio_map (gicbusdev,0 , vms->memmap[VIRT_GIC_DIST ].base);if (type ==3 ) {
@@ -754,11 +754,11 @@ static void create_uart(const VirtMachineState *vms, int uart,int irq = vms->irqmap[uart];const char compat[] ="arm,pl011\0arm,primecell" ;const char clocknames[] ="uartclk\0apb_pclk" ; -DeviceState *dev =qdev_create (NULL ,TYPE_PL011 ); +DeviceState *dev =qdev_new (TYPE_PL011 );SysBusDevice *s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);memory_region_add_subregion (mem, base,sysbus_mmio_get_region (s,0 ));sysbus_connect_irq (s,0 ,qdev_get_gpio_in (vms->gic, irq));
@@ -1173,11 +1173,11 @@ static void create_smmu(const VirtMachineState *vms,return ; } - dev =qdev_create (NULL ,"arm-smmuv3" ); + dev =qdev_new ("arm-smmuv3" );object_property_set_link (OBJECT (dev),OBJECT (bus),"primary-bus" , &error_abort); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);for (i =0 ; i <NUM_SMMU_IRQS ; i++) { sysbus_connect_irq(SYS_BUS_DEVICE(dev), i,
@@ -1253,8 +1253,8 @@ static void create_pcie(VirtMachineState *vms)int i, ecam_id;PCIHostState *pci; - dev =qdev_create (NULL ,TYPE_GPEX_HOST ); -qdev_init_nofail (dev); + dev =qdev_new (TYPE_GPEX_HOST ); +qdev_realize_and_unref (dev,NULL , &error_fatal); ecam_id =VIRT_ECAM_ID (vms->highmem_ecam); base_ecam = vms->memmap[ecam_id].base;
@@ -1372,11 +1372,11 @@ static void create_platform_bus(VirtMachineState *vms)int i;MemoryRegion *sysmem =get_system_memory (); - dev =qdev_create (NULL ,TYPE_PLATFORM_BUS_DEVICE ); + dev =qdev_new (TYPE_PLATFORM_BUS_DEVICE ); dev->id =TYPE_PLATFORM_BUS_DEVICE ;qdev_prop_set_uint32 (dev,"num_irqs" ,PLATFORM_BUS_NUM_IRQS );qdev_prop_set_uint32 (dev,"mmio_size" , vms->memmap[VIRT_PLATFORM_BUS ].size); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); vms->platform_bus_dev = dev; s =SYS_BUS_DEVICE (dev);
hw/arm/xilinx_zynq.c +19 -19
@@ -114,12 +114,12 @@ static void gem_init(NICInfo *nd, uint32_t base, qemu_irq irq)DeviceState *dev;SysBusDevice *s; - dev =qdev_create (NULL ,TYPE_CADENCE_GEM ); + dev =qdev_new (TYPE_CADENCE_GEM );if (nd->used) {qemu_check_nic_model (nd,TYPE_CADENCE_GEM );qdev_set_nic_properties (dev, nd); } -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);sysbus_mmio_map (s,0 , base);sysbus_connect_irq (s,0 , irq);
@@ -136,11 +136,11 @@ static inline void zynq_init_spi_flashes(uint32_t base_addr, qemu_irq irq,int num_busses = is_qspi ?NUM_QSPI_BUSSES :1 ;int num_ss = is_qspi ?NUM_QSPI_FLASHES :NUM_SPI_FLASHES ; - dev =qdev_create (NULL , is_qspi ?"xlnx.ps7-qspi" :"xlnx.ps7-spi" ); + dev =qdev_new (is_qspi ?"xlnx.ps7-qspi" :"xlnx.ps7-spi" );qdev_prop_set_uint8 (dev,"num-txrx-bytes" , is_qspi ?4 :1 );qdev_prop_set_uint8 (dev,"num-ss-bits" , num_ss);qdev_prop_set_uint8 (dev,"num-busses" , num_busses); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev);sysbus_mmio_map (busdev,0 , base_addr);if (is_qspi) {
@@ -222,8 +222,8 @@ static void zynq_init(MachineState *machine) 0);/* Create slcr, keep a pointer to connect clocks */ - slcr =qdev_create (NULL ,"xilinx,zynq_slcr" ); -qdev_init_nofail (slcr); + slcr =qdev_new ("xilinx,zynq_slcr" ); +qdev_realize_and_unref (slcr,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (slcr),0 ,0xF8000000 );/* Create the main clock source, and feed slcr with it */
@@ -234,9 +234,9 @@ static void zynq_init(MachineState *machine)clock_set_hz (zynq_machine->ps_clk,PS_CLK_FREQUENCY );qdev_connect_clock_in (slcr,"ps_clk" , zynq_machine->ps_clk); - dev =qdev_create (NULL ,TYPE_A9MPCORE_PRIV ); + dev =qdev_new (TYPE_A9MPCORE_PRIV );qdev_prop_set_uint32 (dev,"num-cpu" ,1 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev);sysbus_mmio_map (busdev,0 ,MPCORE_PERIPHBASE ); sysbus_connect_irq(busdev, 0,
@@ -280,27 +280,27 @@ static void zynq_init(MachineState *machine)* - SDIO Specification Version 2.0 * - MMC Specification Version 3.31 */ - dev =qdev_create (NULL ,TYPE_SYSBUS_SDHCI ); + dev =qdev_new (TYPE_SYSBUS_SDHCI );qdev_prop_set_uint8 (dev,"sd-spec-version" ,2 );qdev_prop_set_uint64 (dev,"capareg" ,ZYNQ_SDHCI_CAPABILITIES ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , hci_addr);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[hci_irq -IRQ_OFFSET ]); di =drive_get_next (IF_SD ); blk = di ?blk_by_legacy_dinfo (di) :NULL ; - carddev =qdev_create (qdev_get_child_bus (dev,"sd-bus" ),TYPE_SD_CARD ); + carddev =qdev_new (TYPE_SD_CARD );qdev_prop_set_drive (carddev,"drive" , blk, &error_fatal); -object_property_set_bool (OBJECT (carddev), true,"realized" , - &error_fatal); +qdev_realize_and_unref (carddev,qdev_get_child_bus (dev,"sd-bus" ), + &error_fatal); } - dev =qdev_create (NULL ,TYPE_ZYNQ_XADC ); -qdev_init_nofail (dev); + dev =qdev_new (TYPE_ZYNQ_XADC ); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0xF8007100 );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[39 -IRQ_OFFSET ]); - dev =qdev_create (NULL ,"pl330" ); + dev =qdev_new ("pl330" );qdev_prop_set_uint8 (dev,"num_chnls" ,8 );qdev_prop_set_uint8 (dev,"num_periph_req" ,4 );qdev_prop_set_uint8 (dev,"num_events" ,16 );
@@ -312,7 +312,7 @@ static void zynq_init(MachineState *machine)qdev_prop_set_uint8 (dev,"rd_q_dep" ,16 );qdev_prop_set_uint16 (dev,"data_buffer_dep" ,256 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev);sysbus_mmio_map (busdev,0 ,0xF8003000 );sysbus_connect_irq (busdev,0 , pic[45 -IRQ_OFFSET ]);/* abort irq line */
@@ -320,8 +320,8 @@ static void zynq_init(MachineState *machine)sysbus_connect_irq (busdev, n +1 , pic[dma_irqs[n] -IRQ_OFFSET ]); } - dev =qdev_create (NULL ,"xlnx.ps7-dev-cfg" ); -qdev_init_nofail (dev); + dev =qdev_new ("xlnx.ps7-dev-cfg" ); +qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev);sysbus_connect_irq (busdev,0 , pic[40 -IRQ_OFFSET ]);sysbus_mmio_map (busdev,0 ,0xF8007000 );
hw/arm/xlnx-versal-virt.c +5 -4
@@ -432,9 +432,9 @@ static void create_virtio_regions(VersalVirt *s)qemu_irq pic_irq; pic_irq =qdev_get_gpio_in (DEVICE (&s->soc.fpd.apu.gic), irq); - dev =qdev_create (NULL ,"virtio-mmio" ); + dev =qdev_new ("virtio-mmio" );object_property_add_child (OBJECT (&s->soc), name,OBJECT (dev)); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic_irq); mr =sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 );memory_region_add_subregion (&s->soc.mr_ps, base, mr);
@@ -463,10 +463,11 @@ static void sd_plugin_card(SDHCIState *sd, DriveInfo *di)BlockBackend *blk = di ?blk_by_legacy_dinfo (di) :NULL ;DeviceState *card; - card =qdev_create (qdev_get_child_bus (DEVICE (sd),"sd-bus" ),TYPE_SD_CARD ); + card =qdev_new (TYPE_SD_CARD );object_property_add_child (OBJECT (sd),"card[*]" ,OBJECT (card));qdev_prop_set_drive (card,"drive" , blk, &error_fatal); -object_property_set_bool (OBJECT (card), true,"realized" , &error_fatal); +qdev_realize_and_unref (card,qdev_get_child_bus (DEVICE (sd),"sd-bus" ), + &error_fatal); }static void versal_virt_init (MachineState *machine)
hw/arm/xlnx-versal.c +2 -2
@@ -304,13 +304,13 @@ static void versal_unimp_area(Versal *s, const char *name,MemoryRegion *mr, hwaddr base, hwaddr size) { - DeviceState *dev = qdev_create(NULL, TYPE_UNIMPLEMENTED_DEVICE); + DeviceState *dev = qdev_new(TYPE_UNIMPLEMENTED_DEVICE);MemoryRegion *mr_dev;qdev_prop_set_string (dev,"name" , name);qdev_prop_set_uint64 (dev,"size" , size);object_property_add_child (OBJECT (s), name,OBJECT (dev)); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); mr_dev =sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 );memory_region_add_subregion (mr, base, mr_dev);
hw/arm/xlnx-zcu102.c +2 -3
@@ -143,10 +143,9 @@ static void xlnx_zcu102_init(MachineState *machine)error_report ("No SD bus found for SD card %d" , i);exit (1 ); } - carddev =qdev_create (bus,TYPE_SD_CARD ); + carddev =qdev_new (TYPE_SD_CARD );qdev_prop_set_drive (carddev,"drive" , blk, &error_fatal); -object_property_set_bool (OBJECT (carddev), true,"realized" , - &error_fatal); +qdev_realize_and_unref (carddev, bus, &error_fatal); }for (i =0 ; i <XLNX_ZYNQMP_NUM_SPIS ; i++) {
hw/audio/intel-hda.c +2 -2
@@ -1309,8 +1309,8 @@ static int intel_hda_and_codec_init(PCIBus *bus) controller =DEVICE (pci_create_simple (bus,-1 ,"intel-hda" )); hdabus =QLIST_FIRST (&controller->child_bus); - codec =qdev_create (hdabus,"hda-duplex" ); -qdev_init_nofail (codec); + codec =qdev_new ("hda-duplex" ); +qdev_realize_and_unref (codec, hdabus, &error_fatal);return 0 ; }
hw/block/fdc.c +6 -6
@@ -2516,7 +2516,7 @@ static void fdctrl_connect_drives(FDCtrl *fdctrl, DeviceState *fdc_dev,continue ; } - dev =qdev_create (&fdctrl->bus.bus,"floppy" ); + dev =qdev_new ("floppy" );qdev_prop_set_uint32 (dev,"unit" , i);qdev_prop_set_enum (dev,"drive-type" , fdctrl->qdev_for_drives[i].type);
@@ -2533,7 +2533,7 @@ static void fdctrl_connect_drives(FDCtrl *fdctrl, DeviceState *fdc_dev,return ; } -object_property_set_bool (OBJECT (dev), true,"realized" , &local_err); +qdev_realize_and_unref (dev, &fdctrl->bus.bus, &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -2573,7 +2573,7 @@ void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,SysBusDevice *sbd;FDCtrlSysBus *sys; - dev =qdev_create (NULL ,"sysbus-fdc" ); + dev =qdev_new ("sysbus-fdc" ); sys =SYSBUS_FDC (dev); fdctrl = &sys->state; fdctrl->dma_chann = dma_chann;/* FIXME */
@@ -2585,7 +2585,7 @@ void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,qdev_prop_set_drive (dev,"driveB" ,blk_by_legacy_dinfo (fds[1 ]), &error_fatal); } -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); sbd =SYS_BUS_DEVICE (dev);sysbus_connect_irq (sbd,0 , irq);sysbus_mmio_map (sbd,0 , mmio_base);
@@ -2597,12 +2597,12 @@ void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base,DeviceState *dev;FDCtrlSysBus *sys; - dev =qdev_create (NULL ,"SUNW,fdtwo" ); + dev =qdev_new ("SUNW,fdtwo" );if (fds[0 ]) {qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (fds[0 ]), &error_fatal); } -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); sys =SYSBUS_FDC (dev);sysbus_connect_irq (SYS_BUS_DEVICE (sys),0 , irq);sysbus_mmio_map (SYS_BUS_DEVICE (sys),0 , io_base);
hw/block/pflash_cfi01.c +2 -2
@@ -960,7 +960,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base, uint16_t id2, uint16_t id3, int be) { - DeviceState *dev = qdev_create(NULL, TYPE_PFLASH_CFI01); + DeviceState *dev = qdev_new(TYPE_PFLASH_CFI01);if (blk) {qdev_prop_set_drive (dev,"drive" , blk, &error_abort);
@@ -975,7 +975,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base,qdev_prop_set_uint16 (dev,"id2" , id2);qdev_prop_set_uint16 (dev,"id3" , id3);qdev_prop_set_string (dev,"name" , name); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return PFLASH_CFI01 (dev);
hw/block/pflash_cfi02.c +2 -2
@@ -992,7 +992,7 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base, uint16_t unlock_addr1, int be) { -DeviceState *dev =qdev_create (NULL ,TYPE_PFLASH_CFI02 ); +DeviceState *dev =qdev_new (TYPE_PFLASH_CFI02 );if (blk) {qdev_prop_set_drive (dev,"drive" , blk, &error_abort);
@@ -1010,7 +1010,7 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base,qdev_prop_set_uint16 (dev,"unlock-addr0" , unlock_addr0);qdev_prop_set_uint16 (dev,"unlock-addr1" , unlock_addr1);qdev_prop_set_string (dev,"name" , name); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return PFLASH_CFI02 (dev);
hw/char/exynos4210_uart.c +3 -2
@@ -22,6 +22,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "migration/vmstate.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/timer.h"
@@ -652,7 +653,7 @@ DeviceState *exynos4210_uart_create(hwaddr addr,DeviceState *dev;SysBusDevice *bus; - dev =qdev_create (NULL ,TYPE_EXYNOS4210_UART ); + dev =qdev_new (TYPE_EXYNOS4210_UART );qdev_prop_set_chr (dev,"chardev" , chr);qdev_prop_set_uint32 (dev,"channel" , channel);
@@ -660,7 +661,7 @@ DeviceState *exynos4210_uart_create(hwaddr addr,qdev_prop_set_uint32 (dev,"tx-size" , fifo_size); bus =SYS_BUS_DEVICE (dev); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);if (addr != (hwaddr)-1 ) {sysbus_mmio_map (bus,0 , addr); }
hw/char/mcf_uart.c +3 -2
@@ -10,6 +10,7 @@#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" +#include "qapi/error.h" #include "hw/m68k/mcf.h" #include "hw/qdev-properties.h" #include "chardev/char-fe.h"
@@ -343,11 +344,11 @@ void *mcf_uart_init(qemu_irq irq, Chardev *chrdrv) {DeviceState *dev; - dev =qdev_create (NULL ,TYPE_MCF_UART ); + dev =qdev_new (TYPE_MCF_UART );if (chrdrv) {qdev_prop_set_chr (dev,"chardev" , chrdrv); } -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq);
hw/char/serial.c +2 -2
@@ -1127,7 +1127,7 @@ SerialMM *serial_mm_init(MemoryRegion *address_space, qemu_irq irq, int baudbase, Chardev *chr, enum device_endian end) { - SerialMM *smm = SERIAL_MM(qdev_create(NULL, TYPE_SERIAL_MM)); + SerialMM *smm = SERIAL_MM(qdev_new(TYPE_SERIAL_MM));MemoryRegion *mr;qdev_prop_set_uint8 (DEVICE (smm),"regshift" , regshift);
@@ -1135,7 +1135,7 @@ SerialMM *serial_mm_init(MemoryRegion *address_space,qdev_prop_set_chr (DEVICE (smm),"chardev" , chr);qdev_set_legacy_instance_id (DEVICE (smm), base,2 );qdev_prop_set_uint8 (DEVICE (smm),"endianness" , end); -qdev_init_nofail (DEVICE (smm)); +qdev_realize_and_unref (DEVICE (smm),NULL , &error_fatal);sysbus_connect_irq (SYS_BUS_DEVICE (smm),0 , irq); mr =sysbus_mmio_get_region (SYS_BUS_DEVICE (smm),0 );
hw/char/spapr_vty.c +2 -2
@@ -158,9 +158,9 @@ void spapr_vty_create(SpaprVioBus *bus, Chardev *chardev) {DeviceState *dev; - dev =qdev_create (&bus->bus,"spapr-vty" ); + dev =qdev_new ("spapr-vty" );qdev_prop_set_chr (dev,"chardev" , chardev); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev, &bus->bus, &error_fatal); }static Property spapr_vty_properties[] = {
hw/core/empty_slot.c +3 -2
@@ -11,6 +11,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" +#include "qapi/error.h" #include "qemu/module.h" #include "hw/empty_slot.h"
@@ -60,12 +61,12 @@ void empty_slot_init(hwaddr addr, uint64_t slot_size)SysBusDevice *s;EmptySlot *e; - dev =qdev_create (NULL ,TYPE_EMPTY_SLOT ); + dev =qdev_new (TYPE_EMPTY_SLOT ); s =SYS_BUS_DEVICE (dev); e =EMPTY_SLOT (dev); e->size = slot_size; -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (s,0 , addr); }
hw/core/sysbus.c +2 -2
@@ -230,9 +230,9 @@ DeviceState *sysbus_create_varargs(const char *name,qemu_irq irq;int n; - dev =qdev_create (NULL , name); + dev =qdev_new (name); s =SYS_BUS_DEVICE (dev); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);if (addr != (hwaddr)-1 ) {sysbus_mmio_map (s,0 , addr); }
hw/cris/axis_dev88.c +2 -2
@@ -289,8 +289,8 @@ void axisdev88_init(MachineState *machine) &gpio_state.iomem); - dev =qdev_create (NULL ,"etraxfs,pic" ); -qdev_init_nofail (dev); + dev =qdev_new ("etraxfs,pic" ); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);sysbus_mmio_map (s,0 ,0x3001c000 );sysbus_connect_irq (s,0 ,qdev_get_gpio_in (DEVICE (cpu),CRIS_CPU_IRQ ));
hw/display/ati.c +2 -2
@@ -927,9 +927,9 @@ static void ati_vga_realize(PCIDevice *dev, Error **errp)/* ddc, edid */ I2CBus *i2cbus =i2c_init_bus (DEVICE (s),"ati-vga.ddc" );bitbang_i2c_init (&s->bbi2c, i2cbus); -I2CSlave *i2cddc =I2C_SLAVE (qdev_create (BUS (i2cbus),TYPE_I2CDDC )); +I2CSlave *i2cddc =I2C_SLAVE (qdev_new (TYPE_I2CDDC ));i2c_set_slave_address (i2cddc,0x50 ); -qdev_init_nofail (DEVICE (i2cddc)); +qdev_realize_and_unref (DEVICE (i2cddc),BUS (i2cbus), &error_fatal);/* mmio register space */ memory_region_init_io(&s->mm, OBJECT(s), &ati_mm_ops, s,
hw/display/milkymist-tmu2.c +2 -2
@@ -543,8 +543,8 @@ DeviceState *milkymist_tmu2_create(hwaddr base, qemu_irq irq)XFree (configs);XCloseDisplay (d); - dev =qdev_create (NULL ,TYPE_MILKYMIST_TMU2 ); -qdev_init_nofail (dev); + dev =qdev_new (TYPE_MILKYMIST_TMU2 ); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq);
hw/display/sm501.c +4 -4
@@ -1814,9 +1814,9 @@ static void sm501_init(SM501State *s, DeviceState *dev,/* i2c */ s->i2c_bus =i2c_init_bus (dev,"sm501.i2c" );/* ddc */ -I2CDDCState *ddc =I2CDDC (qdev_create (BUS (s->i2c_bus),TYPE_I2CDDC )); +I2CDDCState *ddc =I2CDDC (qdev_new (TYPE_I2CDDC ));i2c_set_slave_address (I2C_SLAVE (ddc),0x50 ); -qdev_init_nofail (DEVICE (ddc)); +qdev_realize_and_unref (DEVICE (ddc),BUS (s->i2c_bus), &error_fatal);/* mmio */ memory_region_init (&s->mmio_region,OBJECT (dev),"sm501.mmio" ,MMIO_SIZE );
@@ -1951,10 +1951,10 @@ static void sm501_realize_sysbus(DeviceState *dev, Error **errp)sysbus_init_mmio (sbd, &s->state.mmio_region);/* bridge to usb host emulation module */ - usb_dev =qdev_create (NULL ,"sysbus-ohci" ); + usb_dev =qdev_new ("sysbus-ohci" );qdev_prop_set_uint32 (usb_dev,"num-ports" ,2 );qdev_prop_set_uint64 (usb_dev,"dma-offset" , s->base); -qdev_init_nofail (usb_dev); +qdev_realize_and_unref (usb_dev,NULL , &error_fatal);memory_region_add_subregion (&s->state.mmio_region,SM501_USB_HOST ,sysbus_mmio_get_region (SYS_BUS_DEVICE (usb_dev),0 ));sysbus_pass_irq (sbd,SYS_BUS_DEVICE (usb_dev));
hw/dma/pxa2xx_dma.c +4 -4
@@ -491,9 +491,9 @@ DeviceState *pxa27x_dma_init(hwaddr base, qemu_irq irq) {DeviceState *dev; - dev =qdev_create (NULL ,"pxa2xx-dma" ); + dev =qdev_new ("pxa2xx-dma" );qdev_prop_set_int32 (dev,"channels" ,PXA27X_DMA_NUM_CHANNELS ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq);
@@ -505,9 +505,9 @@ DeviceState *pxa255_dma_init(hwaddr base, qemu_irq irq) {DeviceState *dev; - dev =qdev_create (NULL ,"pxa2xx-dma" ); + dev =qdev_new ("pxa2xx-dma" );qdev_prop_set_int32 (dev,"channels" ,PXA27X_DMA_NUM_CHANNELS ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq);
hw/dma/rc4030.c +3 -2
@@ -28,6 +28,7 @@#include "hw/mips/mips.h" #include "hw/sysbus.h" #include "migration/vmstate.h" +#include "qapi/error.h" #include "qemu/timer.h" #include "qemu/log.h" #include "qemu/module.h"
@@ -744,8 +745,8 @@ DeviceState *rc4030_init(rc4030_dma **dmas, IOMMUMemoryRegion **dma_mr) {DeviceState *dev; - dev =qdev_create (NULL ,TYPE_RC4030 ); -qdev_init_nofail (dev); + dev =qdev_new (TYPE_RC4030 ); +qdev_realize_and_unref (dev,NULL , &error_fatal); *dmas =rc4030_allocate_dmas (dev,4 ); *dma_mr = &RC4030 (dev)->dma_mr;
hw/dma/sparc32_dma.c +8 -8
@@ -301,7 +301,7 @@ static void sparc32_espdma_device_realize(DeviceState *dev, Error **errp)SysBusESPState *sysbus;ESPState *esp; - d =qdev_create (NULL ,TYPE_ESP ); + d =qdev_new (TYPE_ESP );object_property_add_child (OBJECT (dev),"esp" ,OBJECT (d)); sysbus =ESP_STATE (d); esp = &sysbus->esp;
@@ -310,7 +310,7 @@ static void sparc32_espdma_device_realize(DeviceState *dev, Error **errp) esp->dma_opaque =SPARC32_DMA_DEVICE (dev); sysbus->it_shift =2 ; esp->dma_enabled =1 ; -qdev_init_nofail (d); +qdev_realize_and_unref (d,NULL , &error_fatal); }static void sparc32_espdma_device_class_init (ObjectClass *klass,void *data)
@@ -343,11 +343,11 @@ static void sparc32_ledma_device_realize(DeviceState *dev, Error **errp)qemu_check_nic_model (nd,TYPE_LANCE ); - d =qdev_create (NULL ,TYPE_LANCE ); + d =qdev_new (TYPE_LANCE );object_property_add_child (OBJECT (dev),"lance" ,OBJECT (d));qdev_set_nic_properties (d, nd);object_property_set_link (OBJECT (d),OBJECT (dev),"dma" , errp); -qdev_init_nofail (d); +qdev_realize_and_unref (d,NULL , &error_fatal); }static void sparc32_ledma_device_class_init (ObjectClass *klass,void *data)
@@ -378,10 +378,10 @@ static void sparc32_dma_realize(DeviceState *dev, Error **errp)return ; } - espdma =qdev_create (NULL ,TYPE_SPARC32_ESPDMA_DEVICE ); + espdma =qdev_new (TYPE_SPARC32_ESPDMA_DEVICE );object_property_set_link (OBJECT (espdma), iommu,"iommu" , errp);object_property_add_child (OBJECT (s),"espdma" ,OBJECT (espdma)); -qdev_init_nofail (espdma); +qdev_realize_and_unref (espdma,NULL , &error_fatal); esp =DEVICE (object_resolve_path_component (OBJECT (espdma),"esp" )); sbd =SYS_BUS_DEVICE (esp);
@@ -393,10 +393,10 @@ static void sparc32_dma_realize(DeviceState *dev, Error **errp)memory_region_add_subregion (&s->dmamem,0x0 ,sysbus_mmio_get_region (sbd,0 )); - ledma =qdev_create (NULL ,TYPE_SPARC32_LEDMA_DEVICE ); + ledma =qdev_new (TYPE_SPARC32_LEDMA_DEVICE );object_property_set_link (OBJECT (ledma), iommu,"iommu" , errp);object_property_add_child (OBJECT (s),"ledma" ,OBJECT (ledma)); -qdev_init_nofail (ledma); +qdev_realize_and_unref (ledma,NULL , &error_fatal); lance =DEVICE (object_resolve_path_component (OBJECT (ledma),"lance" )); sbd =SYS_BUS_DEVICE (lance);
hw/hppa/dino.c +2 -2
@@ -521,7 +521,7 @@ PCIBus *dino_init(MemoryRegion *addr_space,PCIBus *b;int i; - dev =qdev_create (NULL ,TYPE_DINO_PCI_HOST_BRIDGE ); + dev =qdev_new (TYPE_DINO_PCI_HOST_BRIDGE ); s =DINO_PCI_HOST_BRIDGE (dev); s->iar0 = s->iar1 =CPU_HPA +3 ; s->toc_addr =0xFFFA0030 ;/* IO_COMMAND of CPU */
@@ -548,7 +548,7 @@ PCIBus *dino_init(MemoryRegion *addr_space, &s->pci_mem,get_system_io (), PCI_DEVFN(0, 0), 32, TYPE_PCI_BUS); s->parent_obj.bus = b; -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);/* Set up windows into PCI bus memory. */ for (i =1 ; i <31 ; i++) {
hw/hppa/lasi.c +2 -2
@@ -300,7 +300,7 @@ DeviceState *lasi_init(MemoryRegion *address_space)DeviceState *dev;LasiState *s; - dev =qdev_create (NULL ,TYPE_LASI_CHIP ); + dev =qdev_new (TYPE_LASI_CHIP ); s =LASI_CHIP (dev); s->iar =CPU_HPA +3 ;
@@ -309,7 +309,7 @@ DeviceState *lasi_init(MemoryRegion *address_space) s, "lasi", 0x100000);memory_region_add_subregion (address_space,LASI_HPA , &s->this_mem); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);/* LAN */ if (enable_lasi_lan ()) {
hw/hppa/machine.c +2 -2
@@ -124,8 +124,8 @@ static void machine_hppa_init(MachineState *machine)/* Graphics setup. */ if (machine->enable_graphics && vga_interface_type !=VGA_NONE ) { - dev =qdev_create (NULL ,"artist" ); -qdev_init_nofail (dev); + dev =qdev_new ("artist" ); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);sysbus_mmio_map (s,0 ,LASI_GFX_HPA );sysbus_mmio_map (s,1 ,ARTIST_FB_ADDR );
hw/i2c/core.c +3 -2
@@ -11,6 +11,7 @@#include "hw/i2c/i2c.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" +#include "qapi/error.h" #include "qemu/module.h" #include "trace.h"
@@ -270,9 +271,9 @@ DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr) {DeviceState *dev; - dev =qdev_create (&bus->qbus, name); + dev =qdev_new (name);qdev_prop_set_uint8 (dev,"address" , addr); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev, &bus->qbus, &error_fatal);return dev; }
hw/i2c/smbus_eeprom.c +2 -2
@@ -169,11 +169,11 @@ void smbus_eeprom_init_one(I2CBus *smbus, uint8_t address, uint8_t *eeprom_buf) {DeviceState *dev; - dev =qdev_create ((BusState *) smbus,TYPE_SMBUS_EEPROM ); + dev =qdev_new (TYPE_SMBUS_EEPROM );qdev_prop_set_uint8 (dev,"address" , address);/* FIXME: use an array of byte or block backend property? */ SMBUS_EEPROM (dev)->init_data = eeprom_buf; -qdev_init_nofail (dev); +qdev_realize_and_unref (dev, (BusState *)smbus, &error_fatal); } void smbus_eeprom_init(I2CBus *smbus, int nb_eeprom,
hw/i386/pc_q35.c +2 -2
@@ -212,7 +212,7 @@ static void pc_q35_init(MachineState *machine) }/* create pci host bus */ - q35_host =Q35_HOST_DEVICE (qdev_create (NULL ,TYPE_Q35_HOST_DEVICE )); + q35_host =Q35_HOST_DEVICE (qdev_new (TYPE_Q35_HOST_DEVICE ));object_property_add_child (qdev_get_machine (),"q35" ,OBJECT (q35_host)); object_property_set_link(OBJECT(q35_host), OBJECT(ram_memory),
@@ -228,7 +228,7 @@ static void pc_q35_init(MachineState *machine)object_property_set_int (OBJECT (q35_host), x86ms->above_4g_mem_size,PCI_HOST_ABOVE_4G_MEM_SIZE ,NULL );/* pci */ -qdev_init_nofail (DEVICE (q35_host)); +qdev_realize_and_unref (DEVICE (q35_host),NULL , &error_fatal); phb =PCI_HOST_BRIDGE (q35_host); host_bus = phb->bus;/* create ISA bus */
hw/i386/x86.c +3 -3
@@ -345,13 +345,13 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name)assert (parent_name);if (kvm_ioapic_in_kernel ()) { - dev =qdev_create (NULL ,TYPE_KVM_IOAPIC ); + dev =qdev_new (TYPE_KVM_IOAPIC ); }else { - dev =qdev_create (NULL ,TYPE_IOAPIC ); + dev =qdev_new (TYPE_IOAPIC ); }object_property_add_child (object_resolve_path (parent_name,NULL ),"ioapic" ,OBJECT (dev)); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); d =SYS_BUS_DEVICE (dev);sysbus_mmio_map (d,0 ,IO_APIC_DEFAULT_ADDRESS );
hw/ide/qdev.c +2 -2
@@ -127,11 +127,11 @@ IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive) {DeviceState *dev; - dev =qdev_create (&bus->qbus, drive->media_cd ?"ide-cd" :"ide-hd" ); + dev =qdev_new (drive->media_cd ?"ide-cd" :"ide-hd" );qdev_prop_set_uint32 (dev,"unit" , unit);qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (drive), &error_fatal); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev, &bus->qbus, &error_fatal);return DO_UPCAST (IDEDevice, qdev, dev); }
hw/intc/exynos4210_gic.c +3 -2
@@ -23,6 +23,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "migration/vmstate.h" +#include "qapi/error.h" #include "qemu/module.h" #include "hw/irq.h" #include "hw/qdev-properties.h"
@@ -296,10 +297,10 @@ static void exynos4210_gic_realize(DeviceState *dev, Error **errp)uint32_t n = s->num_cpu;uint32_t i; - s->gic =qdev_create (NULL ,"arm_gic" ); + s->gic =qdev_new ("arm_gic" );qdev_prop_set_uint32 (s->gic,"num-cpu" , s->num_cpu);qdev_prop_set_uint32 (s->gic,"num-irq" ,EXYNOS4210_GIC_NIRQ ); -qdev_init_nofail (s->gic); +qdev_realize_and_unref (s->gic,NULL , &error_fatal); gicbusdev =SYS_BUS_DEVICE (s->gic);/* Pass through outbound IRQ lines from the GIC */
hw/intc/s390_flic.c +3 -3
@@ -63,15 +63,15 @@ void s390_flic_init(void)DeviceState *dev;if (kvm_enabled ()) { - dev =qdev_create (NULL ,TYPE_KVM_S390_FLIC ); + dev =qdev_new (TYPE_KVM_S390_FLIC );object_property_add_child (qdev_get_machine (),TYPE_KVM_S390_FLIC ,OBJECT (dev)); }else { - dev =qdev_create (NULL ,TYPE_QEMU_S390_FLIC ); + dev =qdev_new (TYPE_QEMU_S390_FLIC );object_property_add_child (qdev_get_machine (),TYPE_QEMU_S390_FLIC ,OBJECT (dev)); } -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); } static int qemu_s390_register_io_adapter(S390FLICState *fs, uint32_t id,
hw/isa/isa-bus.c +2 -2
@@ -61,8 +61,8 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion* address_space,return NULL ; }if (!dev) { - dev =qdev_create (NULL ,"isabus-bridge" ); -qdev_init_nofail (dev); + dev =qdev_new ("isabus-bridge" ); +qdev_realize_and_unref (dev,NULL , &error_fatal); } isabus =ISA_BUS (qbus_create (TYPE_ISA_BUS , dev,NULL ));
hw/m68k/mcf5208.c +2 -2
@@ -210,9 +210,9 @@ static void mcf_fec_init(MemoryRegion *sysmem, NICInfo *nd, hwaddr base,int i;qemu_check_nic_model (nd,TYPE_MCF_FEC_NET ); - dev =qdev_create (NULL ,TYPE_MCF_FEC_NET ); + dev =qdev_new (TYPE_MCF_FEC_NET );qdev_set_nic_properties (dev, nd); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);for (i =0 ; i <FEC_NUM_IRQ ; i++) {
hw/m68k/mcf_intc.c +3 -2
@@ -7,6 +7,7 @@*/ #include "qemu/osdep.h" +#include "qapi/error.h" #include "qemu/module.h" #include "cpu.h" #include "hw/hw.h"
@@ -200,8 +201,8 @@ qemu_irq *mcf_intc_init(MemoryRegion *sysmem,DeviceState *dev;mcf_intc_state *s; - dev =qdev_create (NULL ,TYPE_MCF_INTC ); -qdev_init_nofail (dev); + dev =qdev_new (TYPE_MCF_INTC ); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =MCF_INTC (dev); s->cpu = cpu;
hw/m68k/next-cube.c +6 -6
@@ -839,7 +839,7 @@ static void next_escc_init(M68kCPU *cpu)DeviceState *dev;SysBusDevice *s; - dev =qdev_create (NULL ,TYPE_ESCC ); + dev =qdev_new (TYPE_ESCC );qdev_prop_set_uint32 (dev,"disabled" ,0 );qdev_prop_set_uint32 (dev,"frequency" ,9600 *384 );qdev_prop_set_uint32 (dev,"it_shift" ,0 );
@@ -848,7 +848,7 @@ static void next_escc_init(M68kCPU *cpu)qdev_prop_set_chr (dev,"chrA" ,serial_hd (0 ));qdev_prop_set_uint32 (dev,"chnBtype" , escc_serial);qdev_prop_set_uint32 (dev,"chnAtype" , escc_serial); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);sysbus_connect_irq (s,0 , ser_irq[0 ]);
@@ -895,8 +895,8 @@ static void next_cube_init(MachineState *machine)memory_region_add_subregion (sysmem,0x04000000 , machine->ram);/* Framebuffer */ - dev =qdev_create (NULL ,TYPE_NEXTFB ); -qdev_init_nofail (dev); + dev =qdev_new (TYPE_NEXTFB ); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0x0B000000 );/* MMIO */
@@ -918,8 +918,8 @@ static void next_cube_init(MachineState *machine)memory_region_add_subregion (sysmem,0x02100000 , scrmem);/* KBD */ - dev =qdev_create (NULL ,TYPE_NEXTKBD ); -qdev_init_nofail (dev); + dev =qdev_new (TYPE_NEXTKBD ); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0x0200e000 );/* Load ROM here */
hw/m68k/q800.c +18 -18
@@ -218,13 +218,13 @@ static void q800_init(MachineState *machine)/* VIA */ - via_dev =qdev_create (NULL ,TYPE_MAC_VIA ); + via_dev =qdev_new (TYPE_MAC_VIA ); dinfo =drive_get (IF_MTD ,0 ,0 );if (dinfo) {qdev_prop_set_drive (via_dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_abort); } -qdev_init_nofail (via_dev); +qdev_realize_and_unref (via_dev,NULL , &error_fatal); sysbus =SYS_BUS_DEVICE (via_dev);sysbus_mmio_map (sysbus,0 ,VIA_BASE );qdev_connect_gpio_out_named (DEVICE (sysbus),"irq" ,0 , pic[0 ]);
@@ -232,10 +232,10 @@ static void q800_init(MachineState *machine) adb_bus =qdev_get_child_bus (via_dev,"adb.0" ); - dev =qdev_create (adb_bus,TYPE_ADB_KEYBOARD ); -qdev_init_nofail (dev); - dev =qdev_create (adb_bus,TYPE_ADB_MOUSE ); -qdev_init_nofail (dev); + dev =qdev_new (TYPE_ADB_KEYBOARD ); +qdev_realize_and_unref (dev, adb_bus, &error_fatal); + dev =qdev_new (TYPE_ADB_MOUSE ); +qdev_realize_and_unref (dev, adb_bus, &error_fatal);/* MACSONIC */
@@ -259,13 +259,13 @@ static void q800_init(MachineState *machine) nd_table[0 ].macaddr.a[1 ] =0x00 ; nd_table[0 ].macaddr.a[2 ] =0x07 ; - dev =qdev_create (NULL ,"dp8393x" ); + dev =qdev_new ("dp8393x" );qdev_set_nic_properties (dev, &nd_table[0 ]);qdev_prop_set_uint8 (dev,"it_shift" ,2 );qdev_prop_set_bit (dev,"big_endian" , true);object_property_set_link (OBJECT (dev),OBJECT (get_system_memory ()),"dma_mr" , &error_abort); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); sysbus =SYS_BUS_DEVICE (dev);sysbus_mmio_map (sysbus,0 ,SONIC_BASE );sysbus_mmio_map (sysbus,1 ,SONIC_PROM_BASE );
@@ -273,7 +273,7 @@ static void q800_init(MachineState *machine)/* SCC */ - dev =qdev_create (NULL ,TYPE_ESCC ); + dev =qdev_new (TYPE_ESCC );qdev_prop_set_uint32 (dev,"disabled" ,0 );qdev_prop_set_uint32 (dev,"frequency" ,MAC_CLOCK );qdev_prop_set_uint32 (dev,"it_shift" ,1 );
@@ -282,7 +282,7 @@ static void q800_init(MachineState *machine)qdev_prop_set_chr (dev,"chrB" ,serial_hd (1 ));qdev_prop_set_uint32 (dev,"chnBtype" ,0 );qdev_prop_set_uint32 (dev,"chnAtype" ,0 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); sysbus =SYS_BUS_DEVICE (dev);sysbus_connect_irq (sysbus,0 , pic[3 ]);sysbus_connect_irq (sysbus,1 , pic[3 ]);
@@ -290,7 +290,7 @@ static void q800_init(MachineState *machine)/* SCSI */ - dev =qdev_create (NULL ,TYPE_ESP ); + dev =qdev_new (TYPE_ESP ); sysbus_esp =ESP_STATE (dev); esp = &sysbus_esp->esp; esp->dma_memory_read =NULL ;
@@ -298,7 +298,7 @@ static void q800_init(MachineState *machine) esp->dma_opaque =NULL ; sysbus_esp->it_shift =4 ; esp->dma_enabled =1 ; -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); sysbus =SYS_BUS_DEVICE (dev); sysbus_connect_irq(sysbus, 0, qdev_get_gpio_in_named(via_dev,
@@ -314,14 +314,14 @@ static void q800_init(MachineState *machine)/* SWIM floppy controller */ - dev =qdev_create (NULL ,TYPE_SWIM ); -qdev_init_nofail (dev); + dev =qdev_new (TYPE_SWIM ); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,SWIM_BASE );/* NuBus */ - dev =qdev_create (NULL ,TYPE_MAC_NUBUS_BRIDGE ); -qdev_init_nofail (dev); + dev =qdev_new (TYPE_MAC_NUBUS_BRIDGE ); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,NUBUS_SUPER_SLOT_BASE );sysbus_mmio_map (SYS_BUS_DEVICE (dev),1 ,NUBUS_SLOT_BASE );
@@ -329,11 +329,11 @@ static void q800_init(MachineState *machine)/* framebuffer in nubus slot #9 */ - dev =qdev_create (BUS (nubus),TYPE_NUBUS_MACFB ); + dev =qdev_new (TYPE_NUBUS_MACFB );qdev_prop_set_uint32 (dev,"width" , graphic_width);qdev_prop_set_uint32 (dev,"height" , graphic_height);qdev_prop_set_uint8 (dev,"depth" , graphic_depth); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,BUS (nubus), &error_fatal); cs =CPU (cpu);if (linux_boot) {
hw/microblaze/petalogix_ml605_mmu.c +10 -10
@@ -110,9 +110,9 @@ petalogix_ml605_init(MachineState *machine) 64 * KiB, 2, 0x89, 0x18, 0x0000, 0x0, 0); - dev =qdev_create (NULL ,"xlnx.xps-intc" ); + dev =qdev_new ("xlnx.xps-intc" );qdev_prop_set_uint32 (dev,"kind-of-intr" ,1 <<TIMER_IRQ ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,INTC_BASEADDR );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 ,qdev_get_gpio_in (DEVICE (cpu),MB_CPU_IRQ ));
@@ -125,17 +125,17 @@ petalogix_ml605_init(MachineState *machine) DEVICE_LITTLE_ENDIAN);/* 2 timers at irq 2 @ 100 Mhz. */ - dev =qdev_create (NULL ,"xlnx.xps-timer" ); + dev =qdev_new ("xlnx.xps-timer" );qdev_prop_set_uint32 (dev,"one-timer-only" ,0 );qdev_prop_set_uint32 (dev,"clock-frequency" ,100 *1000000 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,TIMER_BASEADDR );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq[TIMER_IRQ ]);/* axi ethernet and dma initialization. */ qemu_check_nic_model (&nd_table[0 ],"xlnx.axi-ethernet" ); - eth0 =qdev_create (NULL ,"xlnx.axi-ethernet" ); - dma =qdev_create (NULL ,"xlnx.axi-dma" ); + eth0 =qdev_new ("xlnx.axi-ethernet" ); + dma =qdev_new ("xlnx.axi-dma" );/* FIXME: attach to the sysbus instead */ object_property_add_child (qdev_get_machine (),"xilinx-eth" ,OBJECT (eth0));
@@ -152,7 +152,7 @@ petalogix_ml605_init(MachineState *machine) "axistream-connected", &error_abort);object_property_set_link (OBJECT (eth0), cs,"axistream-control-connected" , &error_abort); -qdev_init_nofail (eth0); +qdev_realize_and_unref (eth0,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (eth0),0 ,AXIENET_BASEADDR );sysbus_connect_irq (SYS_BUS_DEVICE (eth0),0 , irq[AXIENET_IRQ ]);
@@ -165,7 +165,7 @@ petalogix_ml605_init(MachineState *machine) "axistream-connected", &error_abort);object_property_set_link (OBJECT (dma), cs,"axistream-control-connected" , &error_abort); -qdev_init_nofail (dma); +qdev_realize_and_unref (dma,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dma),0 ,AXIDMA_BASEADDR );sysbus_connect_irq (SYS_BUS_DEVICE (dma),0 , irq[AXIDMA_IRQ0 ]);sysbus_connect_irq (SYS_BUS_DEVICE (dma),1 , irq[AXIDMA_IRQ1 ]);
@@ -173,9 +173,9 @@ petalogix_ml605_init(MachineState *machine) {SSIBus *spi; - dev =qdev_create (NULL ,"xlnx.xps-spi" ); + dev =qdev_new ("xlnx.xps-spi" );qdev_prop_set_uint8 (dev,"num-ss-bits" ,NUM_SPI_FLASHES ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev);sysbus_mmio_map (busdev,0 ,SPI_BASEADDR );sysbus_connect_irq (busdev,0 , irq[SPI_IRQ ]);
hw/microblaze/petalogix_s3adsp1800_mmu.c +6 -6
@@ -89,10 +89,10 @@ petalogix_s3adsp1800_init(MachineState *machine) dinfo ?blk_by_legacy_dinfo (dinfo) :NULL , 64 * KiB, 1, 0x89, 0x18, 0x0000, 0x0, 1); - dev =qdev_create (NULL ,"xlnx.xps-intc" ); + dev =qdev_new ("xlnx.xps-intc" );qdev_prop_set_uint32 (dev,"kind-of-intr" ,1 <<ETHLITE_IRQ |1 <<UARTLITE_IRQ ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,INTC_BASEADDR );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 ,qdev_get_gpio_in (DEVICE (cpu),MB_CPU_IRQ ));
@@ -104,19 +104,19 @@ petalogix_s3adsp1800_init(MachineState *machine) serial_hd(0));/* 2 timers at irq 2 @ 62 Mhz. */ - dev =qdev_create (NULL ,"xlnx.xps-timer" ); + dev =qdev_new ("xlnx.xps-timer" );qdev_prop_set_uint32 (dev,"one-timer-only" ,0 );qdev_prop_set_uint32 (dev,"clock-frequency" ,62 *1000000 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,TIMER_BASEADDR );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq[TIMER_IRQ ]);qemu_check_nic_model (&nd_table[0 ],"xlnx.xps-ethernetlite" ); - dev =qdev_create (NULL ,"xlnx.xps-ethernetlite" ); + dev =qdev_new ("xlnx.xps-ethernetlite" );qdev_set_nic_properties (dev, &nd_table[0 ]);qdev_prop_set_uint32 (dev,"tx-ping-pong" ,0 );qdev_prop_set_uint32 (dev,"rx-ping-pong" ,0 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,ETHLITE_BASEADDR );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq[ETHLITE_IRQ ]);
hw/mips/boston.c +4 -4
@@ -400,7 +400,7 @@ xilinx_pcie_init(MemoryRegion *sys_mem, uint32_t bus_nr,DeviceState *dev;MemoryRegion *cfg, *mmio; - dev =qdev_create (NULL ,TYPE_XILINX_PCIE_HOST ); + dev =qdev_new (TYPE_XILINX_PCIE_HOST );qdev_prop_set_uint32 (dev,"bus_nr" , bus_nr);qdev_prop_set_uint64 (dev,"cfg_base" , cfg_base);
@@ -409,7 +409,7 @@ xilinx_pcie_init(MemoryRegion *sys_mem, uint32_t bus_nr,qdev_prop_set_uint64 (dev,"mmio_size" , mmio_size);qdev_prop_set_bit (dev,"link_up" , link_up); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); cfg =sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 );memory_region_add_subregion_overlap (sys_mem, cfg_base, cfg,0 );
@@ -442,8 +442,8 @@ static void boston_mach_init(MachineState *machine)exit (1 ); } - dev =qdev_create (NULL ,TYPE_MIPS_BOSTON ); -qdev_init_nofail (dev); + dev =qdev_new (TYPE_MIPS_BOSTON ); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =BOSTON (dev); s->mach = machine;
hw/mips/gt64xxx_pci.c +3 -2
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "qapi/error.h" #include "qemu/units.h" #include "qemu/log.h" #include "hw/mips/mips.h"
@@ -1201,7 +1202,7 @@ PCIBus *gt64120_register(qemu_irq *pic)PCIHostState *phb;DeviceState *dev; - dev =qdev_create (NULL ,TYPE_GT64120_PCI_HOST_BRIDGE ); + dev =qdev_new (TYPE_GT64120_PCI_HOST_BRIDGE ); d =GT64120_PCI_HOST_BRIDGE (dev); phb =PCI_HOST_BRIDGE (dev);memory_region_init (&d->pci0_mem,OBJECT (dev),"pci0-mem" ,4 * GiB);
@@ -1212,7 +1213,7 @@ PCIBus *gt64120_register(qemu_irq *pic) &d->pci0_mem,get_system_io (), PCI_DEVFN(18, 0), 4, TYPE_PCI_BUS); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);memory_region_init_io (&d->ISD_mem,OBJECT (dev), &isd_mem_ops, d,"isd-mem" ,0x1000 );
hw/mips/mips_jazz.c +8 -8
@@ -255,8 +255,8 @@ static void mips_jazz_init(MachineState *machine,/* Video card */ switch (jazz_model) {case JAZZ_MAGNUM : - dev =qdev_create (NULL ,"sysbus-g364" ); -qdev_init_nofail (dev); + dev =qdev_new ("sysbus-g364" ); +qdev_realize_and_unref (dev,NULL , &error_fatal); sysbus =SYS_BUS_DEVICE (dev);sysbus_mmio_map (sysbus,0 ,0x60080000 );sysbus_mmio_map (sysbus,1 ,0x40000000 );
@@ -287,12 +287,12 @@ static void mips_jazz_init(MachineState *machine,if (strcmp (nd->model,"dp83932" ) ==0 ) {qemu_check_nic_model (nd,"dp83932" ); - dev =qdev_create (NULL ,"dp8393x" ); + dev =qdev_new ("dp8393x" );qdev_set_nic_properties (dev, nd);qdev_prop_set_uint8 (dev,"it_shift" ,2 );object_property_set_link (OBJECT (dev),OBJECT (rc4030_dma_mr),"dma_mr" , &error_abort); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); sysbus =SYS_BUS_DEVICE (dev);sysbus_mmio_map (sysbus,0 ,0x80001000 );sysbus_mmio_map (sysbus,1 ,0x8000b000 );
@@ -308,7 +308,7 @@ static void mips_jazz_init(MachineState *machine, }/* SCSI adapter */ - dev =qdev_create (NULL ,TYPE_ESP ); + dev =qdev_new (TYPE_ESP ); sysbus_esp =ESP_STATE (dev); esp = &sysbus_esp->esp; esp->dma_memory_read = rc4030_dma_read;
@@ -317,7 +317,7 @@ static void mips_jazz_init(MachineState *machine, sysbus_esp->it_shift =0 ;/* XXX for now until rc4030 has been changed to use DMA enable signal */ esp->dma_enabled =1 ; -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); sysbus =SYS_BUS_DEVICE (dev);sysbus_connect_irq (sysbus,0 ,qdev_get_gpio_in (rc4030,5 ));
@@ -362,8 +362,8 @@ static void mips_jazz_init(MachineState *machine,/* FIXME: missing Jazz sound at 0x8000c000, rc4030[2] */ /* NVRAM */ - dev =qdev_create (NULL ,"ds1225y" ); -qdev_init_nofail (dev); + dev =qdev_new ("ds1225y" ); +qdev_realize_and_unref (dev,NULL , &error_fatal); sysbus =SYS_BUS_DEVICE (dev);sysbus_mmio_map (sysbus,0 ,0x80009000 );
hw/mips/mips_malta.c +2 -2
@@ -1238,7 +1238,7 @@ void mips_malta_init(MachineState *machine)int fl_idx =0 ;int be; -DeviceState *dev =qdev_create (NULL ,TYPE_MIPS_MALTA ); +DeviceState *dev =qdev_new (TYPE_MIPS_MALTA );MaltaState *s =MIPS_MALTA (dev);/*
@@ -1248,7 +1248,7 @@ void mips_malta_init(MachineState *machine)*/ empty_slot_init (0 ,0x20000000 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);/* create CPU */ mips_create_cpu (machine, s, &cbus_irq, &i8259_irq);
hw/mips/mips_mipssim.c +4 -4
@@ -129,9 +129,9 @@ static void mipsnet_init(int base, qemu_irq irq, NICInfo *nd)DeviceState *dev;SysBusDevice *s; - dev =qdev_create (NULL ,"mipsnet" ); + dev =qdev_new ("mipsnet" );qdev_set_nic_properties (dev, nd); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);sysbus_connect_irq (s,0 , irq);
@@ -216,11 +216,11 @@ mips_mipssim_init(MachineState *machine)* MIPS CPU INT2, which is interrupt 4. */ if (serial_hd (0 )) { -DeviceState *dev =qdev_create (NULL ,TYPE_SERIAL_IO ); +DeviceState *dev =qdev_new (TYPE_SERIAL_IO );qdev_prop_set_chr (dev,"chardev" ,serial_hd (0 ));qdev_set_legacy_instance_id (dev,0x3f8 ,2 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , env->irq[4 ]);sysbus_add_io (SYS_BUS_DEVICE (dev),0x3f8 ,sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 ));
hw/net/etraxfs_eth.c +2 -2
@@ -654,7 +654,7 @@ etraxfs_eth_init(NICInfo *nd, hwaddr base, int phyaddr,DeviceState *dev;qemu_check_nic_model (nd,"fseth" ); - dev =qdev_create (NULL ,"etraxfs-eth" ); + dev =qdev_new ("etraxfs-eth" );qdev_set_nic_properties (dev, nd);qdev_prop_set_uint32 (dev,"phyaddr" , phyaddr);
@@ -668,7 +668,7 @@ etraxfs_eth_init(NICInfo *nd, hwaddr base, int phyaddr,*/ ETRAX_FS_ETH (dev)->dma_out = dma_out;ETRAX_FS_ETH (dev)->dma_in = dma_in; -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return dev;
hw/net/fsl_etsec/etsec.c +3 -2
@@ -33,6 +33,7 @@#include "hw/qdev-properties.h" #include "etsec.h" #include "registers.h" +#include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h"
@@ -452,9 +453,9 @@ DeviceState *etsec_create(hwaddr base, {DeviceState *dev; - dev =qdev_create (NULL ,"eTSEC" ); + dev =qdev_new ("eTSEC" );qdev_set_nic_properties (dev, nd); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , tx_irq);sysbus_connect_irq (SYS_BUS_DEVICE (dev),1 , rx_irq);
hw/net/lan9118.c +3 -2
@@ -20,6 +20,7 @@#include "hw/net/lan9118.h" #include "hw/ptimer.h" #include "hw/qdev-properties.h" +#include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" /* For crc32 */
@@ -1394,9 +1395,9 @@ void lan9118_init(NICInfo *nd, uint32_t base, qemu_irq irq)SysBusDevice *s;qemu_check_nic_model (nd,"lan9118" ); - dev =qdev_create (NULL ,TYPE_LAN9118 ); + dev =qdev_new (TYPE_LAN9118 );qdev_set_nic_properties (dev, nd); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);sysbus_mmio_map (s,0 , base);sysbus_connect_irq (s,0 , irq);
hw/net/lasi_i82596.c +3 -2
@@ -11,6 +11,7 @@*/ #include "qemu/osdep.h" +#include "qapi/error.h" #include "qemu/timer.h" #include "hw/sysbus.h" #include "net/eth.h"
@@ -126,11 +127,11 @@ SysBusI82596State *lasi_82596_init(MemoryRegion *addr_space, .a = { 0x08, 0x00, 0x09, 0xef, 0x34, 0xf6 } };qemu_check_nic_model (&nd_table[0 ],TYPE_LASI_82596 ); - dev =qdev_create (NULL ,TYPE_LASI_82596 ); + dev =qdev_new (TYPE_LASI_82596 ); s =SYSBUS_I82596 (dev); s->state.irq = lan_irq;qdev_set_nic_properties (dev, &nd_table[0 ]); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); s->state.conf.macaddr =HP_MAC ;/* set HP MAC prefix */ /* LASI 82596 ports in main memory. */
hw/net/smc91c111.c +3 -2
@@ -14,6 +14,7 @@#include "hw/irq.h" #include "hw/net/smc91c111.h" #include "hw/qdev-properties.h" +#include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" /* For crc32 */
@@ -821,9 +822,9 @@ void smc91c111_init(NICInfo *nd, uint32_t base, qemu_irq irq)SysBusDevice *s;qemu_check_nic_model (nd,"smc91c111" ); - dev =qdev_create (NULL ,TYPE_SMC91C111 ); + dev =qdev_new (TYPE_SMC91C111 );qdev_set_nic_properties (dev, nd); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);sysbus_mmio_map (s,0 , base);sysbus_connect_irq (s,0 , irq);
hw/net/spapr_llan.c +2 -2
@@ -372,11 +372,11 @@ void spapr_vlan_create(SpaprVioBus *bus, NICInfo *nd) {DeviceState *dev; - dev =qdev_create (&bus->bus,"spapr-vlan" ); + dev =qdev_new ("spapr-vlan" );qdev_set_nic_properties (dev, nd); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev, &bus->bus, &error_fatal); }static int spapr_vlan_devnode (SpaprVioDevice *dev,void *fdt,int node_off)
hw/nios2/10m50_devboard.c +6 -6
@@ -80,9 +80,9 @@ static void nios2_10m50_ghrd_init(MachineState *machine) cpu_irq =nios2_cpu_pic_init (cpu);/* Register: Internal Interrupt Controller (IIC) */ - dev =qdev_create (NULL ,"altera,iic" ); + dev =qdev_new ("altera,iic" );object_property_add_const_link (OBJECT (dev),"cpu" ,OBJECT (cpu)); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , cpu_irq[0 ]);for (i =0 ; i <32 ; i++) { irq[i] =qdev_get_gpio_in (dev, i);
@@ -93,16 +93,16 @@ static void nios2_10m50_ghrd_init(MachineState *machine) serial_hd(0), DEVICE_NATIVE_ENDIAN);/* Register: Timer sys_clk_timer */ - dev =qdev_create (NULL ,"ALTR.timer" ); + dev =qdev_new ("ALTR.timer" );qdev_prop_set_uint32 (dev,"clock-frequency" ,75 *1000000 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0xf8001440 );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq[0 ]);/* Register: Timer sys_clk_timer_1 */ - dev =qdev_create (NULL ,"ALTR.timer" ); + dev =qdev_new ("ALTR.timer" );qdev_prop_set_uint32 (dev,"clock-frequency" ,75 *1000000 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0xe0000880 );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq[5 ]);
hw/nvram/fw_cfg.c +4 -4
@@ -1099,14 +1099,14 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase,FWCfgState *s;bool dma_requested = dma_iobase && dma_as; - dev =qdev_create (NULL ,TYPE_FW_CFG_IO ); + dev =qdev_new (TYPE_FW_CFG_IO );if (!dma_requested) {qdev_prop_set_bit (dev,"dma_enabled" , false); }object_property_add_child (OBJECT (qdev_get_machine ()),TYPE_FW_CFG ,OBJECT (dev)); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); sbd =SYS_BUS_DEVICE (dev); ios =FW_CFG_IO (dev);
@@ -1138,7 +1138,7 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr,FWCfgState *s;bool dma_requested = dma_addr && dma_as; - dev =qdev_create (NULL ,TYPE_FW_CFG_MEM ); + dev =qdev_new (TYPE_FW_CFG_MEM );qdev_prop_set_uint32 (dev,"data_width" , data_width);if (!dma_requested) {qdev_prop_set_bit (dev,"dma_enabled" , false);
@@ -1146,7 +1146,7 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr,object_property_add_child (OBJECT (qdev_get_machine ()),TYPE_FW_CFG ,OBJECT (dev)); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); sbd =SYS_BUS_DEVICE (dev);sysbus_mmio_map (sbd,0 , ctl_addr);
hw/openrisc/openrisc_sim.c +4 -4
@@ -59,9 +59,9 @@ static void openrisc_sim_net_init(hwaddr base, hwaddr descriptors,SysBusDevice *s;int i; - dev =qdev_create (NULL ,"open_eth" ); + dev =qdev_new ("open_eth" );qdev_set_nic_properties (dev, nd); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);for (i =0 ; i < num_cpus; i++) {
@@ -78,9 +78,9 @@ static void openrisc_sim_ompic_init(hwaddr base, int num_cpus,SysBusDevice *s;int i; - dev =qdev_create (NULL ,"or1k-ompic" ); + dev =qdev_new ("or1k-ompic" );qdev_prop_set_uint32 (dev,"num-cpus" , num_cpus); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);for (i =0 ; i < num_cpus; i++) {
hw/pci-bridge/pci_expander_bridge.c +2 -2
@@ -231,7 +231,7 @@ static void pxb_dev_realize_common(PCIDevice *dev, bool pcie, Error **errp) dev_name = dev->qdev.id; } - ds =qdev_create (NULL ,TYPE_PXB_HOST ); + ds =qdev_new (TYPE_PXB_HOST );if (pcie) { bus =pci_root_bus_new (ds, dev_name,NULL ,NULL ,0 ,TYPE_PXB_PCIE_BUS ); }else {
@@ -255,7 +255,7 @@ static void pxb_dev_realize_common(PCIDevice *dev, bool pcie, Error **errp) goto err_register_bus; } -qdev_init_nofail (ds); +qdev_realize_and_unref (ds,NULL , &error_fatal);if (bds) {qdev_init_nofail (bds); }
hw/pci-host/bonito.c +3 -2
@@ -39,6 +39,7 @@*/ #include "qemu/osdep.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "hw/pci/pci.h" #include "hw/irq.h"
@@ -688,11 +689,11 @@ PCIBus *bonito_init(qemu_irq *pic)PCIBonitoState *s;PCIDevice *d; - dev =qdev_create (NULL ,TYPE_BONITO_PCI_HOST_BRIDGE ); + dev =qdev_new (TYPE_BONITO_PCI_HOST_BRIDGE ); phb =PCI_HOST_BRIDGE (dev); pcihost =BONITO_PCI_HOST_BRIDGE (dev); pcihost->pic = pic; -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); d =pci_create (phb->bus,PCI_DEVFN (0 ,0 ),TYPE_PCI_BONITO ); s =PCI_BONITO (d);
hw/pci-host/i440fx.c +2 -2
@@ -270,13 +270,13 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type,unsigned i;I440FXState *i440fx; - dev =qdev_create (NULL , host_type); + dev =qdev_new (host_type); s =PCI_HOST_BRIDGE (dev); b =pci_root_bus_new (dev,NULL , pci_address_space, address_space_io,0 ,TYPE_PCI_BUS ); s->bus = b;object_property_add_child (qdev_get_machine (),"i440fx" ,OBJECT (dev)); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); d =pci_create_simple (b,0 , pci_type); *pi440fx_state =I440FX_PCI_DEVICE (d);
hw/pcmcia/pxa2xx.c +3 -2
@@ -13,6 +13,7 @@#include "qemu/osdep.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "qapi/error.h" #include "qemu/module.h" #include "hw/pcmcia.h" #include "hw/arm/pxa.h"
@@ -147,11 +148,11 @@ PXA2xxPCMCIAState *pxa2xx_pcmcia_init(MemoryRegion *sysmem,DeviceState *dev;PXA2xxPCMCIAState *s; - dev =qdev_create (NULL ,TYPE_PXA2XX_PCMCIA ); + dev =qdev_new (TYPE_PXA2XX_PCMCIA );sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base); s =PXA2XX_PCMCIA (dev); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);return s; }
hw/ppc/e500.c +16 -16
@@ -743,12 +743,12 @@ static DeviceState *ppce500_init_mpic_qemu(PPCE500MachineState *pms,unsigned int smp_cpus = machine->smp.cpus;const PPCE500MachineClass *pmc =PPCE500_MACHINE_GET_CLASS (pms); - dev =qdev_create (NULL ,TYPE_OPENPIC ); + dev =qdev_new (TYPE_OPENPIC );object_property_add_child (OBJECT (machine),"pic" ,OBJECT (dev));qdev_prop_set_uint32 (dev,"model" , pmc->mpic_version);qdev_prop_set_uint32 (dev,"nb_cpus" , smp_cpus); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); k =0 ;
@@ -768,10 +768,10 @@ static DeviceState *ppce500_init_mpic_kvm(const PPCE500MachineClass *pmc,DeviceState *dev;CPUState *cs; - dev =qdev_create (NULL ,TYPE_KVM_OPENPIC ); + dev =qdev_new (TYPE_KVM_OPENPIC );qdev_prop_set_uint32 (dev,"model" , pmc->mpic_version); -object_property_set_bool (OBJECT (dev), true,"realized" , &err); +qdev_realize_and_unref (dev,NULL , &err);if (err) {error_propagate (errp, err);object_unparent (OBJECT (dev));
@@ -913,10 +913,10 @@ void ppce500_init(MachineState *machine)/* Register Memory */ memory_region_add_subregion (address_space_mem,0 , machine->ram); - dev =qdev_create (NULL ,"e500-ccsr" ); + dev =qdev_new ("e500-ccsr" );object_property_add_child (qdev_get_machine (),"e500-ccsr" ,OBJECT (dev)); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); ccsr =CCSR (dev); ccsr_addr_space = &ccsr->ccsr_space; memory_region_add_subregion(address_space_mem, pmc->ccsrbar_base,
@@ -937,9 +937,9 @@ void ppce500_init(MachineState *machine) serial_hd(1), DEVICE_BIG_ENDIAN); }/* I2C */ - dev =qdev_create (NULL ,"mpc-i2c" ); + dev =qdev_new ("mpc-i2c" ); s =SYS_BUS_DEVICE (dev); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_connect_irq (s,0 ,qdev_get_gpio_in (mpicdev,MPC8544_I2C_IRQ ));memory_region_add_subregion (ccsr_addr_space,MPC8544_I2C_REGS_OFFSET ,sysbus_mmio_get_region (s,0 ));
@@ -948,18 +948,18 @@ void ppce500_init(MachineState *machine)/* General Utility device */ - dev =qdev_create (NULL ,"mpc8544-guts" ); -qdev_init_nofail (dev); + dev =qdev_new ("mpc8544-guts" ); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);memory_region_add_subregion (ccsr_addr_space,MPC8544_UTIL_OFFSET ,sysbus_mmio_get_region (s,0 ));/* PCI */ - dev =qdev_create (NULL ,"e500-pcihost" ); + dev =qdev_new ("e500-pcihost" );object_property_add_child (qdev_get_machine (),"pci-host" ,OBJECT (dev));qdev_prop_set_uint32 (dev,"first_slot" , pmc->pci_first_slot);qdev_prop_set_uint32 (dev,"first_pin_irq" , pci_irq_nrs[0 ]); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);for (i =0 ; i <PCI_NUM_PINS ; i++) {sysbus_connect_irq (s, i,qdev_get_gpio_in (mpicdev, pci_irq_nrs[i]));
@@ -985,9 +985,9 @@ void ppce500_init(MachineState *machine)if (pmc->has_mpc8xxx_gpio) {qemu_irq poweroff_irq; - dev =qdev_create (NULL ,"mpc8xxx_gpio" ); + dev =qdev_new ("mpc8xxx_gpio" ); s =SYS_BUS_DEVICE (dev); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_connect_irq (s,0 ,qdev_get_gpio_in (mpicdev,MPC8XXX_GPIO_IRQ ));memory_region_add_subregion (ccsr_addr_space,MPC8XXX_GPIO_OFFSET ,sysbus_mmio_get_region (s,0 ));
@@ -999,11 +999,11 @@ void ppce500_init(MachineState *machine)/* Platform Bus Device */ if (pmc->has_platform_bus) { - dev =qdev_create (NULL ,TYPE_PLATFORM_BUS_DEVICE ); + dev =qdev_new (TYPE_PLATFORM_BUS_DEVICE ); dev->id =TYPE_PLATFORM_BUS_DEVICE ;qdev_prop_set_uint32 (dev,"num_irqs" , pmc->platform_bus_num_irqs);qdev_prop_set_uint32 (dev,"mmio_size" , pmc->platform_bus_size); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); pms->pbus_dev =PLATFORM_BUS_DEVICE (dev); s =SYS_BUS_DEVICE (pms->pbus_dev);
hw/ppc/mac_newworld.c +20 -20
@@ -242,8 +242,8 @@ static void ppc_core99_init(MachineState *machine) }/* UniN init */ - dev =qdev_create (NULL ,TYPE_UNI_NORTH ); -qdev_init_nofail (dev); + dev =qdev_new (TYPE_UNI_NORTH ); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);memory_region_add_subregion (get_system_memory (),0xf8000000 ,sysbus_mmio_get_region (s,0 ));
@@ -288,9 +288,9 @@ static void ppc_core99_init(MachineState *machine) } } - pic_dev =qdev_create (NULL ,TYPE_OPENPIC ); + pic_dev =qdev_new (TYPE_OPENPIC );qdev_prop_set_uint32 (pic_dev,"model" ,OPENPIC_MODEL_KEYLARGO ); -qdev_init_nofail (pic_dev); +qdev_realize_and_unref (pic_dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (pic_dev); k =0 ;for (i =0 ; i < smp_cpus; i++) {
@@ -303,10 +303,10 @@ static void ppc_core99_init(MachineState *machine)if (PPC_INPUT (env) ==PPC_FLAGS_INPUT_970 ) {/* 970 gets a U3 bus */ /* Uninorth AGP bus */ - dev =qdev_create (NULL ,TYPE_U3_AGP_HOST_BRIDGE ); + dev =qdev_new (TYPE_U3_AGP_HOST_BRIDGE );object_property_set_link (OBJECT (dev),OBJECT (pic_dev),"pic" , &error_abort); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); uninorth_pci =U3_AGP_HOST_BRIDGE (dev); s =SYS_BUS_DEVICE (dev);/* PCI hole */
@@ -322,29 +322,29 @@ static void ppc_core99_init(MachineState *machine) }else {/* Use values found on a real PowerMac */ /* Uninorth AGP bus */ - dev =qdev_create (NULL ,TYPE_UNI_NORTH_AGP_HOST_BRIDGE ); + dev =qdev_new (TYPE_UNI_NORTH_AGP_HOST_BRIDGE );object_property_set_link (OBJECT (dev),OBJECT (pic_dev),"pic" , &error_abort); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);sysbus_mmio_map (s,0 ,0xf0800000 );sysbus_mmio_map (s,1 ,0xf0c00000 );/* Uninorth internal bus */ - dev =qdev_create (NULL ,TYPE_UNI_NORTH_INTERNAL_PCI_HOST_BRIDGE ); + dev =qdev_new (TYPE_UNI_NORTH_INTERNAL_PCI_HOST_BRIDGE );object_property_set_link (OBJECT (dev),OBJECT (pic_dev),"pic" , &error_abort); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);sysbus_mmio_map (s,0 ,0xf4800000 );sysbus_mmio_map (s,1 ,0xf4c00000 );/* Uninorth main bus */ - dev =qdev_create (NULL ,TYPE_UNI_NORTH_PCI_HOST_BRIDGE ); + dev =qdev_new (TYPE_UNI_NORTH_PCI_HOST_BRIDGE );qdev_prop_set_uint32 (dev,"ofw-addr" ,0xf2000000 );object_property_set_link (OBJECT (dev),OBJECT (pic_dev),"pic" , &error_abort); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); uninorth_pci =UNI_NORTH_PCI_HOST_BRIDGE (dev); s =SYS_BUS_DEVICE (dev);/* PCI hole */
@@ -403,13 +403,13 @@ static void ppc_core99_init(MachineState *machine) } adb_bus =qdev_get_child_bus (dev,"adb.0" ); - dev =qdev_create (adb_bus,TYPE_ADB_KEYBOARD ); + dev =qdev_new (TYPE_ADB_KEYBOARD );qdev_prop_set_bit (dev,"disable-direct-reg3-writes" , true); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev, adb_bus, &error_fatal); - dev =qdev_create (adb_bus,TYPE_ADB_MOUSE ); + dev =qdev_new (TYPE_ADB_MOUSE );qdev_prop_set_bit (dev,"disable-direct-reg3-writes" , true); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev, adb_bus, &error_fatal); }if (machine->usb) {
@@ -441,22 +441,22 @@ static void ppc_core99_init(MachineState *machine)move the NVRAM out of ROM again for KVM */ nvram_addr =0xFFE00000 ; } - dev =qdev_create (NULL ,TYPE_MACIO_NVRAM ); + dev =qdev_new (TYPE_MACIO_NVRAM );qdev_prop_set_uint32 (dev,"size" ,0x2000 );qdev_prop_set_uint32 (dev,"it_shift" ,1 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , nvram_addr); nvr =MACIO_NVRAM (dev);pmac_format_nvram_partition (nvr,0x2000 );/* No PCI init: the BIOS will do it */ - dev =qdev_create (NULL ,TYPE_FW_CFG_MEM ); + dev =qdev_new (TYPE_FW_CFG_MEM ); fw_cfg =FW_CFG (dev);qdev_prop_set_uint32 (dev,"data_width" ,1 );qdev_prop_set_bit (dev,"dma_enabled" , false);object_property_add_child (OBJECT (qdev_get_machine ()),TYPE_FW_CFG ,OBJECT (fw_cfg)); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);sysbus_mmio_map (s,0 ,CFG_ADDR );sysbus_mmio_map (s,1 ,CFG_ADDR +2 );
hw/ppc/mac_oldworld.c +10 -10
@@ -222,8 +222,8 @@ static void ppc_heathrow_init(MachineState *machine) }/* XXX: we register only 1 output pin for heathrow PIC */ - pic_dev =qdev_create (NULL ,TYPE_HEATHROW ); -qdev_init_nofail (pic_dev); + pic_dev =qdev_new (TYPE_HEATHROW ); +qdev_realize_and_unref (pic_dev,NULL , &error_fatal);/* Connect the heathrow PIC outputs to the 6xx bus */ for (i =0 ; i < smp_cpus; i++) {
@@ -252,11 +252,11 @@ static void ppc_heathrow_init(MachineState *machine) }/* Grackle PCI host bridge */ - dev =qdev_create (NULL ,TYPE_GRACKLE_PCI_HOST_BRIDGE ); + dev =qdev_new (TYPE_GRACKLE_PCI_HOST_BRIDGE );qdev_prop_set_uint32 (dev,"ofw-addr" ,0x80000000 );object_property_set_link (OBJECT (dev),OBJECT (pic_dev),"pic" , &error_abort); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);sysbus_mmio_map (s,0 ,GRACKLE_BASE );sysbus_mmio_map (s,1 ,GRACKLE_BASE +0x200000 );
@@ -295,10 +295,10 @@ static void ppc_heathrow_init(MachineState *machine) dev =DEVICE (object_resolve_path_component (OBJECT (macio),"cuda" )); adb_bus =qdev_get_child_bus (dev,"adb.0" ); - dev =qdev_create (adb_bus,TYPE_ADB_KEYBOARD ); -qdev_init_nofail (dev); - dev =qdev_create (adb_bus,TYPE_ADB_MOUSE ); -qdev_init_nofail (dev); + dev =qdev_new (TYPE_ADB_KEYBOARD ); +qdev_realize_and_unref (dev, adb_bus, &error_fatal); + dev =qdev_new (TYPE_ADB_MOUSE ); +qdev_realize_and_unref (dev, adb_bus, &error_fatal);if (machine_usb (machine)) {pci_create_simple (pci_bus,-1 ,"pci-ohci" );
@@ -309,13 +309,13 @@ static void ppc_heathrow_init(MachineState *machine)/* No PCI init: the BIOS will do it */ - dev =qdev_create (NULL ,TYPE_FW_CFG_MEM ); + dev =qdev_new (TYPE_FW_CFG_MEM ); fw_cfg =FW_CFG (dev);qdev_prop_set_uint32 (dev,"data_width" ,1 );qdev_prop_set_bit (dev,"dma_enabled" , false);object_property_add_child (OBJECT (qdev_get_machine ()),TYPE_FW_CFG ,OBJECT (fw_cfg)); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);sysbus_mmio_map (s,0 ,CFG_ADDR );sysbus_mmio_map (s,1 ,CFG_ADDR +2 );
hw/ppc/pnv.c +2 -2
@@ -729,12 +729,12 @@ static void pnv_init(MachineState *machine)/* * Create our simple PNOR device */ - dev =qdev_create (NULL ,TYPE_PNV_PNOR ); + dev =qdev_new (TYPE_PNV_PNOR );if (pnor) {qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (pnor), &error_abort); } -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); pnv->pnor =PNV_PNOR (dev);/* load skiboot firmware */
hw/ppc/ppc440_uc.c +4 -4
@@ -1367,13 +1367,13 @@ void ppc460ex_pcie_init(CPUPPCState *env) {DeviceState *dev; - dev =qdev_create (NULL ,TYPE_PPC460EX_PCIE_HOST ); + dev =qdev_new (TYPE_PPC460EX_PCIE_HOST );qdev_prop_set_int32 (dev,"dcrn-base" ,DCRN_PCIE0_BASE ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);ppc460ex_pcie_register_dcrs (PPC460EX_PCIE_HOST (dev), env); - dev =qdev_create (NULL ,TYPE_PPC460EX_PCIE_HOST ); + dev =qdev_new (TYPE_PPC460EX_PCIE_HOST );qdev_prop_set_int32 (dev,"dcrn-base" ,DCRN_PCIE1_BASE ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);ppc460ex_pcie_register_dcrs (PPC460EX_PCIE_HOST (dev), env); }
hw/ppc/prep.c +5 -4
@@ -35,6 +35,7 @@#include "hw/pci/pci_host.h" #include "hw/ppc/ppc.h" #include "hw/boards.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/log.h" #include "hw/irq.h"
@@ -268,7 +269,7 @@ static void ibm_40p_init(MachineState *machine)qemu_register_reset (ppc_prep_reset, cpu);/* PCI host */ - dev =qdev_create (NULL ,"raven-pcihost" ); + dev =qdev_new ("raven-pcihost" );if (!bios_name) { bios_name ="openbios-ppc" ; }
@@ -276,7 +277,7 @@ static void ibm_40p_init(MachineState *machine)qdev_prop_set_uint32 (dev,"elf-machine" ,PPC_ELF_MACHINE ); pcihost =SYS_BUS_DEVICE (dev);object_property_add_child (qdev_get_machine (),"raven" ,OBJECT (dev)); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); pci_bus =PCI_BUS (qdev_get_child_bus (dev,"pci.0" ));if (!pci_bus) {error_report ("could not create PCI host controller" );
@@ -338,13 +339,13 @@ static void ibm_40p_init(MachineState *machine) }/* Prepare firmware configuration for OpenBIOS */ - dev =qdev_create (NULL ,TYPE_FW_CFG_MEM ); + dev =qdev_new (TYPE_FW_CFG_MEM ); fw_cfg =FW_CFG (dev);qdev_prop_set_uint32 (dev,"data_width" ,1 );qdev_prop_set_bit (dev,"dma_enabled" , false);object_property_add_child (OBJECT (qdev_get_machine ()),TYPE_FW_CFG ,OBJECT (fw_cfg)); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev);sysbus_mmio_map (s,0 ,CFG_ADDR );sysbus_mmio_map (s,1 ,CFG_ADDR +2 );
hw/ppc/sam460ex.c +2 -2
@@ -370,10 +370,10 @@ static void sam460ex_init(MachineState *machine)/* USB */ sysbus_create_simple (TYPE_PPC4xx_EHCI,0x4bffd0400 , uic[2 ][29 ]); - dev =qdev_create (NULL ,"sysbus-ohci" ); + dev =qdev_new ("sysbus-ohci" );qdev_prop_set_string (dev,"masterbus" ,"usb-bus.0" );qdev_prop_set_uint32 (dev,"num-ports" ,6 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); sbdev =SYS_BUS_DEVICE (dev);sysbus_mmio_map (sbdev,0 ,0x4bffd0000 );sysbus_connect_irq (sbdev,0 , uic[2 ][30 ]);
hw/ppc/spapr.c +4 -4
@@ -1711,7 +1711,7 @@ static void spapr_machine_reset(MachineState *machine)static void spapr_create_nvram (SpaprMachineState *spapr) { -DeviceState *dev =qdev_create (&spapr->vio_bus->bus,"spapr-nvram" ); +DeviceState *dev =qdev_new ("spapr-nvram" );DriveInfo *dinfo =drive_get (IF_PFLASH ,0 ,0 );if (dinfo) {
@@ -1719,7 +1719,7 @@ static void spapr_create_nvram(SpaprMachineState *spapr) &error_fatal); } -qdev_init_nofail (dev); +qdev_realize_and_unref (dev, &spapr->vio_bus->bus, &error_fatal); spapr->nvram = (struct SpaprNvram *)dev; }
@@ -2639,9 +2639,9 @@ static PCIHostState *spapr_create_default_phb(void) {DeviceState *dev; - dev =qdev_create (NULL ,TYPE_SPAPR_PCI_HOST_BRIDGE ); + dev =qdev_new (TYPE_SPAPR_PCI_HOST_BRIDGE );qdev_prop_set_uint32 (dev,"index" ,0 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);return PCI_HOST_BRIDGE (dev); }
hw/ppc/spapr_irq.c +2 -2
@@ -325,7 +325,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)DeviceState *dev;int i; - dev =qdev_create (NULL ,TYPE_SPAPR_XIVE ); + dev =qdev_new (TYPE_SPAPR_XIVE );qdev_prop_set_uint32 (dev,"nr-irqs" , smc->nr_xirqs +SPAPR_XIRQ_BASE );/* * 8 XIVE END structures per CPU. One for each available
@@ -334,7 +334,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)qdev_prop_set_uint32 (dev,"nr-ends" , nr_servers <<3 );object_property_set_link (OBJECT (dev),OBJECT (spapr),"xive-fabric" , &error_abort); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); spapr->xive =SPAPR_XIVE (dev);
hw/ppc/spapr_vio.c +2 -2
@@ -576,8 +576,8 @@ SpaprVioBus *spapr_vio_bus_init(void)DeviceState *dev;/* Create bridge device */ - dev =qdev_create (NULL ,TYPE_SPAPR_VIO_BRIDGE ); -qdev_init_nofail (dev); + dev =qdev_new (TYPE_SPAPR_VIO_BRIDGE ); +qdev_realize_and_unref (dev,NULL , &error_fatal);/* Create bus on bridge device */ qbus =qbus_create (TYPE_SPAPR_VIO_BUS , dev,"spapr-vio" );
hw/ppc/virtex_ml507.c +5 -4
@@ -36,6 +36,7 @@#include "sysemu/device_tree.h" #include "hw/loader.h" #include "elf.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/log.h" #include "qemu/option.h"
@@ -228,9 +229,9 @@ static void virtex_init(MachineState *machine) 64 * KiB, 1, 0x89, 0x18, 0x0000, 0x0, 1); cpu_irq = (qemu_irq *) &env->irq_inputs[PPC40x_INPUT_INT]; - dev =qdev_create (NULL ,"xlnx.xps-intc" ); + dev =qdev_new ("xlnx.xps-intc" );qdev_prop_set_uint32 (dev,"kind-of-intr" ,0 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,INTC_BASEADDR );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , cpu_irq[0 ]);for (i =0 ; i <32 ; i++) {
@@ -241,10 +242,10 @@ static void virtex_init(MachineState *machine) 115200, serial_hd(0), DEVICE_LITTLE_ENDIAN);/* 2 timers at irq 2 @ 62 Mhz. */ - dev =qdev_create (NULL ,"xlnx.xps-timer" ); + dev =qdev_new ("xlnx.xps-timer" );qdev_prop_set_uint32 (dev,"one-timer-only" ,0 );qdev_prop_set_uint32 (dev,"clock-frequency" ,62 *1000000 ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,TIMER_BASEADDR );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq[TIMER_IRQ ]);
hw/riscv/sifive_clint.c +3 -2
@@ -20,6 +20,7 @@*/ #include "qemu/osdep.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/sysbus.h"
@@ -245,13 +246,13 @@ DeviceState *sifive_clint_create(hwaddr addr, hwaddr size, uint32_t num_harts, env->timecmp =0 ; } -DeviceState *dev =qdev_create (NULL ,TYPE_SIFIVE_CLINT ); +DeviceState *dev =qdev_new (TYPE_SIFIVE_CLINT );qdev_prop_set_uint32 (dev,"num-harts" , num_harts);qdev_prop_set_uint32 (dev,"sip-base" , sip_base);qdev_prop_set_uint32 (dev,"timecmp-base" , timecmp_base);qdev_prop_set_uint32 (dev,"time-base" , time_base);qdev_prop_set_uint32 (dev,"aperture-size" , size); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , addr);return dev; }
hw/riscv/sifive_e_prci.c +3 -2
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" +#include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h"
Lines of this file are not shown. View the raw message.
hw/sparc/sun4m.c +32 -32
64 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.21.1
Part of the diff is not shown here. View the raw message.
Re: [PATCH 08/55] qdev: Convert uses of qdev_create() with Coccinelle
Quoted 9 lines · Markus Armbruster
expression bus,
type_name, dev;
@@
- dev =qdev_create(bus, type_name);
+ dev =qdev_new(type_name);
...
-qdev_init_nofail(dev);
+qdev_realize_and_unref(dev, bus, &error_fatal);
Quoted 3 lines
The first rule exempts
hw/arm/highbank.c, because it matches along two control flow paths there, with different @type_name. Covered by the next commit's manual conversions.
Slightly better way to express it:
expression bus, type_name, dev;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = qdev_create(...)
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
(Just for documentation purposes, the patch is okay of course).
Paolo
Re: [PATCH 08/55] qdev: Convert uses of qdev_create() with Coccinelle
Quoted 24 lines · Paolo Bonzini
Quoted 9 lines · Markus Armbruster
expression bus,
type_name, dev;
@@
- dev =qdev_create(bus, type_name);
+ dev =qdev_new(type_name);
...
-qdev_init_nofail(dev);
+qdev_realize_and_unref(dev, bus, &error_fatal);Quoted 3 lines
The first rule exempts
hw/arm/highbank.c, because it matches along two control flow paths there, with different @type_name. Covered by the next commit's manual conversions.Slightly better way to express it:
expression bus,
type_name, dev;
@@
- dev =qdev_create(bus, type_name);
+ dev =qdev_new(type_name);
... when != dev =qdev_create(...)
-qdev_init_nofail(dev);
+qdev_realize_and_unref(dev, bus, &error_fatal);
Quoted 1 line
(Just for documentation purposes, the patch is okay of course).
I actually have a "... when != dev = expr" in a few later scripts. Added when I found out that just ... produced a bad change in one case. I meant to update all such ... to carry it, then check the addition doesn't mess up anything, but forgot. Can do it for v2. Thanks!
PATCH 9/55 qdev: Convert uses of qdev_create() manually
In reply to Markus ArmbrusterSame transformation as in the previous commit. Manual, because convincing Coccinelle to transform these cases is somewhere between not worthwhile and infeasible (at least for me).
--- hw/arm/highbank.c | 6 +++--- hw/arm/sbsa-ref.c | 4 ++-- hw/arm/virt.c | 4 ++-- hw/block/xen-block.c | 4 ++-- hw/display/xlnx_dp.c | 5 +++-- hw/i386/pc.c | 4 ++-- hw/i386/pc_sysfw.c | 4 ++-- hw/pci-bridge/pci_expander_bridge.c | 4 ++-- hw/ppc/pnv.c | 4 ++-- hw/riscv/virt.c | 4 ++-- hw/s390x/s390-pci-bus.c | 4 ++-- hw/sparc/leon3.c | 8 ++++---- hw/usb/bus.c | 8 ++++---- 13 files changed, 32 insertions(+), 31 deletions(-)
hw/arm/highbank.c +3 -3
@@ -316,15 +316,15 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) busdev =SYS_BUS_DEVICE (dev);sysbus_mmio_map (busdev,0 ,0xfff12000 ); - dev =qdev_create (NULL ,TYPE_A9MPCORE_PRIV ); + dev =qdev_new (TYPE_A9MPCORE_PRIV );break ;case CALXEDA_MIDWAY : - dev =qdev_create (NULL ,TYPE_A15MPCORE_PRIV ); + dev =qdev_new (TYPE_A15MPCORE_PRIV );break ; }qdev_prop_set_uint32 (dev,"num-cpu" , smp_cpus);qdev_prop_set_uint32 (dev,"num-irq" ,NIRQ_GIC ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev);sysbus_mmio_map (busdev,0 ,MPCORE_PERIPHBASE );for (n =0 ; n < smp_cpus; n++) {
hw/arm/sbsa-ref.c +2 -2
@@ -211,7 +211,7 @@ static PFlashCFI01 *sbsa_flash_create1(SBSAMachineState *sms,* Create a single flash device. We use the same parameters as * the flash devices on the Versatile Express board. */ -DeviceState *dev =qdev_create (NULL ,TYPE_PFLASH_CFI01 ); +DeviceState *dev =qdev_new (TYPE_PFLASH_CFI01 );qdev_prop_set_uint64 (dev,"sector-length" ,SBSA_FLASH_SECTOR_SIZE );qdev_prop_set_uint8 (dev,"width" ,4 );
@@ -243,7 +243,7 @@ static void sbsa_flash_map1(PFlashCFI01 *flash,assert (size %SBSA_FLASH_SECTOR_SIZE ==0 );assert (size /SBSA_FLASH_SECTOR_SIZE <=UINT32_MAX );qdev_prop_set_uint32 (dev,"num-blocks" , size /SBSA_FLASH_SECTOR_SIZE ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); memory_region_add_subregion(sysmem, base, sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),
hw/arm/virt.c +2 -2
@@ -948,7 +948,7 @@ static PFlashCFI01 *virt_flash_create1(VirtMachineState *vms,* Create a single flash device. We use the same parameters as * the flash devices on the Versatile Express board. */ -DeviceState *dev =qdev_create (NULL ,TYPE_PFLASH_CFI01 ); +DeviceState *dev =qdev_new (TYPE_PFLASH_CFI01 );qdev_prop_set_uint64 (dev,"sector-length" ,VIRT_FLASH_SECTOR_SIZE );qdev_prop_set_uint8 (dev,"width" ,4 );
@@ -980,7 +980,7 @@ static void virt_flash_map1(PFlashCFI01 *flash,assert (size %VIRT_FLASH_SECTOR_SIZE ==0 );assert (size /VIRT_FLASH_SECTOR_SIZE <=UINT32_MAX );qdev_prop_set_uint32 (dev,"num-blocks" , size /VIRT_FLASH_SECTOR_SIZE ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); memory_region_add_subregion(sysmem, base, sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),
hw/block/xen-block.c +2 -2
@@ -937,7 +937,7 @@ static void xen_block_device_create(XenBackendInstance *backend, goto fail; } - xendev =XEN_DEVICE (qdev_create (BUS (xenbus), type)); + xendev =XEN_DEVICE (qdev_new (type)); blockdev =XEN_BLOCK_DEVICE (xendev);object_property_set_str (OBJECT (xendev), vdev,"vdev" , &local_err);
@@ -965,7 +965,7 @@ static void xen_block_device_create(XenBackendInstance *backend, blockdev->iothread = iothread; blockdev->drive = drive; -object_property_set_bool (OBJECT (xendev), true,"realized" , &local_err); +qdev_realize_and_unref (DEVICE (xendev),BUS (xenbus), &local_err);if (local_err) { error_propagate_prepend(errp, local_err, "realization of device %s failed: ",
hw/display/xlnx_dp.c +3 -2
@@ -1250,7 +1250,7 @@ static void xlnx_dp_init(Object *obj) s->dpcd =DPCD (aux_create_slave (s->aux_bus,"dpcd" ));object_property_add_child (OBJECT (s),"dpcd" ,OBJECT (s->dpcd)); - s->edid =I2CDDC (qdev_create (BUS (aux_get_i2c_bus (s->aux_bus)),"i2c-ddc" )); + s->edid =I2CDDC (qdev_new ("i2c-ddc" ));i2c_set_slave_address (I2C_SLAVE (s->edid),0x50 );object_property_add_child (OBJECT (s),"edid" ,OBJECT (s->edid));
@@ -1269,7 +1269,8 @@ static void xlnx_dp_realize(DeviceState *dev, Error **errp)qdev_init_nofail (DEVICE (s->dpcd));aux_map_slave (AUX_SLAVE (s->dpcd),0x0000 ); -qdev_init_nofail (DEVICE (s->edid)); +qdev_realize_and_unref (DEVICE (s->edid),BUS (aux_get_i2c_bus (s->aux_bus)), + &error_fatal); s->console =graphic_console_init (dev,0 , &xlnx_dp_gfx_ops, s); surface =qemu_console_surface (s->console);
hw/i386/pc.c +2 -2
@@ -1204,7 +1204,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,* when the HPET wants to take over. Thus we have to disable the latter. */ if (!no_hpet && (!kvm_irqchip_in_kernel () ||kvm_has_pit_state2 ())) { - hpet =qdev_try_create (NULL ,TYPE_HPET ); + hpet =qdev_try_new (TYPE_HPET );if (hpet) {/* For pc-piix-*, hpet's intcap is always IRQ2. For pc-q35-1.7 * and earlier, use IRQ2 for compat. Otherwise, use IRQ16~23,
@@ -1215,7 +1215,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,if (!compat) {qdev_prop_set_uint32 (hpet,HPET_INTCAP , hpet_irqs); } -qdev_init_nofail (hpet); +qdev_realize_and_unref (hpet,NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (hpet),0 ,HPET_BASE );for (i =0 ; i <GSI_NUM_PINS ; i++) {
hw/i386/pc_sysfw.c +2 -2
@@ -85,7 +85,7 @@ static PFlashCFI01 *pc_pflash_create(PCMachineState *pcms,const char *name, const char *alias_prop_name) { - DeviceState *dev = qdev_create(NULL, TYPE_PFLASH_CFI01); + DeviceState *dev = qdev_new(TYPE_PFLASH_CFI01);qdev_prop_set_uint64 (dev,"sector-length" ,FLASH_SECTOR_SIZE );qdev_prop_set_uint8 (dev,"width" ,1 );
@@ -187,7 +187,7 @@ static void pc_system_flash_map(PCMachineState *pcms, total_size += size;qdev_prop_set_uint32 (DEVICE (system_flash),"num-blocks" , size /FLASH_SECTOR_SIZE ); -qdev_init_nofail (DEVICE (system_flash)); +qdev_realize_and_unref (DEVICE (system_flash),NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (system_flash),0 ,0x100000000ULL - total_size);
hw/pci-bridge/pci_expander_bridge.c +2 -2
@@ -236,7 +236,7 @@ static void pxb_dev_realize_common(PCIDevice *dev, bool pcie, Error **errp) bus =pci_root_bus_new (ds, dev_name,NULL ,NULL ,0 ,TYPE_PXB_PCIE_BUS ); }else { bus =pci_root_bus_new (ds,"pxb-internal" ,NULL ,NULL ,0 ,TYPE_PXB_BUS ); - bds =qdev_create (BUS (bus),"pci-bridge" ); + bds =qdev_new ("pci-bridge" ); bds->id = dev_name;qdev_prop_set_uint8 (bds,PCI_BRIDGE_DEV_PROP_CHASSIS_NR , pxb->bus_nr);qdev_prop_set_bit (bds,PCI_BRIDGE_DEV_PROP_SHPC , false);
@@ -257,7 +257,7 @@ static void pxb_dev_realize_common(PCIDevice *dev, bool pcie, Error **errp)qdev_realize_and_unref (ds,NULL , &error_fatal);if (bds) { -qdev_init_nofail (bds); +qdev_realize_and_unref (bds, &bus->qbus, &error_fatal); } pci_word_test_and_set_mask(dev->config + PCI_STATUS,
hw/ppc/pnv.c +2 -2
@@ -818,7 +818,7 @@ static void pnv_init(MachineState *machine) pnv->chips = g_new0(PnvChip *, pnv->num_chips);for (i =0 ; i < pnv->num_chips; i++) {char chip_name[32 ]; -Object *chip =OBJECT (qdev_create (NULL , chip_typename)); +Object *chip =OBJECT (qdev_new (chip_typename)); pnv->chips[i] =PNV_CHIP (chip);
@@ -850,7 +850,7 @@ static void pnv_init(MachineState *machine)object_property_set_link (chip,OBJECT (pnv),"xive-fabric" , &error_abort); } -object_property_set_bool (chip, true,"realized" , &error_fatal); +qdev_realize_and_unref (DEVICE (chip),NULL , &error_fatal); }g_free (chip_typename);
hw/riscv/virt.c +2 -2
@@ -80,7 +80,7 @@ static PFlashCFI01 *virt_flash_create1(RISCVVirtState *s,* Create a single flash device. We use the same parameters as * the flash devices on the ARM virt board. */ -DeviceState *dev =qdev_create (NULL ,TYPE_PFLASH_CFI01 ); +DeviceState *dev =qdev_new (TYPE_PFLASH_CFI01 );qdev_prop_set_uint64 (dev,"sector-length" ,VIRT_FLASH_SECTOR_SIZE );qdev_prop_set_uint8 (dev,"width" ,4 );
@@ -114,7 +114,7 @@ static void virt_flash_map1(PFlashCFI01 *flash,assert (size %VIRT_FLASH_SECTOR_SIZE ==0 );assert (size /VIRT_FLASH_SECTOR_SIZE <=UINT32_MAX );qdev_prop_set_uint32 (dev,"num-blocks" , size /VIRT_FLASH_SECTOR_SIZE ); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,NULL , &error_fatal); memory_region_add_subregion(sysmem, base, sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),
hw/s390x/s390-pci-bus.c +2 -2
@@ -824,7 +824,7 @@ static S390PCIBusDevice *s390_pci_device_new(S390pciState *s,Error *local_err =NULL ;DeviceState *dev; - dev =qdev_try_create (BUS (s->bus),TYPE_S390_PCI_DEVICE ); + dev =qdev_try_new (TYPE_S390_PCI_DEVICE );if (!dev) {error_setg (errp,"zPCI device could not be created" );return NULL ;
@@ -837,7 +837,7 @@ static S390PCIBusDevice *s390_pci_device_new(S390pciState *s, "zPCI device could not be created: ");return NULL ; } -object_property_set_bool (OBJECT (dev), true,"realized" , &local_err); +qdev_realize_and_unref (dev,BUS (s->bus), &local_err);if (local_err) {object_unparent (OBJECT (dev)); error_propagate_prepend(errp, local_err,
hw/sparc/leon3.c +4 -4
@@ -213,15 +213,15 @@ static void leon3_generic_hw_init(MachineState *machine) reset_info->sp =LEON3_RAM_OFFSET + ram_size;qemu_register_reset (main_cpu_reset, reset_info); - ahb_pnp =GRLIB_AHB_PNP (qdev_create (NULL ,TYPE_GRLIB_AHB_PNP )); -object_property_set_bool (OBJECT (ahb_pnp), true,"realized" , &error_fatal); + ahb_pnp =GRLIB_AHB_PNP (qdev_new (TYPE_GRLIB_AHB_PNP )); +qdev_realize_and_unref (DEVICE (ahb_pnp),NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (ahb_pnp),0 ,LEON3_AHB_PNP_OFFSET );grlib_ahb_pnp_add_entry (ahb_pnp,0 ,0 ,GRLIB_VENDOR_GAISLER ,GRLIB_LEON3_DEV ,GRLIB_AHB_MASTER ,GRLIB_CPU_AREA ); - apb_pnp =GRLIB_APB_PNP (qdev_create (NULL ,TYPE_GRLIB_APB_PNP )); -object_property_set_bool (OBJECT (apb_pnp), true,"realized" , &error_fatal); + apb_pnp =GRLIB_APB_PNP (qdev_new (TYPE_GRLIB_APB_PNP )); +qdev_realize_and_unref (DEVICE (apb_pnp),NULL , &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (apb_pnp),0 ,LEON3_APB_PNP_OFFSET ); grlib_ahb_pnp_add_entry(ahb_pnp, LEON3_APB_PNP_OFFSET, 0xFFF, GRLIB_VENDOR_GAISLER, GRLIB_APBMST_DEV,
hw/usb/bus.c +4 -4
@@ -326,21 +326,21 @@ static USBDevice *usb_try_create_simple(USBBus *bus, const char *name, Error **errp) {Error *err =NULL ; -USBDevice *dev; +DeviceState *dev; - dev =USB_DEVICE (qdev_try_create (&bus->qbus, name)); + dev =qdev_try_new (name);if (!dev) {error_setg (errp,"Failed to create USB device '%s'" , name);return NULL ; } -object_property_set_bool (OBJECT (dev), true,"realized" , &err); +qdev_realize_and_unref (dev, &bus->qbus, &err);if (err) {error_propagate_prepend (errp, err,"Failed to initialize USB device '%s': " , name);return NULL ; } -return dev; +return USB_DEVICE (dev); }USBDevice *usb_create_simple (USBBus *bus,const char *name)
Signature · 1 line
2.21.1
PATCH 10/55 qdev: Convert uses of qdev_set_parent_bus() with Coccinelle
In reply to Markus ArmbrusterIn addition to the qdev_create() patterns converted so far, we have a qdev_set_parent_bus() pattern. Mostly when we embed a device in a parent device rather than allocating it on the heap.
This pattern also puts devices in the dangerous "no QOM parent, but plugged into bus" state I explained in recent commit "qdev: New qdev_new(), qdev_realize(), etc."
Apply same solution: convert to qdev_realize(). Coccinelle script:
@@
expression dev, bus, errp;
symbol true;
@@
- qdev_set_parent_bus(DEVICE(dev), bus);
...
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize(DEVICE(dev), bus, errp);
@ depends on !(file in "qdev-monitor.c") && !(file in "hw/core/qdev.c")@
expression dev, bus, errp;
symbol true;
@@
- qdev_set_parent_bus(dev, bus);
...
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize(dev, bus, errp);
@@
expression dev, bus;
symbol true;
@@
- qdev_set_parent_bus(DEVICE(dev), bus);
...
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize(DEVICE(dev), bus, &error_fatal);Unconverted uses of qdev_set_parent_bus() remain. They'll be converted later in this series.
--- hw/display/virtio-gpu-pci.c | 3 +-- hw/display/virtio-vga.c | 3 +-- hw/i386/amd_iommu.c | 3 +-- hw/isa/piix4.c | 3 +-- hw/misc/macio/macio.c | 7 ++----- hw/pci-host/designware.c | 3 +-- hw/pci-host/gpex.c | 3 +-- hw/pci-host/pnv_phb3.c | 3 +-- hw/pci-host/pnv_phb4.c | 3 +-- hw/pci-host/q35.c | 3 +-- hw/pci-host/versatile.c | 3 +-- hw/pci-host/xilinx-pcie.c | 3 +-- hw/s390x/vhost-vsock-ccw.c | 3 +-- hw/s390x/virtio-ccw-9p.c | 3 +-- hw/s390x/virtio-ccw-balloon.c | 3 +-- hw/s390x/virtio-ccw-blk.c | 3 +-- hw/s390x/virtio-ccw-crypto.c | 3 +-- hw/s390x/virtio-ccw-gpu.c | 3 +-- hw/s390x/virtio-ccw-input.c | 3 +-- hw/s390x/virtio-ccw-net.c | 3 +-- hw/s390x/virtio-ccw-rng.c | 3 +-- hw/s390x/virtio-ccw-scsi.c | 6 ++---- hw/s390x/virtio-ccw-serial.c | 3 +-- hw/virtio/vhost-scsi-pci.c | 3 +-- hw/virtio/vhost-user-blk-pci.c | 3 +-- hw/virtio/vhost-user-fs-pci.c | 3 +-- hw/virtio/vhost-user-scsi-pci.c | 3 +-- hw/virtio/vhost-vsock-pci.c | 3 +-- hw/virtio/virtio-9p-pci.c | 3 +-- hw/virtio/virtio-balloon-pci.c | 3 +-- hw/virtio/virtio-blk-pci.c | 3 +-- hw/virtio/virtio-crypto-pci.c | 3 +-- hw/virtio/virtio-input-pci.c | 3 +-- hw/virtio/virtio-iommu-pci.c | 3 +-- hw/virtio/virtio-net-pci.c | 3 +-- hw/virtio/virtio-pmem-pci.c | 3 +-- hw/virtio/virtio-rng-pci.c | 3 +-- hw/virtio/virtio-scsi-pci.c | 3 +-- hw/virtio/virtio-serial-pci.c | 3 +-- hw/xen/xen-legacy-backend.c | 3 +-- 40 files changed, 42 insertions(+), 85 deletions(-)
hw/display/virtio-gpu-pci.c +1 -2
@@ -33,9 +33,8 @@ static void virtio_gpu_pci_base_realize(VirtIOPCIProxy *vpci_dev, Error **errp)int i;Error *local_error =NULL ; -qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus));virtio_pci_force_virtio_1 (vpci_dev); -object_property_set_bool (OBJECT (vdev), true,"realized" , &local_error); +qdev_realize (vdev,BUS (&vpci_dev->bus), &local_error);if (local_error) {error_propagate (errp, local_error);
hw/display/virtio-vga.c +1 -2
@@ -137,9 +137,8 @@ static void virtio_vga_base_realize(VirtIOPCIProxy *vpci_dev, Error **errp) vpci_dev->common.offset = offset;/* init virtio bits */ -qdev_set_parent_bus (DEVICE (g),BUS (&vpci_dev->bus));virtio_pci_force_virtio_1 (vpci_dev); -object_property_set_bool (OBJECT (g), true,"realized" , &err); +qdev_realize (DEVICE (g),BUS (&vpci_dev->bus), &err);if (err) {error_propagate (errp, err);return ;
hw/i386/amd_iommu.c +1 -2
@@ -1548,8 +1548,7 @@ static void amdvi_realize(DeviceState *dev, Error **errp)/* This device should take care of IOMMU PCI properties */ x86_iommu->type =TYPE_AMD ; -qdev_set_parent_bus (DEVICE (&s->pci), &bus->qbus); -object_property_set_bool (OBJECT (&s->pci), true,"realized" , errp); +qdev_realize (DEVICE (&s->pci), &bus->qbus, errp); ret =pci_add_capability (&s->pci.dev,AMDVI_CAPAB_ID_SEC ,0 ,AMDVI_CAPAB_SIZE , errp);if (ret <0 ) {
hw/isa/piix4.c +1 -2
@@ -182,9 +182,8 @@ static void piix4_realize(PCIDevice *dev, Error **errp)i8257_dma_init (isa_bus,0 );/* RTC */ -qdev_set_parent_bus (DEVICE (&s->rtc),BUS (isa_bus));qdev_prop_set_int32 (DEVICE (&s->rtc),"base_year" ,2000 ); -object_property_set_bool (OBJECT (&s->rtc), true,"realized" , &err); +qdev_realize (DEVICE (&s->rtc),BUS (isa_bus), &err);if (err) {error_propagate (errp, err);return ;
hw/misc/macio/macio.c +2 -5
@@ -356,9 +356,7 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)object_property_set_link (OBJECT (&s->pmu),OBJECT (sysbus_dev),"gpio" , &error_abort);qdev_prop_set_bit (DEVICE (&s->pmu),"has-adb" , ns->has_adb); -qdev_set_parent_bus (DEVICE (&s->pmu),BUS (&s->macio_bus)); - -object_property_set_bool (OBJECT (&s->pmu), true,"realized" , &err); +qdev_realize (DEVICE (&s->pmu),BUS (&s->macio_bus), &err);if (err) {error_propagate (errp, err);return ;
@@ -374,11 +372,10 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)/* CUDA */ object_initialize_child (OBJECT (s),"cuda" , &s->cuda,sizeof (s->cuda),TYPE_CUDA , &error_abort,NULL ); -qdev_set_parent_bus (DEVICE (&s->cuda),BUS (&s->macio_bus));qdev_prop_set_uint64 (DEVICE (&s->cuda),"timebase-frequency" , s->frequency); -object_property_set_bool (OBJECT (&s->cuda), true,"realized" , &err); +qdev_realize (DEVICE (&s->cuda),BUS (&s->macio_bus), &err);if (err) {error_propagate (errp, err);return ;
hw/pci-host/designware.c +1 -2
@@ -688,8 +688,7 @@ static void designware_pcie_host_realize(DeviceState *dev, Error **errp) "pcie-bus-address-space");pci_setup_iommu (pci->bus, designware_pcie_host_set_iommu, s); -qdev_set_parent_bus (DEVICE (&s->root),BUS (pci->bus)); -qdev_init_nofail (DEVICE (&s->root)); +qdev_realize (DEVICE (&s->root),BUS (pci->bus), &error_fatal); }static const VMStateDescription vmstate_designware_pcie_host = {
hw/pci-host/gpex.c +1 -2
@@ -98,9 +98,8 @@ static void gpex_host_realize(DeviceState *dev, Error **errp) pci_swizzle_map_irq_fn, s, &s->io_mmio, &s->io_ioport, 0, 4, TYPE_PCIE_BUS); -qdev_set_parent_bus (DEVICE (&s->gpex_root),BUS (pci->bus));pci_bus_set_route_irq_fn (pci->bus, gpex_route_intx_pin_to_irq); -qdev_init_nofail (DEVICE (&s->gpex_root)); +qdev_realize (DEVICE (&s->gpex_root),BUS (pci->bus), &error_fatal); } static const char *gpex_host_root_bus_path(PCIHostState *host_bridge,
hw/pci-host/pnv_phb3.c +1 -2
@@ -1064,8 +1064,7 @@ static void pnv_phb3_realize(DeviceState *dev, Error **errp)/* Add a single Root port */ qdev_prop_set_uint8 (DEVICE (&phb->root),"chassis" , phb->chip_id);qdev_prop_set_uint16 (DEVICE (&phb->root),"slot" , phb->phb_id); -qdev_set_parent_bus (DEVICE (&phb->root),BUS (pci->bus)); -qdev_init_nofail (DEVICE (&phb->root)); +qdev_realize (DEVICE (&phb->root),BUS (pci->bus), &error_fatal); }void pnv_phb3_update_regions (PnvPHB3 *phb)
hw/pci-host/pnv_phb4.c +1 -2
@@ -1210,8 +1210,7 @@ static void pnv_phb4_realize(DeviceState *dev, Error **errp)/* Add a single Root port */ qdev_prop_set_uint8 (DEVICE (&phb->root),"chassis" , phb->chip_id);qdev_prop_set_uint16 (DEVICE (&phb->root),"slot" , phb->phb_id); -qdev_set_parent_bus (DEVICE (&phb->root),BUS (pci->bus)); -qdev_init_nofail (DEVICE (&phb->root)); +qdev_realize (DEVICE (&phb->root),BUS (pci->bus), &error_fatal);/* Setup XIVE Source */ if (phb->big_phb) {
hw/pci-host/q35.c +1 -2
@@ -64,8 +64,7 @@ static void q35_host_realize(DeviceState *dev, Error **errp) s->mch.address_space_io, 0, TYPE_PCIE_BUS);PC_MACHINE (qdev_get_machine ())->bus = pci->bus; -qdev_set_parent_bus (DEVICE (&s->mch),BUS (pci->bus)); -qdev_init_nofail (DEVICE (&s->mch)); +qdev_realize (DEVICE (&s->mch),BUS (pci->bus), &error_fatal); } static const char *q35_host_root_bus_path(PCIHostState *host_bridge,
hw/pci-host/versatile.c +1 -2
@@ -408,7 +408,6 @@ static void pci_vpb_realize(DeviceState *dev, Error **errp) h->bus = &s->pci_bus;object_initialize (&s->pci_dev,sizeof (s->pci_dev),TYPE_VERSATILE_PCI_HOST ); -qdev_set_parent_bus (DEVICE (&s->pci_dev),BUS (&s->pci_bus));for (i =0 ; i <4 ; i++) {sysbus_init_irq (sbd, &s->irq[i]);
@@ -458,7 +457,7 @@ static void pci_vpb_realize(DeviceState *dev, Error **errp) }/* TODO Remove once realize propagates to child devices. */ -object_property_set_bool (OBJECT (&s->pci_dev), true,"realized" , errp); +qdev_realize (DEVICE (&s->pci_dev),BUS (&s->pci_bus), errp); }static void versatile_pci_host_realize (PCIDevice *d,Error **errp)
hw/pci-host/xilinx-pcie.c +1 -2
@@ -137,8 +137,7 @@ static void xilinx_pcie_host_realize(DeviceState *dev, Error **errp) pci_swizzle_map_irq_fn, s, &s->mmio, &s->io, 0, 4, TYPE_PCIE_BUS); -qdev_set_parent_bus (DEVICE (&s->root),BUS (pci->bus)); -qdev_init_nofail (DEVICE (&s->root)); +qdev_realize (DEVICE (&s->root),BUS (pci->bus), &error_fatal); } static const char *xilinx_pcie_host_root_bus_path(PCIHostState *host_bridge,
hw/s390x/vhost-vsock-ccw.c +1 -2
@@ -24,8 +24,7 @@ static void vhost_vsock_ccw_realize(VirtioCcwDevice *ccw_dev, Error **errp)VHostVSockCCWState *dev =VHOST_VSOCK_CCW (ccw_dev);DeviceState *vdev =DEVICE (&dev->vdev); -qdev_set_parent_bus (vdev,BUS (&ccw_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&ccw_dev->bus), errp); }static void vhost_vsock_ccw_class_init (ObjectClass *klass,void *data)
hw/s390x/virtio-ccw-9p.c +1 -2
@@ -21,8 +21,7 @@ static void virtio_ccw_9p_realize(VirtioCcwDevice *ccw_dev, Error **errp)V9fsCCWState *dev =VIRTIO_9P_CCW (ccw_dev);DeviceState *vdev =DEVICE (&dev->vdev); -qdev_set_parent_bus (vdev,BUS (&ccw_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&ccw_dev->bus), errp); }static void virtio_ccw_9p_instance_init (Object *obj)
hw/s390x/virtio-ccw-balloon.c +1 -2
@@ -21,8 +21,7 @@ static void virtio_ccw_balloon_realize(VirtioCcwDevice *ccw_dev, Error **errp)VirtIOBalloonCcw *dev =VIRTIO_BALLOON_CCW (ccw_dev);DeviceState *vdev =DEVICE (&dev->vdev); -qdev_set_parent_bus (vdev,BUS (&ccw_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&ccw_dev->bus), errp); }static void virtio_ccw_balloon_instance_init (Object *obj)
hw/s390x/virtio-ccw-blk.c +1 -2
@@ -21,8 +21,7 @@ static void virtio_ccw_blk_realize(VirtioCcwDevice *ccw_dev, Error **errp)VirtIOBlkCcw *dev =VIRTIO_BLK_CCW (ccw_dev);DeviceState *vdev =DEVICE (&dev->vdev); -qdev_set_parent_bus (vdev,BUS (&ccw_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&ccw_dev->bus), errp); }static void virtio_ccw_blk_instance_init (Object *obj)
hw/s390x/virtio-ccw-crypto.c +1 -2
@@ -21,8 +21,7 @@ static void virtio_ccw_crypto_realize(VirtioCcwDevice *ccw_dev, Error **errp)DeviceState *vdev =DEVICE (&dev->vdev);Error *err =NULL ; -qdev_set_parent_bus (vdev,BUS (&ccw_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , &err); +qdev_realize (vdev,BUS (&ccw_dev->bus), &err);if (err) {error_propagate (errp, err);return ;
hw/s390x/virtio-ccw-gpu.c +1 -2
@@ -20,8 +20,7 @@ static void virtio_ccw_gpu_realize(VirtioCcwDevice *ccw_dev, Error **errp)VirtIOGPUCcw *dev =VIRTIO_GPU_CCW (ccw_dev);DeviceState *vdev =DEVICE (&dev->vdev); -qdev_set_parent_bus (vdev,BUS (&ccw_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&ccw_dev->bus), errp); }static void virtio_ccw_gpu_instance_init (Object *obj)
hw/s390x/virtio-ccw-input.c +1 -2
@@ -20,8 +20,7 @@ static void virtio_ccw_input_realize(VirtioCcwDevice *ccw_dev, Error **errp)VirtIOInputCcw *dev =VIRTIO_INPUT_CCW (ccw_dev);DeviceState *vdev =DEVICE (&dev->vdev); -qdev_set_parent_bus (vdev,BUS (&ccw_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&ccw_dev->bus), errp); }static Property virtio_ccw_input_properties[] = {
hw/s390x/virtio-ccw-net.c +1 -2
@@ -24,8 +24,7 @@ static void virtio_ccw_net_realize(VirtioCcwDevice *ccw_dev, Error **errp)virtio_net_set_netclient_name (&dev->vdev, qdev->id,object_get_typename (OBJECT (qdev))); -qdev_set_parent_bus (vdev,BUS (&ccw_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&ccw_dev->bus), errp); }static void virtio_ccw_net_instance_init (Object *obj)
hw/s390x/virtio-ccw-rng.c +1 -2
@@ -22,8 +22,7 @@ static void virtio_ccw_rng_realize(VirtioCcwDevice *ccw_dev, Error **errp)DeviceState *vdev =DEVICE (&dev->vdev);Error *err =NULL ; -qdev_set_parent_bus (vdev,BUS (&ccw_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , &err); +qdev_realize (vdev,BUS (&ccw_dev->bus), &err);if (err) {error_propagate (errp, err);return ;
hw/s390x/virtio-ccw-scsi.c +2 -4
@@ -33,8 +33,7 @@ static void virtio_ccw_scsi_realize(VirtioCcwDevice *ccw_dev, Error **errp)g_free (bus_name); } -qdev_set_parent_bus (vdev,BUS (&ccw_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&ccw_dev->bus), errp); }static void virtio_ccw_scsi_instance_init (Object *obj)
@@ -78,8 +77,7 @@ static void vhost_ccw_scsi_realize(VirtioCcwDevice *ccw_dev, Error **errp)VHostSCSICcw *dev =VHOST_SCSI_CCW (ccw_dev);DeviceState *vdev =DEVICE (&dev->vdev); -qdev_set_parent_bus (vdev,BUS (&ccw_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&ccw_dev->bus), errp); }static void vhost_ccw_scsi_instance_init (Object *obj)
hw/s390x/virtio-ccw-serial.c +1 -2
@@ -33,8 +33,7 @@ static void virtio_ccw_serial_realize(VirtioCcwDevice *ccw_dev, Error **errp)g_free (bus_name); } -qdev_set_parent_bus (vdev,BUS (&ccw_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&ccw_dev->bus), errp); }
hw/virtio/vhost-scsi-pci.c +1 -2
@@ -53,8 +53,7 @@ static void vhost_scsi_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) vpci_dev->nvectors = vs->conf.num_queues +3 ; } -qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&vpci_dev->bus), errp); }static void vhost_scsi_pci_class_init (ObjectClass *klass,void *data)
hw/virtio/vhost-user-blk-pci.c +1 -2
@@ -58,8 +58,7 @@ static void vhost_user_blk_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) vpci_dev->nvectors = dev->vdev.num_queues +1 ; } -qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&vpci_dev->bus), errp); }static void vhost_user_blk_pci_class_init (ObjectClass *klass,void *data)
hw/virtio/vhost-user-fs-pci.c +1 -2
@@ -44,8 +44,7 @@ static void vhost_user_fs_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) vpci_dev->nvectors = dev->vdev.conf.num_request_queues +2 ; } -qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&vpci_dev->bus), errp); }static void vhost_user_fs_pci_class_init (ObjectClass *klass,void *data)
hw/virtio/vhost-user-scsi-pci.c +1 -2
@@ -59,8 +59,7 @@ static void vhost_user_scsi_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) vpci_dev->nvectors = vs->conf.num_queues +3 ; } -qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&vpci_dev->bus), errp); }static void vhost_user_scsi_pci_class_init (ObjectClass *klass,void *data)
hw/virtio/vhost-vsock-pci.c +1 -2
@@ -44,8 +44,7 @@ static void vhost_vsock_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)VHostVSockPCI *dev =VHOST_VSOCK_PCI (vpci_dev);DeviceState *vdev =DEVICE (&dev->vdev); -qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&vpci_dev->bus), errp); }static void vhost_vsock_pci_class_init (ObjectClass *klass,void *data)
hw/virtio/virtio-9p-pci.c +1 -2
@@ -38,8 +38,7 @@ static void virtio_9p_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)V9fsPCIState *dev =VIRTIO_9P_PCI (vpci_dev);DeviceState *vdev =DEVICE (&dev->vdev); -qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&vpci_dev->bus), errp); }static Property virtio_9p_pci_properties[] = {
hw/virtio/virtio-balloon-pci.c +1 -2
@@ -48,8 +48,7 @@ static void virtio_balloon_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) vpci_dev->class_code =PCI_CLASS_OTHERS ; } -qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&vpci_dev->bus), errp); }static void virtio_balloon_pci_class_init (ObjectClass *klass,void *data)
hw/virtio/virtio-blk-pci.c +1 -2
@@ -55,8 +55,7 @@ static void virtio_blk_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) vpci_dev->nvectors = dev->vdev.conf.num_queues +1 ; } -qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&vpci_dev->bus), errp); }static void virtio_blk_pci_class_init (ObjectClass *klass,void *data)
hw/virtio/virtio-crypto-pci.c +1 -2
@@ -53,9 +53,8 @@ static void virtio_crypto_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)return ; } -qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus));virtio_pci_force_virtio_1 (vpci_dev); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&vpci_dev->bus), errp);object_property_set_link (OBJECT (vcrypto),OBJECT (vcrypto->vdev.conf.cryptodev),"cryptodev" ,NULL );
hw/virtio/virtio-input-pci.c +1 -2
@@ -49,9 +49,8 @@ static void virtio_input_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)VirtIOInputPCI *vinput =VIRTIO_INPUT_PCI (vpci_dev);DeviceState *vdev =DEVICE (&vinput->vdev); -qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus));virtio_pci_force_virtio_1 (vpci_dev); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&vpci_dev->bus), errp); }static void virtio_input_pci_class_init (ObjectClass *klass,void *data)
hw/virtio/virtio-iommu-pci.c +1 -2
@@ -54,11 +54,10 @@ static void virtio_iommu_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) "-no-acpi\n");return ; } -qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus));object_property_set_link (OBJECT (dev),OBJECT (pci_get_bus (&vpci_dev->pci_dev)),"primary-bus" , errp); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&vpci_dev->bus), errp); }static void virtio_iommu_pci_class_init (ObjectClass *klass,void *data)
hw/virtio/virtio-net-pci.c +1 -2
@@ -52,8 +52,7 @@ static void virtio_net_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)virtio_net_set_netclient_name (&dev->vdev, qdev->id,object_get_typename (OBJECT (qdev))); -qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&vpci_dev->bus), errp); }static void virtio_net_pci_class_init (ObjectClass *klass,void *data)
hw/virtio/virtio-pmem-pci.c +1 -2
@@ -22,8 +22,7 @@ static void virtio_pmem_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)VirtIOPMEMPCI *pmem_pci =VIRTIO_PMEM_PCI (vpci_dev);DeviceState *vdev =DEVICE (&pmem_pci->vdev); -qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&vpci_dev->bus), errp); } static void virtio_pmem_pci_set_addr(MemoryDeviceState *md, uint64_t addr,
hw/virtio/virtio-rng-pci.c +1 -2
@@ -36,8 +36,7 @@ static void virtio_rng_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)DeviceState *vdev =DEVICE (&vrng->vdev);Error *err =NULL ; -qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , &err); +qdev_realize (vdev,BUS (&vpci_dev->bus), &err);if (err) {error_propagate (errp, err);return ;
hw/virtio/virtio-scsi-pci.c +1 -2
@@ -64,8 +64,7 @@ static void virtio_scsi_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)g_free (bus_name); } -qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&vpci_dev->bus), errp); }static void virtio_scsi_pci_class_init (ObjectClass *klass,void *data)
hw/virtio/virtio-serial-pci.c +1 -2
@@ -65,8 +65,7 @@ static void virtio_serial_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)g_free (bus_name); } -qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus)); -object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +qdev_realize (vdev,BUS (&vpci_dev->bus), errp); }static Property virtio_serial_pci_properties[] = {
hw/xen/xen-legacy-backend.c +1 -2
@@ -278,9 +278,8 @@ static struct XenLegacyDevice *xen_be_get_xendev(const char *type, int dom, xendev =g_malloc0 (ops->size);object_initialize (&xendev->qdev, ops->size,TYPE_XENBACKEND );OBJECT (xendev)->free = g_free; -qdev_set_parent_bus (DEVICE (xendev), xen_sysbus);qdev_set_id (DEVICE (xendev),g_strdup_printf ("xen-%s-%d" , type, dev)); -qdev_init_nofail (DEVICE (xendev)); +qdev_realize (DEVICE (xendev), xen_sysbus, &error_fatal);object_unref (OBJECT (xendev)); xendev->type = type;
Signature · 1 line
2.21.1
PATCH 11/55 qdev: Convert uses of qdev_set_parent_bus() manually
In reply to Markus ArmbrusterSame transformation as in the previous commit. Manual, because convincing Coccinelle to transform these cases is somewhere between not worthwhile and infeasible (at least for me).
--- hw/pci-host/prep.c | 3 +-- hw/ppc/pnv.c | 6 ++---- hw/s390x/sclp.c | 10 ++++------ 3 files changed, 7 insertions(+), 12 deletions(-)
hw/pci-host/prep.c +1 -2
@@ -268,7 +268,7 @@ static void raven_pcihost_realizefn(DeviceState *d, Error **errp)memory_region_add_subregion (address_space_mem,0xbffffff0 , &s->pci_intack);/* TODO Remove once realize propagates to child devices. */ -object_property_set_bool (OBJECT (&s->pci_dev), true,"realized" , errp); +qdev_realize (DEVICE (&s->pci_dev),BUS (&s->pci_bus), errp); }static void raven_pcihost_initfn (Object *obj)
@@ -308,7 +308,6 @@ static void raven_pcihost_initfn(Object *obj)object_initialize (&s->pci_dev,sizeof (s->pci_dev),TYPE_RAVEN_PCI_DEVICE ); pci_dev =DEVICE (&s->pci_dev); -qdev_set_parent_bus (pci_dev,BUS (&s->pci_bus));object_property_set_int (OBJECT (&s->pci_dev),PCI_DEVFN (0 ,0 ),"addr" ,NULL );qdev_prop_set_bit (pci_dev,"multifunction" , false);
hw/ppc/pnv.c +2 -4
@@ -1212,12 +1212,11 @@ static void pnv_chip_power8_realize(DeviceState *dev, Error **errp)object_property_set_int (OBJECT (phb), i,"index" , &error_fatal);object_property_set_int (OBJECT (phb), chip->chip_id,"chip-id" , &error_fatal); -object_property_set_bool (OBJECT (phb), true,"realized" , &local_err); +qdev_realize (DEVICE (phb),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ; } -qdev_set_parent_bus (DEVICE (phb),sysbus_get_default ());/* Populate the XSCOM address space. */ pnv_xscom_add_subregion(chip,
@@ -1422,12 +1421,11 @@ static void pnv_chip_power9_phb_realize(PnvChip *chip, Error **errp)object_property_set_int (obj,PNV_PHB4_DEVICE_ID ,"device-id" , &error_fatal);object_property_set_link (obj,OBJECT (stack),"stack" , &error_abort); -object_property_set_bool (obj, true,"realized" , &local_err); +qdev_realize (DEVICE (obj),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ; } -qdev_set_parent_bus (DEVICE (obj),sysbus_get_default ());/* Populate the XSCOM address space. */ pnv_xscom_add_subregion(chip,
hw/s390x/sclp.c +4 -6
@@ -333,17 +333,15 @@ static void sclp_realize(DeviceState *dev, Error **errp)uint64_t hw_limit;int ret; -object_property_set_bool (OBJECT (sclp->event_facility), true,"realized" , - &err); -if (err) { - goto out; - }/* * qdev_device_add searches the sysbus for TYPE_SCLP_EVENTS_BUS. As long * as we can't find a fitting bus via the qom tree, we have to add the * event facility to the sysbus, so e.g. a sclp console can be created. */ -qdev_set_parent_bus (DEVICE (sclp->event_facility),sysbus_get_default ()); +qdev_realize (DEVICE (sclp->event_facility),NULL , &err); +if (err) { + goto out; + } ret =s390_set_memory_limit (machine->maxram_size, &hw_limit);if (ret == -E2BIG ) {
Signature · 1 line
2.21.1
PATCH 12/55 pci: New pci_new(), pci_realize_and_unref() etc.
In reply to Markus ArmbrusterI'm converting from qdev_create()/qdev_init_nofail() to qdev_new()/qdev_realize_and_unref(); recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains why.
PCI devices use qdev_create() through pci_create() and pci_create_multifunction().
Provide pci_new(), pci_new_multifunction(), and pci_realize_and_unref() for converting PCI devices.
--- include/hw/pci/pci.h | 5 +++++ hw/pci/pci.c | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+)
include/hw/pci/pci.h +5 -0
@@ -712,6 +712,11 @@ pci_get_quad_by_mask(uint8_t *config, uint64_t mask)return (val & mask) >>ctz32 (mask); } +PCIDevice *pci_new_multifunction (int devfn,bool multifunction, +const char *name); +PCIDevice *pci_new (int devfn,const char *name); +bool pci_realize_and_unref (PCIDevice *dev,PCIBus *bus,Error **errp); +PCIDevice *pci_create_multifunction (PCIBus *bus,int devfn,bool multifunction,const char *name); PCIDevice *pci_create_simple_multifunction(PCIBus *bus, int devfn,
hw/pci/pci.c +21 -0
@@ -2147,6 +2147,27 @@ static void pci_qdev_realize(DeviceState *qdev, Error **errp) } } +PCIDevice *pci_new_multifunction (int devfn,bool multifunction, +const char *name) +{ +DeviceState *dev; + + dev =qdev_new (name); +qdev_prop_set_int32 (dev,"addr" , devfn); +qdev_prop_set_bit (dev,"multifunction" , multifunction); +return PCI_DEVICE (dev); +} + +PCIDevice *pci_new (int devfn,const char *name) +{ +return pci_new_multifunction (devfn, false, name); +} + +bool pci_realize_and_unref (PCIDevice *dev,PCIBus *bus,Error **errp) +{ +return qdev_realize_and_unref (&dev->qdev, &bus->qbus, errp); +} +PCIDevice *pci_create_multifunction (PCIBus *bus,int devfn,bool multifunction,const char *name) {
Signature · 1 line
2.21.1
PATCH 13/55 hw/ppc: Eliminate two superfluous QOM casts
In reply to Markus Armbruster--- hw/ppc/mac_newworld.c | 4 ++-- hw/ppc/mac_oldworld.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
hw/ppc/mac_newworld.c +2 -2
@@ -122,7 +122,7 @@ static void ppc_core99_init(MachineState *machine)long kernel_size, initrd_size;UNINHostState *uninorth_pci;PCIBus *pci_bus; -NewWorldMacIOState *macio; +PCIDevice *macio;bool has_pmu, has_adb;MACIOIDEState *macio_ide;BusState *adb_bus;
@@ -375,7 +375,7 @@ static void ppc_core99_init(MachineState *machine) pci_bus =PCI_HOST_BRIDGE (uninorth_pci)->bus;/* MacIO */ - macio =NEWWORLD_MACIO (pci_create (pci_bus,-1 ,TYPE_NEWWORLD_MACIO )); + macio =pci_create (pci_bus,-1 ,TYPE_NEWWORLD_MACIO ); dev =DEVICE (macio);qdev_prop_set_uint64 (dev,"frequency" , tbfreq);qdev_prop_set_bit (dev,"has-pmu" , has_pmu);
hw/ppc/mac_oldworld.c +2 -2
@@ -94,7 +94,7 @@ static void ppc_heathrow_init(MachineState *machine)uint32_t kernel_base, initrd_base, cmdline_base =0 ;int32_t kernel_size, initrd_size;PCIBus *pci_bus; -OldWorldMacIOState *macio; +PCIDevice *macio;MACIOIDEState *macio_ide;SysBusDevice *s;DeviceState *dev, *pic_dev;
@@ -278,7 +278,7 @@ static void ppc_heathrow_init(MachineState *machine)ide_drive_get (hd,ARRAY_SIZE (hd));/* MacIO */ - macio =OLDWORLD_MACIO (pci_create (pci_bus,-1 ,TYPE_OLDWORLD_MACIO )); + macio =pci_create (pci_bus,-1 ,TYPE_OLDWORLD_MACIO ); dev =DEVICE (macio);qdev_prop_set_uint64 (dev,"frequency" , tbfreq); object_property_set_link(OBJECT(macio), OBJECT(pic_dev), "pic",
Signature · 1 line
2.21.1
Re: [PATCH 13/55] hw/ppc: Eliminate two superfluous QOM casts
Quoted 43 lines · Markus Armbruster
Signed-off-by Markus Armbruster <[email protected]>--- hw/ppc/mac_newworld.c | 4 ++-- hw/ppc/mac_oldworld.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)hw/ppc/mac_newworld.c +2
-2@@ -122,7 +122,7 @@ static void ppc_core99_init(MachineState *machine)long kernel_size, initrd_size;UNINHostState *uninorth_pci;PCIBus *pci_bus; -NewWorldMacIOState *macio; +PCIDevice *macio;bool has_pmu, has_adb;MACIOIDEState *macio_ide;BusState *adb_bus;@@ -375,7 +375,7 @@ static void ppc_core99_init(MachineState *machine) pci_bus =PCI_HOST_BRIDGE (uninorth_pci)->bus;/* MacIO */ - macio =NEWWORLD_MACIO (pci_create (pci_bus,-1 ,TYPE_NEWWORLD_MACIO )); + macio =pci_create (pci_bus,-1 ,TYPE_NEWWORLD_MACIO ); dev =DEVICE (macio);qdev_prop_set_uint64 (dev,"frequency" , tbfreq);qdev_prop_set_bit (dev,"has-pmu" , has_pmu);hw/ppc/mac_oldworld.c +1
-1@@ -94,7 +94,7 @@ static void ppc_heathrow_init(MachineState *machine)uint32_t kernel_base, initrd_base, cmdline_base =0 ;int32_t kernel_size, initrd_size;PCIBus *pci_bus; -OldWorldMacIOState *macio; +PCIDevice *macio;MACIOIDEState *macio_ide;SysBusDevice *s;DeviceState *dev, *pic_dev;
hw/ppc/mac_oldworld.c static void ppc_heathrow_init(MachineState *machine) · line 284
Quoted 8 lines
hw/ppc/mac_oldworld.c +1
-1@@ -278,7 +278,7 @@ static void ppc_heathrow_init(MachineState *machine)ide_drive_get (hd,ARRAY_SIZE (hd));/* MacIO */ - macio =OLDWORLD_MACIO (pci_create (pci_bus,-1 ,TYPE_OLDWORLD_MACIO )); + macio =pci_create (pci_bus,-1 ,TYPE_OLDWORLD_MACIO ); dev =DEVICE (macio);qdev_prop_set_uint64 (dev,"frequency" , tbfreq); object_property_set_link(OBJECT(macio), OBJECT(pic_dev), "pic",
PATCH 14/55 pci: Convert uses of pci_create() etc. with Coccinelle
In reply to Markus ArmbrusterReplace
dev = pci_create(bus, type_name);
...
qdev_init_nofail(dev);by
dev = pci_new(type_name);
...
pci_realize_and_unref(dev, bus, &error_fatal);and similarly for pci_create_multifunction().
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(pci_create(bus, args));
+ PCIDevice *pci_dev; // TODO move
+ pci_dev = pci_new(args);
+ dev = DEVICE(pci_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ pci_realize_and_unref(pci_dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create_multifunction(bus, args);
+ dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, expr;
expression list args;
identifier dev;
@@
- PCIDevice *dev = pci_create_multifunction(bus, args);
+ PCIDevice *dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create_multifunction(bus, args);
+ dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ pci_realize_and_unref(dev, bus, &error_fatal);Missing #include "qapi/error.h" added manually, whitespace changes minimized manually, @pci_dev declarations moved manually.
--- hw/acpi/piix4.c | 6 ++++-- hw/i386/pc_q35.c | 10 +++++----- hw/isa/vt82c686.c | 13 +++++++------ hw/mips/mips_fulong2e.c | 6 ++++-- hw/pci-bridge/dec.c | 6 +++--- hw/pci-host/bonito.c | 4 ++-- hw/pci-host/sabre.c | 13 +++++++------ hw/pci/pci.c | 8 ++++---- hw/ppc/mac_newworld.c | 4 ++-- hw/ppc/mac_oldworld.c | 4 ++-- hw/sparc64/sun4u.c | 8 ++++---- 11 files changed, 44 insertions(+), 38 deletions(-)
hw/acpi/piix4.c +4 -2
@@ -514,10 +514,12 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, qemu_irq sci_irq, qemu_irq smi_irq, int smm_enabled, DeviceState **piix4_pm) { + PCIDevice *pci_dev;DeviceState *dev;PIIX4PMState *s; - dev =DEVICE (pci_create (bus, devfn,TYPE_PIIX4_PM )); + pci_dev =pci_new (devfn,TYPE_PIIX4_PM ); + dev =DEVICE (pci_dev);qdev_prop_set_uint32 (dev,"smb_io_base" , smb_io_base);if (piix4_pm) { *piix4_pm = dev;
@@ -531,7 +533,7 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, s->use_acpi_pci_hotplug = false; } -qdev_init_nofail (dev); +pci_realize_and_unref (pci_dev, bus, &error_fatal);return s->smb.smbus; }
hw/i386/pc_q35.c +5 -5
@@ -98,16 +98,16 @@ static int ehci_create_ich9_with_companions(PCIBus *bus, int slot)return -1 ; } - ehci =pci_create_multifunction (bus,PCI_DEVFN (slot,7 ), true, name); -qdev_init_nofail (&ehci->qdev); + ehci =pci_new_multifunction (PCI_DEVFN (slot,7 ), true, name); +pci_realize_and_unref (ehci, bus, &error_fatal); usbbus =QLIST_FIRST (&ehci->qdev.child_bus);for (i =0 ; i <3 ; i++) { - uhci =pci_create_multifunction (bus,PCI_DEVFN (slot, comp[i].func), - true, comp[i].name); + uhci =pci_new_multifunction (PCI_DEVFN (slot, comp[i].func), true, + comp[i].name);qdev_prop_set_string (&uhci->qdev,"masterbus" , usbbus->name);qdev_prop_set_uint32 (&uhci->qdev,"firstport" , comp[i].port); -qdev_init_nofail (&uhci->qdev); +pci_realize_and_unref (uhci, bus, &error_fatal); }return 0 ; }
hw/isa/vt82c686.c +7 -6
@@ -23,6 +23,7 @@#include "hw/isa/apm.h" #include "hw/acpi/acpi.h" #include "hw/i2c/pm_smbus.h" +#include "qapi/error.h" #include "qemu/module.h" #include "qemu/timer.h" #include "exec/address-spaces.h"
@@ -276,8 +277,8 @@ void vt82c686b_ac97_init(PCIBus *bus, int devfn) {PCIDevice *dev; - dev =pci_create (bus, devfn,TYPE_VT82C686B_AC97_DEVICE ); -qdev_init_nofail (&dev->qdev); + dev =pci_new (devfn,TYPE_VT82C686B_AC97_DEVICE ); +pci_realize_and_unref (dev, bus, &error_fatal); }static void via_ac97_class_init (ObjectClass *klass,void *data)
@@ -320,8 +321,8 @@ void vt82c686b_mc97_init(PCIBus *bus, int devfn) {PCIDevice *dev; - dev =pci_create (bus, devfn,TYPE_VT82C686B_MC97_DEVICE ); -qdev_init_nofail (&dev->qdev); + dev =pci_new (devfn,TYPE_VT82C686B_MC97_DEVICE ); +pci_realize_and_unref (dev, bus, &error_fatal); }static void via_mc97_class_init (ObjectClass *klass,void *data)
@@ -388,12 +389,12 @@ I2CBus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,PCIDevice *dev;VT686PMState *s; - dev =pci_create (bus, devfn,TYPE_VT82C686B_PM_DEVICE ); + dev =pci_new (devfn,TYPE_VT82C686B_PM_DEVICE );qdev_prop_set_uint32 (&dev->qdev,"smb_io_base" , smb_io_base); s =VT82C686B_PM_DEVICE (dev); -qdev_init_nofail (&dev->qdev); +pci_realize_and_unref (dev, bus, &error_fatal);return s->smb.smbus; }
hw/mips/mips_fulong2e.c +4 -2
@@ -298,6 +298,7 @@ static void mips_fulong2e_init(MachineState *machine)long bios_size;uint8_t *spd_data;int64_t kernel_entry; +PCIDevice *pci_dev;PCIBus *pci_bus;ISABus *isa_bus;I2CBus *smbus;
@@ -369,10 +370,11 @@ static void mips_fulong2e_init(MachineState *machine)/* GPU */ if (vga_interface_type !=VGA_NONE ) { - dev =DEVICE (pci_create (pci_bus,-1 ,"ati-vga" )); + pci_dev =pci_new (-1 ,"ati-vga" ); + dev =DEVICE (pci_dev);qdev_prop_set_uint32 (dev,"vgamem_mb" ,16 );qdev_prop_set_uint16 (dev,"x-device-id" ,0x5159 ); -qdev_init_nofail (dev); +pci_realize_and_unref (pci_dev, pci_bus, &error_fatal); }/* Populate SPD eeprom data */
hw/pci-bridge/dec.c +3 -3
@@ -26,6 +26,7 @@#include "qemu/osdep.h" #include "dec.h" #include "hw/sysbus.h" +#include "qapi/error.h" #include "qemu/module.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h"
@@ -91,11 +92,10 @@ PCIBus *pci_dec_21154_init(PCIBus *parent_bus, int devfn)PCIDevice *dev;PCIBridge *br; - dev =pci_create_multifunction (parent_bus, devfn, false, -"dec-21154-p2p-bridge" ); + dev =pci_new_multifunction (devfn, false,"dec-21154-p2p-bridge" ); br =PCI_BRIDGE (dev);pci_bridge_map_irq (br,"DEC 21154 PCI-PCI bridge" , dec_map_irq); -qdev_init_nofail (&dev->qdev); +pci_realize_and_unref (dev, parent_bus, &error_fatal);return pci_bridge_get_sec_bus (br); }
hw/pci-host/bonito.c +2 -2
@@ -695,11 +695,11 @@ PCIBus *bonito_init(qemu_irq *pic) pcihost->pic = pic;qdev_realize_and_unref (dev,NULL , &error_fatal); - d =pci_create (phb->bus,PCI_DEVFN (0 ,0 ),TYPE_PCI_BONITO ); + d =pci_new (PCI_DEVFN (0 ,0 ),TYPE_PCI_BONITO ); s =PCI_BONITO (d); s->pcihost = pcihost; pcihost->pci_dev = s; -qdev_init_nofail (DEVICE (d)); +pci_realize_and_unref (d, phb->bus, &error_fatal);return phb->bus; }
hw/pci-host/sabre.c +7 -6
@@ -35,6 +35,7 @@#include "hw/pci-bridge/simba.h" #include "hw/pci-host/sabre.h" #include "exec/address-spaces.h" +#include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" #include "sysemu/runstate.h"
@@ -405,17 +406,17 @@ static void sabre_realize(DeviceState *dev, Error **errp)pci_setup_iommu (phb->bus, sabre_pci_dma_iommu, s->iommu);/* APB secondary busses */ - pci_dev =pci_create_multifunction (phb->bus,PCI_DEVFN (1 ,0 ), true, -TYPE_SIMBA_PCI_BRIDGE ); + pci_dev =pci_new_multifunction (PCI_DEVFN (1 ,0 ), true, +TYPE_SIMBA_PCI_BRIDGE ); s->bridgeB =PCI_BRIDGE (pci_dev);pci_bridge_map_irq (s->bridgeB,"pciB" , pci_simbaB_map_irq); -qdev_init_nofail (&pci_dev->qdev); +pci_realize_and_unref (pci_dev, phb->bus, &error_fatal); - pci_dev =pci_create_multifunction (phb->bus,PCI_DEVFN (1 ,1 ), true, -TYPE_SIMBA_PCI_BRIDGE ); + pci_dev =pci_new_multifunction (PCI_DEVFN (1 ,1 ), true, +TYPE_SIMBA_PCI_BRIDGE ); s->bridgeA =PCI_BRIDGE (pci_dev);pci_bridge_map_irq (s->bridgeA,"pciA" , pci_simbaA_map_irq); -qdev_init_nofail (&pci_dev->qdev); +pci_realize_and_unref (pci_dev, phb->bus, &error_fatal); }static void sabre_init (Object *obj)
hw/pci/pci.c +4 -4
@@ -1937,10 +1937,10 @@ PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus,exit (1 ); } - pci_dev =pci_create (bus, devfn, nd->model); + pci_dev =pci_new (devfn, nd->model); dev = &pci_dev->qdev;qdev_set_nic_properties (dev, nd); -qdev_init_nofail (dev); +pci_realize_and_unref (pci_dev, bus, &error_fatal);g_ptr_array_free (pci_nic_models, true);return pci_dev; }
@@ -2183,8 +2183,8 @@ PCIDevice *pci_create_simple_multifunction(PCIBus *bus, int devfn,bool multifunction, const char *name) { - PCIDevice *dev = pci_create_multifunction(bus, devfn, multifunction, name); -qdev_init_nofail (&dev->qdev); + PCIDevice *dev = pci_new_multifunction(devfn, multifunction, name); +pci_realize_and_unref (dev, bus, &error_fatal);return dev; }
hw/ppc/mac_newworld.c +2 -2
@@ -375,14 +375,14 @@ static void ppc_core99_init(MachineState *machine) pci_bus =PCI_HOST_BRIDGE (uninorth_pci)->bus;/* MacIO */ - macio =pci_create (pci_bus,-1 ,TYPE_NEWWORLD_MACIO ); + macio =pci_new (-1 ,TYPE_NEWWORLD_MACIO ); dev =DEVICE (macio);qdev_prop_set_uint64 (dev,"frequency" , tbfreq);qdev_prop_set_bit (dev,"has-pmu" , has_pmu);qdev_prop_set_bit (dev,"has-adb" , has_adb);object_property_set_link (OBJECT (macio),OBJECT (pic_dev),"pic" , &error_abort); -qdev_init_nofail (dev); +pci_realize_and_unref (macio, pci_bus, &error_fatal);/* We only emulate 2 out of 3 IDE controllers for now */ ide_drive_get (hd,ARRAY_SIZE (hd));
hw/ppc/mac_oldworld.c +2 -2
@@ -278,12 +278,12 @@ static void ppc_heathrow_init(MachineState *machine)ide_drive_get (hd,ARRAY_SIZE (hd));/* MacIO */ - macio =pci_create (pci_bus,-1 ,TYPE_OLDWORLD_MACIO ); + macio =pci_new (-1 ,TYPE_OLDWORLD_MACIO ); dev =DEVICE (macio);qdev_prop_set_uint64 (dev,"frequency" , tbfreq);object_property_set_link (OBJECT (macio),OBJECT (pic_dev),"pic" , &error_abort); -qdev_init_nofail (dev); +pci_realize_and_unref (macio, pci_bus, &error_fatal); macio_ide =MACIO_IDE (object_resolve_path_component (OBJECT (macio),"ide[0]" ));
hw/sparc64/sun4u.c +4 -4
@@ -605,10 +605,10 @@ static void sun4uv_init(MemoryRegion *address_space_mem, pci_busA->slot_reserved_mask =0xfffffff1 ; pci_busB->slot_reserved_mask =0xfffffff0 ; - ebus =pci_create_multifunction (pci_busA,PCI_DEVFN (1 ,0 ), true,TYPE_EBUS ); + ebus =pci_new_multifunction (PCI_DEVFN (1 ,0 ), true,TYPE_EBUS );qdev_prop_set_uint64 (DEVICE (ebus),"console-serial-base" , hwdef->console_serial_base); -qdev_init_nofail (DEVICE (ebus)); +pci_realize_and_unref (ebus, pci_busA, &error_fatal);/* Wire up "well-known" ISA IRQs to PBM legacy obio IRQs */ qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", 7,
@@ -661,9 +661,9 @@ static void sun4uv_init(MemoryRegion *address_space_mem,qemu_macaddr_default_if_unset (&macaddr); } - pci_dev =pci_create (pci_busA,PCI_DEVFN (3 ,0 ),"cmd646-ide" ); + pci_dev =pci_new (PCI_DEVFN (3 ,0 ),"cmd646-ide" );qdev_prop_set_uint32 (&pci_dev->qdev,"secondary" ,1 ); -qdev_init_nofail (&pci_dev->qdev); +pci_realize_and_unref (pci_dev, pci_busA, &error_fatal);pci_ide_create_devs (pci_dev);/* Map NVRAM into I/O (ebus) space */
Signature · 1 line
2.21.1
PATCH 15/55 pci: Convert uses of pci_create() etc. manually
In reply to Markus ArmbrusterSame transformation as in the previous commit. Manual, because convincing Coccinelle to transform these cases is not worthwhile.
--- hw/sparc64/sun4u.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
hw/sparc64/sun4u.c +8 -4
@@ -635,24 +635,28 @@ static void sun4uv_init(MemoryRegion *address_space_mem,memset (&macaddr,0 ,sizeof (MACAddr)); onboard_nic = false;for (i =0 ; i < nb_nics; i++) { +PCIBus *bus; nd = &nd_table[i];if (!nd->model ||strcmp (nd->model,"sunhme" ) ==0 ) {if (!onboard_nic) { - pci_dev =pci_create_multifunction (pci_busA,PCI_DEVFN (1 ,1 ), + pci_dev =pci_new_multifunction (PCI_DEVFN (1 ,1 ), true,"sunhme" ); + bus = pci_busA;memcpy (&macaddr, &nd->macaddr.a,sizeof (MACAddr)); onboard_nic = true; }else { - pci_dev =pci_create (pci_busB,-1 ,"sunhme" ); + pci_dev =pci_new (-1 ,"sunhme" ); + bus = pci_busB; } }else { - pci_dev =pci_create (pci_busB,-1 , nd->model); + pci_dev =pci_new (-1 , nd->model); + bus = pci_busB; } dev = &pci_dev->qdev;qdev_set_nic_properties (dev, nd); -qdev_init_nofail (dev); +pci_realize_and_unref (pci_dev, bus, &error_fatal); }/* If we don't have an onboard NIC, grab a default MAC address so that
Signature · 1 line
2.21.1
PATCH 16/55 pci: pci_create(), pci_create_multifunction() are now unused, drop
In reply to Markus Armbruster--- include/hw/pci/pci.h | 3 --- hw/pci/pci.c | 16 ---------------- 2 files changed, 19 deletions(-)
include/hw/pci/pci.h +0 -3
@@ -717,12 +717,9 @@ PCIDevice *pci_new_multifunction(int devfn, bool multifunction,PCIDevice *pci_new (int devfn,const char *name);bool pci_realize_and_unref (PCIDevice *dev,PCIBus *bus,Error **errp); -PCIDevice *pci_create_multifunction (PCIBus *bus,int devfn,bool multifunction, -const char *name);PCIDevice *pci_create_simple_multifunction (PCIBus *bus,int devfn,bool multifunction,const char *name); -PCIDevice *pci_create (PCIBus *bus,int devfn,const char *name);PCIDevice *pci_create_simple (PCIBus *bus,int devfn,const char *name);void lsi53c8xx_handle_legacy_cmdline (DeviceState *lsi_dev);
hw/pci/pci.c +0 -16
@@ -2168,17 +2168,6 @@ bool pci_realize_and_unref(PCIDevice *dev, PCIBus *bus, Error **errp)return qdev_realize_and_unref (&dev->qdev, &bus->qbus, errp); } -PCIDevice *pci_create_multifunction (PCIBus *bus,int devfn,bool multifunction, -const char *name) -{ -DeviceState *dev; - - dev =qdev_create (&bus->qbus, name); -qdev_prop_set_int32 (dev,"addr" , devfn); -qdev_prop_set_bit (dev,"multifunction" , multifunction); -return PCI_DEVICE (dev); -} -PCIDevice *pci_create_simple_multifunction (PCIBus *bus,int devfn,bool multifunction,const char *name)
@@ -2188,11 +2177,6 @@ PCIDevice *pci_create_simple_multifunction(PCIBus *bus, int devfn,return dev; } -PCIDevice *pci_create (PCIBus *bus,int devfn,const char *name) -{ -return pci_create_multifunction (bus, devfn, false, name); -} -PCIDevice *pci_create_simple (PCIBus *bus,int devfn,const char *name) {return pci_create_simple_multifunction (bus, devfn, false, name);
Signature · 1 line
2.21.1
PATCH 17/55 isa: New isa_new(), isa_realize_and_unref() etc.
In reply to Markus ArmbrusterI'm converting from qdev_create()/qdev_init_nofail() to qdev_new()/qdev_realize_and_unref(); recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains why.
ISA devices use qdev_create() through isa_create() and isa_try_create().
Provide isa_new(), isa_try_new(), and isa_realize_and_unref() for converting ISA devices.
--- include/hw/isa/isa.h | 3 +++ hw/isa/isa-bus.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+)
include/hw/isa/isa.h +3 -0
@@ -105,6 +105,9 @@ MemoryRegion *isa_address_space(ISADevice *dev);MemoryRegion *isa_address_space_io (ISADevice *dev);ISADevice *isa_create (ISABus *bus,const char *name);ISADevice *isa_try_create (ISABus *bus,const char *name); +ISADevice *isa_new (const char *name); +ISADevice *isa_try_new (const char *name); +bool isa_realize_and_unref (ISADevice *dev,ISABus *bus,Error **errp);ISADevice *isa_create_simple (ISABus *bus,const char *name);ISADevice *isa_vga_init (ISABus *bus);
hw/isa/isa-bus.c +15 -0
@@ -176,6 +176,16 @@ ISADevice *isa_try_create(ISABus *bus, const char *name)return ISA_DEVICE (dev); } +ISADevice *isa_new (const char *name) +{ +return ISA_DEVICE (qdev_new (name)); +} + +ISADevice *isa_try_new (const char *name) +{ +return ISA_DEVICE (qdev_try_new (name)); +} +ISADevice *isa_create_simple (ISABus *bus,const char *name) {ISADevice *dev;
@@ -185,6 +195,11 @@ ISADevice *isa_create_simple(ISABus *bus, const char *name)return dev; } +bool isa_realize_and_unref (ISADevice *dev,ISABus *bus,Error **errp) +{ +return qdev_realize_and_unref (&dev->parent_obj, &bus->parent_obj, errp); +} +ISADevice *isa_vga_init (ISABus *bus) {switch (vga_interface_type) {
Signature · 1 line
2.21.1
PATCH 18/55 isa: Convert uses of isa_create() with Coccinelle
In reply to Markus ArmbrusterReplace
dev = isa_create(bus, type_name);
...
qdev_init_nofail(dev);by
dev = isa_new(type_name);
...
isa_realize_and_unref(dev, bus, &error_fatal);Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = isa_create(bus, args);
+ dev = isa_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ isa_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(isa_create(bus, args));
+ ISADevice *isa_dev; // TODO move
+ isa_dev = isa_new(args);
+ dev = DEVICE(isa_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ isa_realize_and_unref(isa_dev, bus, &error_fatal);Missing #include "qapi/error.h" added manually, whitespace changes minimized manually.
--- include/hw/audio/pcspk.h | 5 +++-- include/hw/timer/i8254.h | 9 +++++---- hw/char/parallel-isa.c | 5 +++-- hw/char/serial-isa.c | 4 ++-- hw/dma/i8257.c | 9 +++++---- hw/ide/isa.c | 5 +++-- hw/intc/i8259_common.c | 5 +++-- hw/isa/isa-bus.c | 4 ++-- hw/isa/isa-superio.c | 20 ++++++++++---------- hw/ppc/prep.c | 26 ++++++++++++++++---------- hw/rtc/m48t59-isa.c | 7 +++++-- hw/rtc/mc146818rtc.c | 4 ++-- hw/sparc64/sun4u.c | 6 ++++-- 13 files changed, 63 insertions(+), 46 deletions(-)
include/hw/audio/pcspk.h +3 -2
@@ -27,6 +27,7 @@#include "hw/isa/isa.h" #include "hw/qdev-properties.h" +#include "qapi/error.h" #define TYPE_PC_SPEAKER "isa-pcspk"
@@ -35,11 +36,11 @@ static inline ISADevice *pcspk_init(ISABus *bus, ISADevice *pit)DeviceState *dev;ISADevice *isadev; - isadev =isa_create (bus,TYPE_PC_SPEAKER ); + isadev =isa_new (TYPE_PC_SPEAKER ); dev =DEVICE (isadev);qdev_prop_set_uint32 (dev,"iobase" ,0x61 );object_property_set_link (OBJECT (dev),OBJECT (pit),"pit" ,NULL ); -qdev_init_nofail (dev); +isa_realize_and_unref (isadev, bus, &error_fatal);return isadev; }
include/hw/timer/i8254.h +5 -4
@@ -27,6 +27,7 @@#include "hw/qdev-properties.h" #include "hw/isa/isa.h" +#include "qapi/error.h" #define PIT_FREQ 1193182
@@ -54,10 +55,10 @@ static inline ISADevice *i8254_pit_init(ISABus *bus, int base, int isa_irq,DeviceState *dev;ISADevice *d; - d =isa_create (bus,TYPE_I8254 ); + d =isa_new (TYPE_I8254 ); dev =DEVICE (d);qdev_prop_set_uint32 (dev,"iobase" , base); -qdev_init_nofail (dev); +isa_realize_and_unref (d, bus, &error_fatal);qdev_connect_gpio_out (dev,0 , isa_irq >=0 ?isa_get_irq (d, isa_irq) : alt_irq);
@@ -69,10 +70,10 @@ static inline ISADevice *kvm_pit_init(ISABus *bus, int base)DeviceState *dev;ISADevice *d; - d =isa_create (bus,TYPE_KVM_I8254 ); + d =isa_new (TYPE_KVM_I8254 ); dev =DEVICE (d);qdev_prop_set_uint32 (dev,"iobase" , base); -qdev_init_nofail (dev); +isa_realize_and_unref (d, bus, &error_fatal);return d; }
hw/char/parallel-isa.c +3 -2
@@ -14,17 +14,18 @@#include "hw/isa/isa.h" #include "hw/qdev-properties.h" #include "hw/char/parallel.h" +#include "qapi/error.h" static void parallel_init (ISABus *bus,int index,Chardev *chr) {DeviceState *dev;ISADevice *isadev; - isadev =isa_create (bus,"isa-parallel" ); + isadev =isa_new ("isa-parallel" ); dev =DEVICE (isadev);qdev_prop_set_uint32 (dev,"index" , index);qdev_prop_set_chr (dev,"chardev" , chr); -qdev_init_nofail (dev); +isa_realize_and_unref (isadev, bus, &error_fatal); }void parallel_hds_isa_init (ISABus *bus,int n)
hw/char/serial-isa.c +2 -2
@@ -138,11 +138,11 @@ static void serial_isa_init(ISABus *bus, int index, Chardev *chr)DeviceState *dev;ISADevice *isadev; - isadev =isa_create (bus,TYPE_ISA_SERIAL ); + isadev =isa_new (TYPE_ISA_SERIAL ); dev =DEVICE (isadev);qdev_prop_set_uint32 (dev,"index" , index);qdev_prop_set_chr (dev,"chardev" , chr); -qdev_init_nofail (dev); +isa_realize_and_unref (isadev, bus, &error_fatal); }void serial_hds_isa_init (ISABus *bus,int from,int to)
hw/dma/i8257.c +5 -4
@@ -27,6 +27,7 @@#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/dma/i8257.h" +#include "qapi/error.h" #include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/log.h"
@@ -638,21 +639,21 @@ void i8257_dma_init(ISABus *bus, bool high_page_enable)ISADevice *isa1, *isa2;DeviceState *d; - isa1 =isa_create (bus,TYPE_I8257 ); + isa1 =isa_new (TYPE_I8257 ); d =DEVICE (isa1);qdev_prop_set_int32 (d,"base" ,0x00 );qdev_prop_set_int32 (d,"page-base" ,0x80 );qdev_prop_set_int32 (d,"pageh-base" , high_page_enable ?0x480 :-1 );qdev_prop_set_int32 (d,"dshift" ,0 ); -qdev_init_nofail (d); +isa_realize_and_unref (isa1, bus, &error_fatal); - isa2 =isa_create (bus,TYPE_I8257 ); + isa2 =isa_new (TYPE_I8257 ); d =DEVICE (isa2);qdev_prop_set_int32 (d,"base" ,0xc0 );qdev_prop_set_int32 (d,"page-base" ,0x88 );qdev_prop_set_int32 (d,"pageh-base" , high_page_enable ?0x488 :-1 );qdev_prop_set_int32 (d,"dshift" ,1 ); -qdev_init_nofail (d); +isa_realize_and_unref (isa2, bus, &error_fatal);isa_bus_dma (bus,ISADMA (isa1),ISADMA (isa2)); }
hw/ide/isa.c +3 -2
@@ -27,6 +27,7 @@#include "hw/isa/isa.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" +#include "qapi/error.h" #include "qemu/module.h" #include "sysemu/dma.h"
@@ -86,12 +87,12 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq,ISADevice *isadev;ISAIDEState *s; - isadev =isa_create (bus,TYPE_ISA_IDE ); + isadev =isa_new (TYPE_ISA_IDE ); dev =DEVICE (isadev);qdev_prop_set_uint32 (dev,"iobase" , iobase);qdev_prop_set_uint32 (dev,"iobase2" , iobase2);qdev_prop_set_uint32 (dev,"irq" , isairq); -qdev_init_nofail (dev); +isa_realize_and_unref (isadev, bus, &error_fatal); s =ISA_IDE (dev);if (hd0) {
hw/intc/i8259_common.c +3 -2
@@ -29,6 +29,7 @@#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "monitor/monitor.h" +#include "qapi/error.h" static int irq_level[16 ];static uint64_t irq_count[16 ];
@@ -94,13 +95,13 @@ ISADevice *i8259_init_chip(const char *name, ISABus *bus, bool master)DeviceState *dev;ISADevice *isadev; - isadev =isa_create (bus, name); + isadev =isa_new (name); dev =DEVICE (isadev);qdev_prop_set_uint32 (dev,"iobase" , master ?0x20 :0xa0 );qdev_prop_set_uint32 (dev,"elcr_addr" , master ?0x4d0 :0x4d1 );qdev_prop_set_uint8 (dev,"elcr_mask" , master ?0xf8 :0xde );qdev_prop_set_bit (dev,"master" , master); -qdev_init_nofail (dev); +isa_realize_and_unref (isadev, bus, &error_fatal);return isadev; }
hw/isa/isa-bus.c +2 -2
@@ -190,8 +190,8 @@ ISADevice *isa_create_simple(ISABus *bus, const char *name) {ISADevice *dev; - dev =isa_create (bus, name); -qdev_init_nofail (DEVICE (dev)); + dev =isa_new (name); +isa_realize_and_unref (dev, bus, &error_fatal);return dev; }
hw/isa/isa-superio.c +10 -10
@@ -51,7 +51,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp) }else { name =g_strdup_printf ("parallel%d" , i); } - isa =isa_create (bus,"isa-parallel" ); + isa =isa_new ("isa-parallel" ); d =DEVICE (isa);qdev_prop_set_uint32 (d,"index" , i);if (k->parallel.get_iobase) {
@@ -63,7 +63,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp) }qdev_prop_set_chr (d,"chardev" , chr);object_property_add_child (OBJECT (dev), name,OBJECT (isa)); -qdev_init_nofail (d); +isa_realize_and_unref (isa, bus, &error_fatal); sio->parallel[i] = isa; trace_superio_create_parallel(i, k->parallel.get_iobase ?
@@ -90,7 +90,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp) }else { name =g_strdup_printf ("serial%d" , i); } - isa =isa_create (bus,TYPE_ISA_SERIAL ); + isa =isa_new (TYPE_ISA_SERIAL ); d =DEVICE (isa);qdev_prop_set_uint32 (d,"index" , i);if (k->serial.get_iobase) {
@@ -102,7 +102,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp) }qdev_prop_set_chr (d,"chardev" , chr);object_property_add_child (OBJECT (dev), name,OBJECT (isa)); -qdev_init_nofail (d); +isa_realize_and_unref (isa, bus, &error_fatal); sio->serial[i] = isa; trace_superio_create_serial(i, k->serial.get_iobase ?
@@ -115,7 +115,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp)/* Floppy disc */ if (!k->floppy.is_enabled || k->floppy.is_enabled (sio,0 )) { - isa =isa_create (bus,"isa-fdc" ); + isa =isa_new ("isa-fdc" ); d =DEVICE (isa);if (k->floppy.get_iobase) {qdev_prop_set_uint32 (d,"iobase" , k->floppy.get_iobase (sio,0 ));
@@ -136,7 +136,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp) &error_fatal); }object_property_add_child (OBJECT (sio),"isa-fdc" ,OBJECT (isa)); -qdev_init_nofail (d); +isa_realize_and_unref (isa, bus, &error_fatal); sio->floppy = isa; trace_superio_create_floppy(0, k->floppy.get_iobase ?
@@ -146,14 +146,14 @@ static void isa_superio_realize(DeviceState *dev, Error **errp) }/* Keyboard, mouse */ - isa =isa_create (bus,TYPE_I8042 ); + isa =isa_new (TYPE_I8042 );object_property_add_child (OBJECT (sio),TYPE_I8042 ,OBJECT (isa)); -qdev_init_nofail (DEVICE (isa)); +isa_realize_and_unref (isa, bus, &error_fatal); sio->kbc = isa;/* IDE */ if (k->ide.count && (!k->ide.is_enabled || k->ide.is_enabled (sio,0 ))) { - isa =isa_create (bus,"isa-ide" ); + isa =isa_new ("isa-ide" ); d =DEVICE (isa);if (k->ide.get_iobase) {qdev_prop_set_uint32 (d,"iobase" , k->ide.get_iobase (sio,0 ));
@@ -164,7 +164,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp)if (k->ide.get_irq) {qdev_prop_set_uint32 (d,"irq" , k->ide.get_irq (sio,0 )); } -qdev_init_nofail (d); +isa_realize_and_unref (isa, bus, &error_fatal);object_property_add_child (OBJECT (sio),"isa-ide" ,OBJECT (isa)); sio->ide = isa; trace_superio_create_ide(0,
hw/ppc/prep.c +16 -10
@@ -244,6 +244,7 @@ static void ibm_40p_init(MachineState *machine)SysBusDevice *pcihost, *s;Nvram *m48t59 =NULL ;PCIBus *pci_bus; +ISADevice *isa_dev;ISABus *isa_bus;void *fw_cfg;int i;
@@ -292,14 +293,16 @@ static void ibm_40p_init(MachineState *machine) isa_bus =ISA_BUS (qdev_get_child_bus (i82378_dev,"isa.0" ));/* Memory controller */ - dev =DEVICE (isa_create (isa_bus,"rs6000-mc" )); + isa_dev =isa_new ("rs6000-mc" ); + dev =DEVICE (isa_dev);qdev_prop_set_uint32 (dev,"ram-size" , machine->ram_size); -qdev_init_nofail (dev); +isa_realize_and_unref (isa_dev, isa_bus, &error_fatal);/* RTC */ - dev =DEVICE (isa_create (isa_bus,TYPE_MC146818_RTC )); + isa_dev =isa_new (TYPE_MC146818_RTC ); + dev =DEVICE (isa_dev);qdev_prop_set_int32 (dev,"base_year" ,1900 ); -qdev_init_nofail (dev); +isa_realize_and_unref (isa_dev, isa_bus, &error_fatal);/* initialize CMOS checksums */ cmos_checksum =0x6aa9 ;
@@ -310,19 +313,22 @@ static void ibm_40p_init(MachineState *machine)if (defaults_enabled ()) { m48t59 =NVRAM (isa_create_simple (isa_bus,"isa-m48t59" )); - dev =DEVICE (isa_create (isa_bus,"cs4231a" )); + isa_dev =isa_new ("cs4231a" ); + dev =DEVICE (isa_dev);qdev_prop_set_uint32 (dev,"iobase" ,0x830 );qdev_prop_set_uint32 (dev,"irq" ,10 ); -qdev_init_nofail (dev); +isa_realize_and_unref (isa_dev, isa_bus, &error_fatal); - dev =DEVICE (isa_create (isa_bus,"pc87312" )); + isa_dev =isa_new ("pc87312" ); + dev =DEVICE (isa_dev);qdev_prop_set_uint32 (dev,"config" ,12 ); -qdev_init_nofail (dev); +isa_realize_and_unref (isa_dev, isa_bus, &error_fatal); - dev =DEVICE (isa_create (isa_bus,"prep-systemio" )); + isa_dev =isa_new ("prep-systemio" ); + dev =DEVICE (isa_dev);qdev_prop_set_uint32 (dev,"ibm-planar-id" ,0xfc );qdev_prop_set_uint32 (dev,"equipment" ,0xc0 ); -qdev_init_nofail (dev); +isa_realize_and_unref (isa_dev, isa_bus, &error_fatal); dev =DEVICE (pci_create_simple (pci_bus,PCI_DEVFN (1 ,0 ),"lsi53c810" ));
hw/rtc/m48t59-isa.c +5 -2
@@ -28,6 +28,7 @@#include "hw/qdev-properties.h" #include "hw/rtc/m48t59.h" #include "m48t59-internal.h" +#include "qapi/error.h" #include "qemu/module.h" #define TYPE_M48TXX_ISA "isa-m48txx"
@@ -70,10 +71,12 @@ Nvram *m48t59_init_isa(ISABus *bus, uint32_t io_base, uint16_t size,continue ; } - dev =DEVICE (isa_create (bus, m48txx_isa_info[i].bus_name)); +ISADevice *isa_dev;// TODO move + isa_dev =isa_new (m48txx_isa_info[i].bus_name); + dev =DEVICE (isa_dev);qdev_prop_set_uint32 (dev,"iobase" , io_base);qdev_prop_set_int32 (dev,"base-year" , base_year); -qdev_init_nofail (dev); +isa_realize_and_unref (isa_dev, bus, &error_fatal);return NVRAM (dev); }
hw/rtc/mc146818rtc.c +2 -2
@@ -973,10 +973,10 @@ ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq)DeviceState *dev;ISADevice *isadev; - isadev =isa_create (bus,TYPE_MC146818_RTC ); + isadev =isa_new (TYPE_MC146818_RTC ); dev =DEVICE (isadev);qdev_prop_set_int32 (dev,"base_year" , base_year); -qdev_init_nofail (dev); +isa_realize_and_unref (isadev, bus, &error_fatal);if (intercept_irq) {qdev_connect_gpio_out (dev,0 , intercept_irq); }else {
hw/sparc64/sun4u.c +4 -2
@@ -338,7 +338,9 @@ static void ebus_realize(PCIDevice *pci_dev, Error **errp)for (i =0 ; i <MAX_FD ; i++) { fd[i] =drive_get (IF_FLOPPY ,0 , i); } - dev =DEVICE (isa_create (s->isa_bus,TYPE_ISA_FDC )); +ISADevice *isa_dev;// TODO move + isa_dev =isa_new (TYPE_ISA_FDC ); + dev =DEVICE (isa_dev);if (fd[0 ]) {qdev_prop_set_drive (dev,"driveA" ,blk_by_legacy_dinfo (fd[0 ]), &error_abort);
@@ -348,7 +350,7 @@ static void ebus_realize(PCIDevice *pci_dev, Error **errp) &error_abort); }qdev_prop_set_uint32 (dev,"dma" ,-1 ); -qdev_init_nofail (dev); +isa_realize_and_unref (isa_dev, s->isa_bus, &error_fatal);/* Power */ dev =qdev_new (TYPE_SUN4U_POWER );
Signature · 1 line
2.21.1
PATCH 19/55 isa: Convert uses of isa_create(), isa_try_create() manually
In reply to Markus ArmbrusterSame transformation as in the previous commit. Manual, because convincing Coccinelle to transform these cases is not worthwhile.
--- include/hw/net/ne2000-isa.h | 5 +++-- hw/block/fdc.c | 4 ++-- hw/i386/pc.c | 4 ++-- hw/ppc/pnv.c | 9 ++++----- 4 files changed, 11 insertions(+), 11 deletions(-)
include/hw/net/ne2000-isa.h +3 -2
@@ -13,6 +13,7 @@#include "hw/isa/isa.h" #include "hw/qdev-properties.h" #include "net/net.h" +#include "qapi/error.h" #define TYPE_ISA_NE2000 "ne2k_isa"
@@ -23,14 +24,14 @@ static inline ISADevice *isa_ne2000_init(ISABus *bus, int base, int irq,qemu_check_nic_model (nd,"ne2k_isa" ); - d =isa_try_create (bus,TYPE_ISA_NE2000 ); + d =isa_try_new (TYPE_ISA_NE2000 );if (d) {DeviceState *dev =DEVICE (d);qdev_prop_set_uint32 (dev,"iobase" , base);qdev_prop_set_uint32 (dev,"irq" , irq);qdev_set_nic_properties (dev, nd); -qdev_init_nofail (dev); +isa_realize_and_unref (d, bus, &error_fatal); }return d; }
hw/block/fdc.c +2 -2
@@ -2546,7 +2546,7 @@ ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **fds)DeviceState *dev;ISADevice *isadev; - isadev =isa_try_create (bus,TYPE_ISA_FDC ); + isadev =isa_try_new (TYPE_ISA_FDC );if (!isadev) {return NULL ; }
@@ -2560,7 +2560,7 @@ ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **fds)qdev_prop_set_drive (dev,"driveB" ,blk_by_legacy_dinfo (fds[1 ]), &error_fatal); } -qdev_init_nofail (dev); +isa_realize_and_unref (isadev, bus, &error_fatal);return isadev; }
hw/i386/pc.c +2 -2
@@ -1157,14 +1157,14 @@ static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl, bool no_vmport) i8042 =isa_create_simple (isa_bus,"i8042" );if (!no_vmport) {isa_create_simple (isa_bus,TYPE_VMPORT ); - vmmouse =isa_try_create (isa_bus,"vmmouse" ); + vmmouse =isa_try_new ("vmmouse" ); }else { vmmouse =NULL ; }if (vmmouse) {object_property_set_link (OBJECT (vmmouse),OBJECT (i8042),"i8042" , &error_abort); -qdev_init_nofail (DEVICE (vmmouse)); +isa_realize_and_unref (vmmouse, isa_bus, &error_fatal); } port92 =isa_create_simple (isa_bus,TYPE_PORT92 );
hw/ppc/pnv.c +4 -5
@@ -694,12 +694,11 @@ static bool pnv_match_cpu(const char *default_type, const char *cpu_type)static void pnv_ipmi_bt_init (ISABus *bus,IPMIBmc *bmc,uint32_t irq) { -Object *obj; +ISADevice *dev =isa_new ("isa-ipmi-bt" ); - obj =OBJECT (isa_create (bus,"isa-ipmi-bt" )); -object_property_set_link (obj,OBJECT (bmc),"bmc" , &error_fatal); -object_property_set_int (obj, irq,"irq" , &error_fatal); -object_property_set_bool (obj, true,"realized" , &error_fatal); +object_property_set_link (OBJECT (dev),OBJECT (bmc),"bmc" , &error_fatal); +object_property_set_int (OBJECT (dev), irq,"irq" , &error_fatal); +isa_realize_and_unref (dev, bus, &error_fatal); }static void pnv_chip_power10_pic_print_info (PnvChip *chip,Monitor *mon)
Signature · 1 line
2.21.1
PATCH 20/55 isa: isa_create(), isa_try_create() are now unused, drop
In reply to Markus Armbruster--- include/hw/isa/isa.h | 2 -- hw/isa/isa-bus.c | 16 ---------------- 2 files changed, 18 deletions(-)
include/hw/isa/isa.h +0 -2
@@ -103,8 +103,6 @@ void isa_bus_dma(ISABus *bus, IsaDma *dma8, IsaDma *dma16);IsaDma *isa_get_dma (ISABus *bus,int nchan);MemoryRegion *isa_address_space (ISADevice *dev);MemoryRegion *isa_address_space_io (ISADevice *dev); -ISADevice *isa_create (ISABus *bus,const char *name); -ISADevice *isa_try_create (ISABus *bus,const char *name);ISADevice *isa_new (const char *name);ISADevice *isa_try_new (const char *name);bool isa_realize_and_unref (ISADevice *dev,ISABus *bus,Error **errp);
hw/isa/isa-bus.c +0 -16
@@ -160,22 +160,6 @@ static void isa_device_init(Object *obj) dev->isairq[1 ] =-1 ; } -ISADevice *isa_create (ISABus *bus,const char *name) -{ -DeviceState *dev; - - dev =qdev_create (BUS (bus), name); -return ISA_DEVICE (dev); -} - -ISADevice *isa_try_create (ISABus *bus,const char *name) -{ -DeviceState *dev; - - dev =qdev_try_create (BUS (bus), name); -return ISA_DEVICE (dev); -} -ISADevice *isa_new (const char *name) {return ISA_DEVICE (qdev_new (name));
Signature · 1 line
2.21.1
PATCH 21/55 ssi: ssi_auto_connect_slaves() never does anything, drop
In reply to Markus Armbrusterssi_auto_connect_slaves(parent, cs_line, bus) iterates over @parent's QOM children @dev of type TYPE_SSI_SLAVE. It puts these on @bus, and sets cs_line[] to qdev_get_gpio_in_named(dev, SSI_GPIO_CS, 0).
Suspicious: there is no protection against overrunning cs_line[].
Turns out it's safe because ssi_auto_connect_slaves() never finds any such children. Its called by realize methods of some (but not all) devices providing an SSI bus, and gets passed the device.
SSI slave devices are always created with ssi_create_slave_no_init(), optionally via ssi_create_slave(). This adds them to their SSI bus. It doesn't set their QOM parent.
ssi_create_slave_no_init() is always immediately followed by qdev_init_nofail(), with no QOM parent assigned, so device_set_realized() puts the device into the /machine/unattached/ orphanage. None become QOM children of a device providing an SSI bus.
ssi_auto_connect_slaves() was added in commit b4ae3cfa57 "ssi: Add slave autoconnect helper". I can't see which slaves it was supposed to connect back then.
--- include/hw/ssi/ssi.h | 4 ---- hw/ssi/aspeed_smc.c | 1 - hw/ssi/imx_spi.c | 2 -- hw/ssi/mss-spi.c | 1 - hw/ssi/ssi.c | 33 --------------------------------- hw/ssi/xilinx_spi.c | 1 - hw/ssi/xilinx_spips.c | 4 ---- 7 files changed, 46 deletions(-)
include/hw/ssi/ssi.h +0 -4
@@ -86,10 +86,6 @@ SSIBus *ssi_create_bus(DeviceState *parent, const char *name);uint32_t ssi_transfer (SSIBus *bus,uint32_t val); -/* Automatically connect all children nodes a spi controller as slaves */ -void ssi_auto_connect_slaves (DeviceState *parent,qemu_irq *cs_lines, -SSIBus *bus); -/* max111x.c */ void max111x_set_input (DeviceState *dev,int line,uint8_t value);
hw/ssi/aspeed_smc.c +0 -1
@@ -1356,7 +1356,6 @@ static void aspeed_smc_realize(DeviceState *dev, Error **errp)/* Setup cs_lines for slaves */ s->cs_lines =g_new0 (qemu_irq, s->num_cs); -ssi_auto_connect_slaves (dev, s->cs_lines, s->spi);for (i =0 ; i < s->num_cs; ++i) {sysbus_init_irq (sbd, &s->cs_lines[i]);
hw/ssi/imx_spi.c +0 -2
@@ -424,8 +424,6 @@ static void imx_spi_realize(DeviceState *dev, Error **errp)sysbus_init_mmio (SYS_BUS_DEVICE (dev), &s->iomem);sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->irq); -ssi_auto_connect_slaves (dev, s->cs_lines, s->bus); -for (i =0 ; i <4 ; ++i) {sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->cs_lines[i]); }
hw/ssi/mss-spi.c +0 -1
@@ -376,7 +376,6 @@ static void mss_spi_realize(DeviceState *dev, Error **errp) s->spi =ssi_create_bus (dev,"spi" );sysbus_init_irq (sbd, &s->irq); -ssi_auto_connect_slaves (dev, &s->cs_line, s->spi);sysbus_init_irq (sbd, &s->cs_line); memory_region_init_io(&s->mmio, OBJECT(s), &spi_ops, s,
hw/ssi/ssi.c +0 -33
@@ -142,36 +142,3 @@ static void ssi_slave_register_types(void) }type_init (ssi_slave_register_types) - -typedef struct SSIAutoConnectArg { -qemu_irq **cs_linep; -SSIBus *bus; -} SSIAutoConnectArg; - -static int ssi_auto_connect_slave (Object *child,void *opaque) -{ -SSIAutoConnectArg *arg = opaque; -SSISlave *dev = (SSISlave *)object_dynamic_cast (child,TYPE_SSI_SLAVE ); -qemu_irq cs_line; - -if (!dev) { -return 0 ; - } - - cs_line =qdev_get_gpio_in_named (DEVICE (dev),SSI_GPIO_CS ,0 ); -qdev_set_parent_bus (DEVICE (dev),BUS (arg->bus)); - **arg->cs_linep = cs_line; - (*arg->cs_linep)++; -return 0 ; -} - -void ssi_auto_connect_slaves (DeviceState *parent,qemu_irq *cs_line, -SSIBus *bus) -{ -SSIAutoConnectArg arg = { - .cs_linep = &cs_line, - .bus = bus - }; - -object_child_foreach (OBJECT (parent), ssi_auto_connect_slave, &arg); -}
hw/ssi/xilinx_spi.c +0 -1
@@ -334,7 +334,6 @@ static void xilinx_spi_realize(DeviceState *dev, Error **errp)sysbus_init_irq (sbd, &s->irq); s->cs_lines =g_new0 (qemu_irq, s->num_cs); -ssi_auto_connect_slaves (dev, s->cs_lines, s->spi);for (i =0 ; i < s->num_cs; ++i) {sysbus_init_irq (sbd, &s->cs_lines[i]); }
hw/ssi/xilinx_spips.c +0 -4
@@ -1270,7 +1270,6 @@ static void xilinx_spips_realize(DeviceState *dev, Error **errp)XilinxSPIPS *s =XILINX_SPIPS (dev);SysBusDevice *sbd =SYS_BUS_DEVICE (dev);XilinxSPIPSClass *xsc =XILINX_SPIPS_GET_CLASS (s); -qemu_irq *cs;int i;DB_PRINT_L (0 ,"realized spips\n" );
@@ -1297,9 +1296,6 @@ static void xilinx_spips_realize(DeviceState *dev, Error **errp) s->cs_lines =g_new0 (qemu_irq, s->num_cs * s->num_busses); s->cs_lines_state =g_new0 (bool, s->num_cs * s->num_busses); -for (i =0 , cs = s->cs_lines; i < s->num_busses; ++i, cs += s->num_cs) { -ssi_auto_connect_slaves (DEVICE (s), cs, s->spi[i]); - }sysbus_init_irq (sbd, &s->irq);for (i =0 ; i < s->num_cs * s->num_busses; ++i) {
Signature · 1 line
2.21.1
Re: [PATCH 21/55] ssi: ssi_auto_connect_slaves() never does anything, drop
Quoted 20 lines · Markus Armbruster
ssi_auto_connect_slaves(parent, cs_line, bus)iterates over @parent's QOM children @dev of typeTYPE_SSI_SLAVE. It puts these on @bus, and sets cs_line[] toqdev_get_gpio_in_named(dev, SSI_GPIO_CS, 0).Suspicious: there is no protection against overrunning cs_line[].
Turns out it's safe because
ssi_auto_connect_slaves()never finds any such children. Its called by realize methods of some (but not all) devices providing an SSI bus, and gets passed the device.SSI slave devices are always created with
ssi_create_slave_no_init(), optionally viassi_create_slave(). This adds them to their SSI bus. It doesn't set their QOM parent.
ssi_create_slave_no_init()is always immediately followed byqdev_init_nofail(), with no QOM parent assigned, sodevice_set_realized()puts the device into the /machine/unattached/ orphanage. None become QOM children of a device providing an SSI bus.
Quoted 6 lines
ssi_auto_connect_slaves()was added in commitb4ae3cfa57"ssi: Add slave autoconnect helper". I can't see which slaves it was supposed to connect back then.Cc Alistair Francis <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
This looks ok. I haven't tested it though.
Alistair
Quoted 141 lines
--- include/hw/ssi/ssi.h | 4 ---- hw/ssi/aspeed_smc.c | 1 - hw/ssi/imx_spi.c | 2 -- hw/ssi/mss-spi.c | 1 - hw/ssi/ssi.c | 33 --------------------------------- hw/ssi/xilinx_spi.c | 1 - hw/ssi/xilinx_spips.c | 4 ---- 7 files changed, 46 deletions(-)include/hw/ssi/ssi.h +0
-4@@ -86,10 +86,6 @@ SSIBus *ssi_create_bus(DeviceState *parent, const char *name);uint32_t ssi_transfer (SSIBus *bus,uint32_t val); -/* Automatically connect all children nodes a spi controller as slaves */ -void ssi_auto_connect_slaves (DeviceState *parent,qemu_irq *cs_lines, -SSIBus *bus); -/* max111x.c */ void max111x_set_input (DeviceState *dev,int line,uint8_t value);hw/ssi/aspeed_smc.c +0
-1@@ -1356,7 +1356,6 @@ static void aspeed_smc_realize(DeviceState *dev, Error **errp)/* Setup cs_lines for slaves */ s->cs_lines =g_new0 (qemu_irq, s->num_cs); -ssi_auto_connect_slaves (dev, s->cs_lines, s->spi);for (i =0 ; i < s->num_cs; ++i) {sysbus_init_irq (sbd, &s->cs_lines[i]);hw/ssi/imx_spi.c +0
-2@@ -424,8 +424,6 @@ static void imx_spi_realize(DeviceState *dev, Error **errp)sysbus_init_mmio (SYS_BUS_DEVICE (dev), &s->iomem);sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->irq); -ssi_auto_connect_slaves (dev, s->cs_lines, s->bus); -for (i =0 ; i <4 ; ++i) {sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->cs_lines[i]); }hw/ssi/mss-spi.c +0
-1@@ -376,7 +376,6 @@ static void mss_spi_realize(DeviceState *dev, Error **errp) s->spi =ssi_create_bus (dev,"spi" );sysbus_init_irq (sbd, &s->irq); -ssi_auto_connect_slaves (dev, &s->cs_line, s->spi);sysbus_init_irq (sbd, &s->cs_line); memory_region_init_io(&s->mmio, OBJECT(s), &spi_ops, s,hw/ssi/ssi.c +0
-33@@ -142,36 +142,3 @@ static void ssi_slave_register_types(void) }type_init (ssi_slave_register_types) - -typedef struct SSIAutoConnectArg { -qemu_irq **cs_linep; -SSIBus *bus; -} SSIAutoConnectArg; - -static int ssi_auto_connect_slave (Object *child,void *opaque) -{ -SSIAutoConnectArg *arg = opaque; -SSISlave *dev = (SSISlave *)object_dynamic_cast (child,TYPE_SSI_SLAVE ); -qemu_irq cs_line; - -if (!dev) { -return 0 ; - } - - cs_line =qdev_get_gpio_in_named (DEVICE (dev),SSI_GPIO_CS ,0 ); -qdev_set_parent_bus (DEVICE (dev),BUS (arg->bus)); - **arg->cs_linep = cs_line; - (*arg->cs_linep)++; -return 0 ; -} - -void ssi_auto_connect_slaves (DeviceState *parent,qemu_irq *cs_line, -SSIBus *bus) -{ -SSIAutoConnectArg arg = { - .cs_linep = &cs_line, - .bus = bus - }; - -object_child_foreach (OBJECT (parent), ssi_auto_connect_slave, &arg); -}hw/ssi/xilinx_spi.c +0
-1@@ -334,7 +334,6 @@ static void xilinx_spi_realize(DeviceState *dev, Error **errp)sysbus_init_irq (sbd, &s->irq); s->cs_lines =g_new0 (qemu_irq, s->num_cs); -ssi_auto_connect_slaves (dev, s->cs_lines, s->spi);for (i =0 ; i < s->num_cs; ++i) {sysbus_init_irq (sbd, &s->cs_lines[i]); }hw/ssi/xilinx_spips.c +0
-5@@ -1270,7 +1270,6 @@ static void xilinx_spips_realize(DeviceState *dev, Error **errp)XilinxSPIPS *s =XILINX_SPIPS (dev);SysBusDevice *sbd =SYS_BUS_DEVICE (dev);XilinxSPIPSClass *xsc =XILINX_SPIPS_GET_CLASS (s); -qemu_irq *cs;int i;DB_PRINT_L (0 ,"realized spips\n" );@@ -1297,9 +1296,6 @@ static void xilinx_spips_realize(DeviceState *dev, Error **errp) s->cs_lines =g_new0 (qemu_irq, s->num_cs * s->num_busses); s->cs_lines_state =g_new0 (bool, s->num_cs * s->num_busses); -for (i =0 , cs = s->cs_lines; i < s->num_busses; ++i, cs += s->num_cs) { -ssi_auto_connect_slaves (DEVICE (s), cs, s->spi[i]); - }sysbus_init_irq (sbd, &s->irq);for (i =0 ; i < s->num_cs * s->num_busses; ++i) { --2.21.1
PATCH 22/55 ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle
In reply to Markus ArmbrusterReplace
dev = ssi_create_slave_no_init(bus, type_name);
...
qdev_init_nofail(dev);by
dev = qdev_new(type_name);
...
qdev_realize_and_unref(dev, bus, &error_fatal);Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains why.
@@
type SSIBus;
identifier bus;
expression dev, qbus, expr;
expression list args;
@@
- bus = (SSIBus *)qbus;
+ bus = qbus; // TODO fix up decl
...
- dev = ssi_create_slave_no_init(bus, args);
+ dev = qdev_new(args);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = ssi_create_slave_no_init(bus, args);
+ dev = qdev_new(args);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, BUS(bus), &error_fatal);Bus declarations fixed up manually.
--- hw/arm/aspeed.c | 4 ++-- hw/arm/msf2-som.c | 8 ++++---- hw/arm/sabrelite.c | 4 ++-- hw/arm/xilinx_zynq.c | 4 ++-- hw/arm/xlnx-zcu102.c | 16 ++++++++-------- hw/microblaze/petalogix_ml605_mmu.c | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-)
hw/arm/aspeed.c +2 -2
@@ -225,12 +225,12 @@ static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype,DriveInfo *dinfo =drive_get_next (IF_MTD );qemu_irq cs_line; - fl->flash =ssi_create_slave_no_init (s->spi, flashtype); + fl->flash =qdev_new (flashtype);if (dinfo) {qdev_prop_set_drive (fl->flash,"drive" ,blk_by_legacy_dinfo (dinfo), errp); } -qdev_init_nofail (fl->flash); +qdev_realize_and_unref (fl->flash,BUS (s->spi), &error_fatal); cs_line =qdev_get_gpio_in_named (fl->flash,SSI_GPIO_CS ,0 );sysbus_connect_irq (SYS_BUS_DEVICE (s), i +1 , cs_line);
hw/arm/msf2-som.c +4 -4
@@ -47,7 +47,7 @@ static void emcraft_sf2_s2s010_init(MachineState *machine)MachineClass *mc =MACHINE_GET_CLASS (machine);DriveInfo *dinfo =drive_get_next (IF_MTD );qemu_irq cs_line; -SSIBus *spi_bus; +BusState *spi_bus;MemoryRegion *sysmem =get_system_memory ();MemoryRegion *ddr =g_new (MemoryRegion,1 );
@@ -82,14 +82,14 @@ static void emcraft_sf2_s2s010_init(MachineState *machine) soc =MSF2_SOC (dev);/* Attach SPI flash to SPI0 controller */ - spi_bus = (SSIBus *)qdev_get_child_bus (dev,"spi0" ); - spi_flash =ssi_create_slave_no_init (spi_bus,"s25sl12801" ); + spi_bus =qdev_get_child_bus (dev,"spi0" ); + spi_flash =qdev_new ("s25sl12801" );qdev_prop_set_uint8 (spi_flash,"spansion-cr2nv" ,1 );if (dinfo) {qdev_prop_set_drive (spi_flash,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); } -qdev_init_nofail (spi_flash); +qdev_realize_and_unref (spi_flash, spi_bus, &error_fatal); cs_line =qdev_get_gpio_in_named (spi_flash,SSI_GPIO_CS ,0 );sysbus_connect_irq (SYS_BUS_DEVICE (&soc->spi[0 ]),1 , cs_line);
hw/arm/sabrelite.c +2 -2
@@ -80,13 +80,13 @@ static void sabrelite_init(MachineState *machine)qemu_irq cs_line;DriveInfo *dinfo =drive_get_next (IF_MTD ); - flash_dev =ssi_create_slave_no_init (spi_bus,"sst25vf016b" ); + flash_dev =qdev_new ("sst25vf016b" );if (dinfo) {qdev_prop_set_drive (flash_dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); } -qdev_init_nofail (flash_dev); +qdev_realize_and_unref (flash_dev,BUS (spi_bus), &error_fatal); cs_line =qdev_get_gpio_in_named (flash_dev,SSI_GPIO_CS ,0 );sysbus_connect_irq (SYS_BUS_DEVICE (spi_dev),1 , cs_line);
hw/arm/xilinx_zynq.c +2 -2
@@ -157,12 +157,12 @@ static inline void zynq_init_spi_flashes(uint32_t base_addr, qemu_irq irq,for (j =0 ; j < num_ss; ++j) {DriveInfo *dinfo =drive_get_next (IF_MTD ); - flash_dev =ssi_create_slave_no_init (spi,"n25q128" ); + flash_dev =qdev_new ("n25q128" );if (dinfo) {qdev_prop_set_drive (flash_dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); } -qdev_init_nofail (flash_dev); +qdev_realize_and_unref (flash_dev,BUS (spi), &error_fatal); cs_line =qdev_get_gpio_in_named (flash_dev,SSI_GPIO_CS ,0 );sysbus_connect_irq (busdev, i * num_ss + j +1 , cs_line);
hw/arm/xlnx-zcu102.c +8 -8
@@ -149,21 +149,21 @@ static void xlnx_zcu102_init(MachineState *machine) }for (i =0 ; i <XLNX_ZYNQMP_NUM_SPIS ; i++) { -SSIBus *spi_bus; +BusState *spi_bus;DeviceState *flash_dev;qemu_irq cs_line;DriveInfo *dinfo =drive_get_next (IF_MTD );gchar *bus_name =g_strdup_printf ("spi%d" , i); - spi_bus = (SSIBus *)qdev_get_child_bus (DEVICE (&s->soc), bus_name); + spi_bus =qdev_get_child_bus (DEVICE (&s->soc), bus_name);g_free (bus_name); - flash_dev =ssi_create_slave_no_init (spi_bus,"sst25wf080" ); + flash_dev =qdev_new ("sst25wf080" );if (dinfo) {qdev_prop_set_drive (flash_dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); } -qdev_init_nofail (flash_dev); +qdev_realize_and_unref (flash_dev, spi_bus, &error_fatal); cs_line =qdev_get_gpio_in_named (flash_dev,SSI_GPIO_CS ,0 );
@@ -171,22 +171,22 @@ static void xlnx_zcu102_init(MachineState *machine) }for (i =0 ; i <XLNX_ZYNQMP_NUM_QSPI_FLASH ; i++) { -SSIBus *spi_bus; +BusState *spi_bus;DeviceState *flash_dev;qemu_irq cs_line;DriveInfo *dinfo =drive_get_next (IF_MTD );int bus = i /XLNX_ZYNQMP_NUM_QSPI_BUS_CS ;gchar *bus_name =g_strdup_printf ("qspi%d" , bus); - spi_bus = (SSIBus *)qdev_get_child_bus (DEVICE (&s->soc), bus_name); + spi_bus =qdev_get_child_bus (DEVICE (&s->soc), bus_name);g_free (bus_name); - flash_dev =ssi_create_slave_no_init (spi_bus,"n25q512a11" ); + flash_dev =qdev_new ("n25q512a11" );if (dinfo) {qdev_prop_set_drive (flash_dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); } -qdev_init_nofail (flash_dev); +qdev_realize_and_unref (flash_dev, spi_bus, &error_fatal); cs_line =qdev_get_gpio_in_named (flash_dev,SSI_GPIO_CS ,0 );
hw/microblaze/petalogix_ml605_mmu.c +2 -2
@@ -186,12 +186,12 @@ petalogix_ml605_init(MachineState *machine)DriveInfo *dinfo =drive_get_next (IF_MTD );qemu_irq cs_line; - dev =ssi_create_slave_no_init (spi,"n25q128" ); + dev =qdev_new ("n25q128" );if (dinfo) {qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); } -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,BUS (spi), &error_fatal); cs_line =qdev_get_gpio_in_named (dev,SSI_GPIO_CS ,0 );sysbus_connect_irq (busdev, i+1 , cs_line);
Signature · 1 line
2.21.1
Re: [PATCH 22/55] ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle
Quoted 41 lines · Markus Armbruster
Replace
dev = ssi_create_slave_no_init(bus, type_name); ... qdev_init_nofail(dev);by
dev = qdev_new(type_name); ... qdev_realize_and_unref(dev, bus, &error_fatal);Recent commit "qdev: New
qdev_new(),qdev_realize(), etc." explains why.@@ type SSIBus; identifier bus; expression dev, qbus, expr; expression list args; @@ - bus = (SSIBus *)qbus; + bus = qbus; // TODO fix up decl ... - dev = ssi_create_slave_no_init(bus, args); + dev = qdev_new(args); ... when != dev = expr - qdev_init_nofail(dev); + qdev_realize_and_unref(dev, bus, &error_fatal); @@ expression dev, bus, expr; expression list args; @@ - dev = ssi_create_slave_no_init(bus, args); + dev = qdev_new(args); ... when != dev = expr - qdev_init_nofail(dev); + qdev_realize_and_unref(dev, BUS(bus), &error_fatal);
Quoted 4 lines
Bus declarations fixed up manually.
Cc Alistair Francis <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
Alistair
Quoted 178 lines
--- hw/arm/aspeed.c | 4 ++-- hw/arm/msf2-som.c | 8 ++++---- hw/arm/sabrelite.c | 4 ++-- hw/arm/xilinx_zynq.c | 4 ++-- hw/arm/xlnx-zcu102.c | 16 ++++++++-------- hw/microblaze/petalogix_ml605_mmu.c | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-)hw/arm/aspeed.c +2
-2@@ -225,12 +225,12 @@ static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype,DriveInfo *dinfo =drive_get_next (IF_MTD );qemu_irq cs_line; - fl->flash =ssi_create_slave_no_init (s->spi, flashtype); + fl->flash =qdev_new (flashtype);if (dinfo) {qdev_prop_set_drive (fl->flash,"drive" ,blk_by_legacy_dinfo (dinfo), errp); } -qdev_init_nofail (fl->flash); +qdev_realize_and_unref (fl->flash,BUS (s->spi), &error_fatal); cs_line =qdev_get_gpio_in_named (fl->flash,SSI_GPIO_CS ,0 );sysbus_connect_irq (SYS_BUS_DEVICE (s), i +1 , cs_line);hw/arm/msf2-som.c +4
-4@@ -47,7 +47,7 @@ static void emcraft_sf2_s2s010_init(MachineState *machine)MachineClass *mc =MACHINE_GET_CLASS (machine);DriveInfo *dinfo =drive_get_next (IF_MTD );qemu_irq cs_line; -SSIBus *spi_bus; +BusState *spi_bus;MemoryRegion *sysmem =get_system_memory ();MemoryRegion *ddr =g_new (MemoryRegion,1 );@@ -82,14 +82,14 @@ static void emcraft_sf2_s2s010_init(MachineState *machine) soc =MSF2_SOC (dev);/* Attach SPI flash to SPI0 controller */ - spi_bus = (SSIBus *)qdev_get_child_bus (dev,"spi0" ); - spi_flash =ssi_create_slave_no_init (spi_bus,"s25sl12801" ); + spi_bus =qdev_get_child_bus (dev,"spi0" ); + spi_flash =qdev_new ("s25sl12801" );qdev_prop_set_uint8 (spi_flash,"spansion-cr2nv" ,1 );if (dinfo) {qdev_prop_set_drive (spi_flash,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); } -qdev_init_nofail (spi_flash); +qdev_realize_and_unref (spi_flash, spi_bus, &error_fatal); cs_line =qdev_get_gpio_in_named (spi_flash,SSI_GPIO_CS ,0 );sysbus_connect_irq (SYS_BUS_DEVICE (&soc->spi[0 ]),1 , cs_line);hw/arm/sabrelite.c +2
-2@@ -80,13 +80,13 @@ static void sabrelite_init(MachineState *machine)qemu_irq cs_line;DriveInfo *dinfo =drive_get_next (IF_MTD ); - flash_dev =ssi_create_slave_no_init (spi_bus,"sst25vf016b" ); + flash_dev =qdev_new ("sst25vf016b" );if (dinfo) {qdev_prop_set_drive (flash_dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); } -qdev_init_nofail (flash_dev); +qdev_realize_and_unref (flash_dev,BUS (spi_bus), &error_fatal); cs_line =qdev_get_gpio_in_named (flash_dev,SSI_GPIO_CS ,0 );sysbus_connect_irq (SYS_BUS_DEVICE (spi_dev),1 , cs_line);hw/arm/xilinx_zynq.c +2
-2@@ -157,12 +157,12 @@ static inline void zynq_init_spi_flashes(uint32_t base_addr, qemu_irq irq,for (j =0 ; j < num_ss; ++j) {DriveInfo *dinfo =drive_get_next (IF_MTD ); - flash_dev =ssi_create_slave_no_init (spi,"n25q128" ); + flash_dev =qdev_new ("n25q128" );if (dinfo) {qdev_prop_set_drive (flash_dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); } -qdev_init_nofail (flash_dev); +qdev_realize_and_unref (flash_dev,BUS (spi), &error_fatal); cs_line =qdev_get_gpio_in_named (flash_dev,SSI_GPIO_CS ,0 );sysbus_connect_irq (busdev, i * num_ss + j +1 , cs_line);hw/arm/xlnx-zcu102.c +8
-8@@ -149,21 +149,21 @@ static void xlnx_zcu102_init(MachineState *machine) }for (i =0 ; i <XLNX_ZYNQMP_NUM_SPIS ; i++) { -SSIBus *spi_bus; +BusState *spi_bus;DeviceState *flash_dev;qemu_irq cs_line;DriveInfo *dinfo =drive_get_next (IF_MTD );gchar *bus_name =g_strdup_printf ("spi%d" , i); - spi_bus = (SSIBus *)qdev_get_child_bus (DEVICE (&s->soc), bus_name); + spi_bus =qdev_get_child_bus (DEVICE (&s->soc), bus_name);g_free (bus_name); - flash_dev =ssi_create_slave_no_init (spi_bus,"sst25wf080" ); + flash_dev =qdev_new ("sst25wf080" );if (dinfo) {qdev_prop_set_drive (flash_dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); } -qdev_init_nofail (flash_dev); +qdev_realize_and_unref (flash_dev, spi_bus, &error_fatal); cs_line =qdev_get_gpio_in_named (flash_dev,SSI_GPIO_CS ,0 );@@ -171,22 +171,22 @@ static void xlnx_zcu102_init(MachineState *machine) }for (i =0 ; i <XLNX_ZYNQMP_NUM_QSPI_FLASH ; i++) { -SSIBus *spi_bus; +BusState *spi_bus;DeviceState *flash_dev;qemu_irq cs_line;DriveInfo *dinfo =drive_get_next (IF_MTD );int bus = i /XLNX_ZYNQMP_NUM_QSPI_BUS_CS ;gchar *bus_name =g_strdup_printf ("qspi%d" , bus); - spi_bus = (SSIBus *)qdev_get_child_bus (DEVICE (&s->soc), bus_name); + spi_bus =qdev_get_child_bus (DEVICE (&s->soc), bus_name);g_free (bus_name); - flash_dev =ssi_create_slave_no_init (spi_bus,"n25q512a11" ); + flash_dev =qdev_new ("n25q512a11" );if (dinfo) {qdev_prop_set_drive (flash_dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); } -qdev_init_nofail (flash_dev); +qdev_realize_and_unref (flash_dev, spi_bus, &error_fatal); cs_line =qdev_get_gpio_in_named (flash_dev,SSI_GPIO_CS ,0 );hw/microblaze/petalogix_ml605_mmu.c +2
-3@@ -186,12 +186,12 @@ petalogix_ml605_init(MachineState *machine)DriveInfo *dinfo =drive_get_next (IF_MTD );qemu_irq cs_line; - dev =ssi_create_slave_no_init (spi,"n25q128" ); + dev =qdev_new ("n25q128" );if (dinfo) {qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); } -qdev_init_nofail (dev); +qdev_realize_and_unref (dev,BUS (spi), &error_fatal); cs_line =qdev_get_gpio_in_named (dev,SSI_GPIO_CS ,0 );sysbus_connect_irq (busdev, i+1 , cs_line); --2.21.1
PATCH 23/55 ssi: Convert last use of ssi_create_slave_no_init() manually
In reply to Markus ArmbrusterSame transformation as in the previous commit. Manual, because convincing Coccinelle to transform this case is not worthwhile.
--- hw/ssi/ssi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
hw/ssi/ssi.c +3 -2
@@ -16,6 +16,7 @@#include "hw/ssi/ssi.h" #include "migration/vmstate.h" #include "qemu/module.h" +#include "qapi/error.h" struct SSIBus {BusState parent_obj;
@@ -96,9 +97,9 @@ DeviceState *ssi_create_slave_no_init(SSIBus *bus, const char *name)DeviceState *ssi_create_slave (SSIBus *bus,const char *name) { -DeviceState *dev =ssi_create_slave_no_init (bus, name); +DeviceState *dev =qdev_new (name); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev, &bus->parent_obj, &error_fatal);return dev; }
Signature · 1 line
2.21.1
Re: [PATCH 23/55] ssi: Convert last use of ssi_create_slave_no_init() manually
Quoted 6 lines · Markus Armbruster
Same transformation as in the previous commit. Manual, because convincing Coccinelle to transform this case is not worthwhile.
Cc Alistair Francis <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
Looks sane.
Alistair
Quoted 32 lines
--- hw/ssi/ssi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)hw/ssi/ssi.c +3
-3@@ -16,6 +16,7 @@#include "hw/ssi/ssi.h" #include "migration/vmstate.h" #include "qemu/module.h" +#include "qapi/error.h" struct SSIBus {BusState parent_obj;@@ -96,9 +97,9 @@ DeviceState *ssi_create_slave_no_init(SSIBus *bus, const char *name)DeviceState *ssi_create_slave (SSIBus *bus,const char *name) { -DeviceState *dev =ssi_create_slave_no_init (bus, name); +DeviceState *dev =qdev_new (name); -qdev_init_nofail (dev); +qdev_realize_and_unref (dev, &bus->parent_obj, &error_fatal);return dev; } --2.21.1
PATCH 24/55 ssi: ssi_create_slave_no_init() is now unused, drop
In reply to Markus Armbruster--- include/hw/ssi/ssi.h | 1 - hw/ssi/ssi.c | 5 ----- 2 files changed, 6 deletions(-)
include/hw/ssi/ssi.h +0 -1
@@ -79,7 +79,6 @@ extern const VMStateDescription vmstate_ssi_slave; }DeviceState *ssi_create_slave (SSIBus *bus,const char *name); -DeviceState *ssi_create_slave_no_init (SSIBus *bus,const char *name);/* Master interface. */ SSIBus *ssi_create_bus (DeviceState *parent,const char *name);
hw/ssi/ssi.c +0 -5
@@ -90,11 +90,6 @@ static const TypeInfo ssi_slave_info = { .abstract = true, }; -DeviceState *ssi_create_slave_no_init (SSIBus *bus,const char *name) -{ -return qdev_create (BUS (bus), name); -} -DeviceState *ssi_create_slave (SSIBus *bus,const char *name) {DeviceState *dev =qdev_new (name);
Signature · 1 line
2.21.1
Re: [PATCH 24/55] ssi: ssi_create_slave_no_init() is now unused, drop
Quoted 3 lines · Markus Armbruster
Cc Alistair Francis <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
Alistair
Quoted 37 lines
--- include/hw/ssi/ssi.h | 1 - hw/ssi/ssi.c | 5 ----- 2 files changed, 6 deletions(-)include/hw/ssi/ssi.h +0
-1@@ -79,7 +79,6 @@ extern const VMStateDescription vmstate_ssi_slave; }DeviceState *ssi_create_slave (SSIBus *bus,const char *name); -DeviceState *ssi_create_slave_no_init (SSIBus *bus,const char *name);/* Master interface. */ SSIBus *ssi_create_bus (DeviceState *parent,const char *name);hw/ssi/ssi.c +0
-6@@ -90,11 +90,6 @@ static const TypeInfo ssi_slave_info = { .abstract = true, }; -DeviceState *ssi_create_slave_no_init (SSIBus *bus,const char *name) -{ -return qdev_create (BUS (bus), name); -} -DeviceState *ssi_create_slave (SSIBus *bus,const char *name) {DeviceState *dev =qdev_new (name); --2.21.1
PATCH 25/55 usb: New usb_new(), usb_realize_and_unref()
In reply to Markus ArmbrusterI'm converting from qdev_create()/qdev_init_nofail() to qdev_new()/qdev_realize_and_unref(); recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains why.
USB devices use qdev_create() through usb_create().
Provide usb_new() and usb_realize_and_unref() for converting USB devices.
--- include/hw/usb.h | 2 ++ hw/usb/bus.c | 10 ++++++++++ 2 files changed, 12 insertions(+)
include/hw/usb.h +2 -0
@@ -534,6 +534,8 @@ USBBus *usb_bus_find(int busnr);void usb_legacy_register (const char *typename,const char *usbdevice_name,USBDevice *(*usbdevice_init)(USBBus *bus,const char *params)); +USBDevice *usb_new (const char *name); +bool usb_realize_and_unref (USBDevice *dev,USBBus *bus,Error **errp);USBDevice *usb_create (USBBus *bus,const char *name);USBDevice *usb_create_simple (USBBus *bus,const char *name);USBDevice *usbdevice_create (const char *cmdline);
hw/usb/bus.c +10 -0
@@ -314,6 +314,16 @@ void usb_legacy_register(const char *typename, const char *usbdevice_name, } } +USBDevice *usb_new (const char *name) +{ +return USB_DEVICE (qdev_new (name)); +} + +bool usb_realize_and_unref (USBDevice *dev,USBBus *bus,Error **errp) +{ +return qdev_realize_and_unref (&dev->qdev, &bus->qbus, errp); +} +USBDevice *usb_create (USBBus *bus,const char *name) {DeviceState *dev;
Signature · 1 line
2.21.1
Re: [PATCH 25/55] usb: New usb_new(), usb_realize_and_unref()
Quoted 11 lines · Markus Armbruster
I'm converting from qdev_create()/qdev_init_nofail() to qdev_new()/qdev_realize_and_unref(); recent commit "qdev: New
qdev_new(),qdev_realize(), etc." explains why.USB devices use
qdev_create()throughusb_create().Provide
usb_new()andusb_realize_and_unref()for converting USB devices.Cc Gerd Hoffmann <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
PATCH 26/55 usb: Convert uses of usb_create()
In reply to Markus ArmbrusterReplace
dev = usb_create(bus, type_name);
...
object_property_set_bool(OBJECT(dev), true, "realized", &err);by
dev = isa_new(type_name);
...
usb_realize_and_unref(dev, bus, &err);Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains why.
--- include/hw/usb.h | 3 +-- hw/usb/bus.c | 11 +++++------ hw/usb/dev-serial.c | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-)
include/hw/usb.h +1 -2
@@ -532,8 +532,7 @@ void usb_bus_new(USBBus *bus, size_t bus_size,void usb_bus_release (USBBus *bus);USBBus *usb_bus_find (int busnr);void usb_legacy_register (const char *typename,const char *usbdevice_name, -USBDevice *(*usbdevice_init)(USBBus *bus, -const char *params)); +USBDevice *(*usbdevice_init)(const char *params));USBDevice *usb_new (const char *name);bool usb_realize_and_unref (USBDevice *dev,USBBus *bus,Error **errp);USBDevice *usb_create (USBBus *bus,const char *name);
hw/usb/bus.c +5 -6
@@ -296,14 +296,13 @@ typedef struct LegacyUSBFactory {const char *name;const char *usbdevice_name; -USBDevice *(*usbdevice_init)(USBBus *bus,const char *params); +USBDevice *(*usbdevice_init)(const char *params); } LegacyUSBFactory;static GSList *legacy_usb_factory;void usb_legacy_register (const char *typename,const char *usbdevice_name, -USBDevice *(*usbdevice_init)(USBBus *bus, -const char *params)) +USBDevice *(*usbdevice_init)(const char *params)) {if (usbdevice_name) {LegacyUSBFactory *f =g_malloc0 (sizeof (*f));
@@ -710,19 +709,19 @@ USBDevice *usbdevice_create(const char *cmdline) }if (f->usbdevice_init) { - dev = f->usbdevice_init (bus, params); + dev = f->usbdevice_init (params); }else {if (*params) {error_report ("usbdevice %s accepts no params" , driver);return NULL ; } - dev =usb_create (bus, f->name); + dev =usb_new (f->name); }if (!dev) {error_report ("Failed to create USB device '%s'" , f->name);return NULL ; } -object_property_set_bool (OBJECT (dev), true,"realized" , &err); +usb_realize_and_unref (dev, bus, &err);if (err) {error_reportf_err (err,"Failed to initialize USB device '%s': " , f->name);
hw/usb/dev-serial.c +2 -2
@@ -542,7 +542,7 @@ static void usb_serial_realize(USBDevice *dev, Error **errp) s->intr =usb_ep_get (dev,USB_TOKEN_IN ,1 ); } -static USBDevice *usb_braille_init (USBBus *bus,const char *unused) +static USBDevice *usb_braille_init (const char *unused) {USBDevice *dev;Chardev *cdrv;
@@ -551,7 +551,7 @@ static USBDevice *usb_braille_init(USBBus *bus, const char *unused)if (!cdrv)return NULL ; - dev =usb_create (bus,"usb-braille" ); + dev =usb_new ("usb-braille" );qdev_prop_set_chr (&dev->qdev,"chardev" , cdrv);return dev; }
Signature · 1 line
2.21.1
Re: [PATCH 26/55] usb: Convert uses of usb_create()
Quoted 12 lines · Markus Armbruster
Replace
dev = usb_create(bus, type_name); ... object_property_set_bool(OBJECT(dev), true, "realized", &err);by
dev = isa_new(type_name); ... usb_realize_and_unref(dev, bus, &err);
Quoted 5 lines
Recent commit "qdev: New
qdev_new(),qdev_realize(), etc." explains why.Cc Gerd Hoffmann <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
PATCH 27/55 usb: usb_create() is now unused, drop
In reply to Markus Armbruster--- include/hw/usb.h | 1 - hw/usb/bus.c | 8 -------- 2 files changed, 9 deletions(-)
include/hw/usb.h +0 -1
@@ -535,7 +535,6 @@ void usb_legacy_register(const char *typename, const char *usbdevice_name, USBDevice *(*usbdevice_init)(const char *params));USBDevice *usb_new (const char *name);bool usb_realize_and_unref (USBDevice *dev,USBBus *bus,Error **errp); -USBDevice *usb_create (USBBus *bus,const char *name);USBDevice *usb_create_simple (USBBus *bus,const char *name);USBDevice *usbdevice_create (const char *cmdline); void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index,
hw/usb/bus.c +0 -8
@@ -323,14 +323,6 @@ bool usb_realize_and_unref(USBDevice *dev, USBBus *bus, Error **errp)return qdev_realize_and_unref (&dev->qdev, &bus->qbus, errp); } -USBDevice *usb_create (USBBus *bus,const char *name) -{ -DeviceState *dev; - - dev =qdev_create (&bus->qbus, name); -return USB_DEVICE (dev); -} -static USBDevice *usb_try_create_simple (USBBus *bus,const char *name,Error **errp) {
Signature · 1 line
2.21.1
Re: [PATCH 27/55] usb: usb_create() is now unused, drop
Quoted 2 lines · Markus Armbruster
Cc Gerd Hoffmann <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
PATCH 28/55 usb: Eliminate usb_try_create_simple()
In reply to Markus Armbrusterusb_try_create_simple() is qdev_try_new() and qdev_realize_and_unref() with more verbose error messages. Of its two users, one ignores errors, and the other asserts they are impossible.
Make them use qdev_try_new() and qdev_realize_and_unref() directly, and eliminate usb_try_create_simple
--- hw/usb/bus.c | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-)
hw/usb/bus.c +14 -23
@@ -318,35 +318,22 @@ USBDevice *usb_new(const char *name)return USB_DEVICE (qdev_new (name)); } +static USBDevice *usb_try_new (const char *name) +{ +return USB_DEVICE (qdev_try_new (name)); +} +bool usb_realize_and_unref (USBDevice *dev,USBBus *bus,Error **errp) {return qdev_realize_and_unref (&dev->qdev, &bus->qbus, errp); } -static USBDevice *usb_try_create_simple (USBBus *bus,const char *name, -Error **errp) -{ -Error *err =NULL ; -DeviceState *dev; - - dev =qdev_try_new (name); -if (!dev) { -error_setg (errp,"Failed to create USB device '%s'" , name); -return NULL ; - } -qdev_realize_and_unref (dev, &bus->qbus, &err); -if (err) { -error_propagate_prepend (errp, err, -"Failed to initialize USB device '%s': " , - name); -return NULL ; - } -return USB_DEVICE (dev); -} -USBDevice *usb_create_simple (USBBus *bus,const char *name) { -return usb_try_create_simple (bus, name, &error_abort); +USBDevice *dev =usb_new (name); + +usb_realize_and_unref (dev, bus, &error_abort); +return dev; } static void usb_fill_port(USBPort *port, void *opaque, int index,
@@ -426,6 +413,7 @@ void usb_claim_port(USBDevice *dev, Error **errp) {USBBus *bus =usb_bus_from_device (dev);USBPort *port; +USBDevice *hub;assert (dev->port ==NULL );
@@ -443,7 +431,10 @@ void usb_claim_port(USBDevice *dev, Error **errp) }else {if (bus->nfree ==1 &&strcmp (object_get_typename (OBJECT (dev)),"usb-hub" ) !=0 ) {/* Create a new hub and chain it on */ -usb_try_create_simple (bus,"usb-hub" ,NULL ); + hub =usb_try_new ("usb-hub" ); +if (hub) { +usb_realize_and_unref (hub, bus,NULL ); + } }if (bus->nfree ==0 ) { error_setg(errp, "tried to attach usb device %s to a bus "
Signature · 1 line
2.21.1
Re: [PATCH 28/55] usb: Eliminate usb_try_create_simple()
Quoted 6 lines · Markus Armbruster
usb_try_create_simple()isqdev_try_new()andqdev_realize_and_unref()with more verbose error messages. Of its two users, one ignores errors, and the other asserts they are impossible.Make them use
qdev_try_new()andqdev_realize_and_unref()directly, and eliminateusb_try_create_simple
PATCH 29/55 qdev: qdev_create(), qdev_try_create() are now unused, drop
In reply to Markus Armbruster--- include/hw/qdev-core.h | 2 -- hw/core/qdev.c | 48 ------------------------------------------ hw/core/sysbus.c | 1 - migration/migration.c | 2 +- 4 files changed, 1 insertion(+), 52 deletions(-)
include/hw/qdev-core.h +0 -2
@@ -320,8 +320,6 @@ compat_props_add(GPtrArray *arr,/*** Board API. This should go away once we have a machine config file. ***/ -DeviceState *qdev_create (BusState *bus,const char *name); -DeviceState *qdev_try_create (BusState *bus,const char *name);DeviceState *qdev_new (const char *name);DeviceState *qdev_try_new (const char *name);void qdev_init_nofail (DeviceState *dev);
hw/core/qdev.c +0 -48
54 lines not on this page · raw message
hw/core/sysbus.c +0 -1
@@ -325,7 +325,6 @@ static const TypeInfo sysbus_device_type_info = { .class_init = sysbus_device_class_init, }; -/* This is a nasty hack to allow passing a NULL bus to qdev_create. */ static BusState *main_system_bus;static void main_system_bus_create (void )
migration/migration.c +1 -1
@@ -3774,7 +3774,7 @@ static const TypeInfo migration_type = { .name = TYPE_MIGRATION,/* * NOTE: TYPE_MIGRATION is not really a device, as the object is -* not created using qdev_create(), it is not attached to the qdev +* not created using qdev_new(), it is not attached to the qdev * device tree, and it is never realized. * * TODO: Make this TYPE_OBJECT once QOM provides something like
Signature · 1 line
2.21.1
PATCH 30/55 auxbus: New aux_realize_bus(), pairing with aux_init_bus()
In reply to Markus Armbrusteraux_init_bus() encapsulates the creation of an aux-bus and its aux-to-i2c-bridge device.
Create aux_realize_bus() to similarly encapsulate their realization.
--- include/hw/misc/auxbus.h | 7 +++++++ hw/display/xlnx_dp.c | 2 +- hw/misc/auxbus.c | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-)
include/hw/misc/auxbus.h +7 -0
@@ -93,6 +93,13 @@ struct AUXSlave {*/ AUXBus *aux_init_bus (DeviceState *parent,const char *name); +/** +* aux_realize_bus: Realize an AUX bus. +* +* @bus: The AUX bus. +*/ +void aux_realize_bus (AUXBus *bus); +/* * aux_request: Make a request on the bus. *
hw/display/xlnx_dp.c +1 -1
@@ -1264,7 +1264,7 @@ static void xlnx_dp_realize(DeviceState *dev, Error **errp)DisplaySurface *surface;struct audsettings as; -qdev_init_nofail (DEVICE (s->aux_bus->bridge)); +aux_realize_bus (s->aux_bus);qdev_init_nofail (DEVICE (s->dpcd));aux_map_slave (AUX_SLAVE (s->dpcd),0x0000 );
hw/misc/auxbus.c +5 -0
@@ -81,6 +81,11 @@ AUXBus *aux_init_bus(DeviceState *parent, const char *name)return bus; } +void aux_realize_bus (AUXBus *bus) +{ +qdev_init_nofail (DEVICE (bus->bridge)); +} +void aux_map_slave (AUXSlave *aux_dev,hwaddr addr) {DeviceState *dev =DEVICE (aux_dev);
Signature · 1 line
2.21.1
Re: [PATCH 30/55] auxbus: New aux_realize_bus(), pairing with aux_init_bus()
Quoted 17 lines · Markus Armbruster
aux_init_bus()encapsulates the creation of an aux-bus and its aux-to-i2c-bridge device.Create
aux_realize_bus()to similarly encapsulate their realization.Signed-off-by Markus Armbruster <[email protected]>--- include/hw/misc/auxbus.h | 7 +++++++ hw/display/xlnx_dp.c | 2 +- hw/misc/auxbus.c | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-)include/hw/misc/auxbus.h +0
-0
include/hw/misc/auxbus.h struct AUXSlave { · line 94
Quoted 2 lines
include/hw/misc/auxbus.h +0
-0@@ -93,6 +93,13 @@ struct AUXSlave {*/ AUXBus *aux_init_bus (DeviceState *parent,const char *name);
Previous to your patch, but aux_init_bus() is misnamed.
I'd rather rename this one aux_bus_init() ...
include/hw/misc/auxbus.h struct AUXSlave { · line 101
Quoted 7 lines
include/hw/misc/auxbus.h +6
-0+/** +* aux_realize_bus: Realize an AUX bus. +* +* @bus: The AUX bus. +*/ +void aux_realize_bus (AUXBus *bus);
... and this one aux_bus_realize().
If you mind :)
Quoted 34 lines
include/hw/misc/auxbus.h +1
-0+/* * aux_request: Make a request on the bus. * hw/display/xlnx_dp.c +1
-1@@ -1264,7 +1264,7 @@ static void xlnx_dp_realize(DeviceState *dev, Error **errp)DisplaySurface *surface;struct audsettings as; -qdev_init_nofail (DEVICE (s->aux_bus->bridge)); +aux_realize_bus (s->aux_bus);qdev_init_nofail (DEVICE (s->dpcd));aux_map_slave (AUX_SLAVE (s->dpcd),0x0000 );hw/misc/auxbus.c +5
-0@@ -81,6 +81,11 @@ AUXBus *aux_init_bus(DeviceState *parent, const char *name)return bus; } +void aux_realize_bus (AUXBus *bus) +{ +qdev_init_nofail (DEVICE (bus->bridge)); +} +void aux_map_slave (AUXSlave *aux_dev,hwaddr addr) {DeviceState *dev =DEVICE (aux_dev);
Re: [PATCH 30/55] auxbus: New aux_realize_bus(), pairing with aux_init_bus()
Quoted 35 lines · Philippe Mathieu-Daudé
Quoted 17 lines · Markus Armbruster
aux_init_bus()encapsulates the creation of an aux-bus and its aux-to-i2c-bridge device.Create
aux_realize_bus()to similarly encapsulate their realization.Signed-off-by Markus Armbruster <[email protected]>--- include/hw/misc/auxbus.h | 7 +++++++ hw/display/xlnx_dp.c | 2 +- hw/misc/auxbus.c | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-)include/hw/misc/auxbus.h +0
-0include/hw/misc/auxbus.h struct AUXSlave { · line 94
Quoted 2 lines
include/hw/misc/auxbus.h +0
-0@@ -93,6 +93,13 @@ struct AUXSlave {*/ AUXBus *aux_init_bus (DeviceState *parent,const char *name);Previous to your patch, but
aux_init_bus()is misnamed.I'd rather rename this one
aux_bus_init()...include/hw/misc/auxbus.h struct AUXSlave { · line 101
Quoted 7 lines
include/hw/misc/auxbus.h +6
-0+/** +* aux_realize_bus: Realize an AUX bus. +* +* @bus: The AUX bus. +*/ +void aux_realize_bus (AUXBus *bus);... and this one
aux_bus_realize().
Quoted 1 line
If you mind :)
Makes sense.
Quoted 1 line
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Thanks!
PATCH 31/55 auxbus: Convert a use of qdev_set_parent_bus()
In reply to Markus ArmbrusterConvert qdev_set_parent_bus()/qdev_init_nofail() to qdev_realize(); recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains why.
--- hw/display/xlnx_dp.c | 2 +- hw/misc/auxbus.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-)
hw/display/xlnx_dp.c +1 -1
@@ -1266,7 +1266,7 @@ static void xlnx_dp_realize(DeviceState *dev, Error **errp)aux_realize_bus (s->aux_bus); -qdev_init_nofail (DEVICE (s->dpcd)); +qdev_realize (DEVICE (s->dpcd),BUS (s->aux_bus), &error_fatal);aux_map_slave (AUX_SLAVE (s->dpcd),0x0000 ); qdev_realize_and_unref(DEVICE(s->edid), BUS(aux_get_i2c_bus(s->aux_bus)),
hw/misc/auxbus.c +1 -3
@@ -70,7 +70,6 @@ AUXBus *aux_init_bus(DeviceState *parent, const char *name) bus =AUX_BUS (qbus_create (TYPE_AUX_BUS , parent, name)); auxtoi2c =object_new_with_props (TYPE_AUXTOI2C ,OBJECT (bus),"i2c" , &error_abort,NULL ); -qdev_set_parent_bus (DEVICE (auxtoi2c),BUS (bus)); bus->bridge =AUXTOI2C (auxtoi2c);
@@ -83,7 +82,7 @@ AUXBus *aux_init_bus(DeviceState *parent, const char *name)void aux_realize_bus (AUXBus *bus) { -qdev_init_nofail (DEVICE (bus->bridge)); +qdev_realize (DEVICE (bus->bridge),BUS (bus), &error_fatal); }void aux_map_slave (AUXSlave *aux_dev,hwaddr addr)
@@ -280,7 +279,6 @@ DeviceState *aux_create_slave(AUXBus *bus, const char *type) dev =qdev_new (type);assert (dev); -qdev_set_parent_bus (dev, &bus->qbus);return dev; }
Signature · 1 line
2.21.1
PATCH 32/55 auxbus: Eliminate aux_create_slave()
In reply to Markus Armbrusteraux_create_slave() has become a trivial wrapper around qdev_new(). There's just one user. Eliminate.
--- include/hw/misc/auxbus.h | 7 ------- hw/display/xlnx_dp.c | 2 +- hw/misc/auxbus.c | 9 --------- 3 files changed, 1 insertion(+), 17 deletions(-)
include/hw/misc/auxbus.h +0 -7
@@ -131,13 +131,6 @@ I2CBus *aux_get_i2c_bus(AUXBus *bus);*/ void aux_init_mmio (AUXSlave *aux_slave,MemoryRegion *mmio); -/* aux_create_slave: Create a new device on an AUX bus -* -* @bus The AUX bus for the new device. -* @name The type of the device to be created. -*/ -DeviceState *aux_create_slave (AUXBus *bus,const char *name); -/* aux_map_slave: Map the mmio for an AUX slave on the bus. * * @dev The AUX slave.
hw/display/xlnx_dp.c +1 -1
@@ -1247,7 +1247,7 @@ static void xlnx_dp_init(Object *obj)/* * Initialize DPCD and EDID.. */ - s->dpcd =DPCD (aux_create_slave (s->aux_bus,"dpcd" )); + s->dpcd =DPCD (qdev_new ("dpcd" ));object_property_add_child (OBJECT (s),"dpcd" ,OBJECT (s->dpcd)); s->edid =I2CDDC (qdev_new ("i2c-ddc" ));
hw/misc/auxbus.c +0 -9
@@ -273,15 +273,6 @@ static void aux_slave_dev_print(Monitor *mon, DeviceState *dev, int indent) memory_region_size(s->mmio)); } -DeviceState *aux_create_slave (AUXBus *bus,const char *type) -{ -DeviceState *dev; - - dev =qdev_new (type); -assert (dev); -return dev; -} -void aux_init_mmio (AUXSlave *aux_slave,MemoryRegion *mmio) {assert (!aux_slave->mmio);
Signature · 1 line
2.21.1
Re: [PATCH 32/55] auxbus: Eliminate aux_create_slave()
Quoted 52 lines · Markus Armbruster
aux_create_slave()has become a trivial wrapper aroundqdev_new(). There's just one user. Eliminate.Signed-off-by Markus Armbruster <[email protected]>--- include/hw/misc/auxbus.h | 7 ------- hw/display/xlnx_dp.c | 2 +- hw/misc/auxbus.c | 9 --------- 3 files changed, 1 insertion(+), 17 deletions(-)include/hw/misc/auxbus.h +0
-7@@ -131,13 +131,6 @@ I2CBus *aux_get_i2c_bus(AUXBus *bus);*/ void aux_init_mmio (AUXSlave *aux_slave,MemoryRegion *mmio); -/* aux_create_slave: Create a new device on an AUX bus -* -* @bus The AUX bus for the new device. -* @name The type of the device to be created. -*/ -DeviceState *aux_create_slave (AUXBus *bus,const char *name); -/* aux_map_slave: Map the mmio for an AUX slave on the bus. * * @dev The AUX slave. hw/display/xlnx_dp.c +1
-1@@ -1247,7 +1247,7 @@ static void xlnx_dp_init(Object *obj)/* * Initialize DPCD and EDID.. */ - s->dpcd =DPCD (aux_create_slave (s->aux_bus,"dpcd" )); + s->dpcd =DPCD (qdev_new ("dpcd" ));object_property_add_child (OBJECT (s),"dpcd" ,OBJECT (s->dpcd)); s->edid =I2CDDC (qdev_new ("i2c-ddc" ));hw/misc/auxbus.c +0
-2@@ -273,15 +273,6 @@ static void aux_slave_dev_print(Monitor *mon, DeviceState *dev, int indent) memory_region_size(s->mmio)); } -DeviceState *aux_create_slave (AUXBus *bus,const char *type) -{
hw/misc/auxbus.c static void aux_slave_dev_print(Monitor *mon, DeviceState *dev, int indent) · line 278
Quoted 10 lines
hw/misc/auxbus.c +0
-7-DeviceState *dev; - - dev =qdev_new (type); -assert (dev); -return dev; -} -void aux_init_mmio (AUXSlave *aux_slave,MemoryRegion *mmio) {assert (!aux_slave->mmio);
PATCH 33/55 qom: Tidy up a few object_initialize_child() calls
In reply to Markus ArmbrusterThe callers of object_initialize_child() commonly pass either &child, sizeof(child), or pchild, sizeof(*pchild). Tidy up the few that don't, mostly to keep the next commit simpler.
--- hw/arm/aspeed.c | 2 +- hw/microblaze/xlnx-zynqmp-pmu.c | 3 +-- hw/pci-host/pnv_phb4.c | 2 +- hw/riscv/riscv_hart.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-)
hw/arm/aspeed.c +1 -1
@@ -267,7 +267,7 @@ static void aspeed_machine_init(MachineState *machine)memory_region_add_subregion (&bmc->ram_container,0 , machine->ram);object_initialize_child (OBJECT (machine),"soc" , &bmc->soc, - (sizeof (bmc->soc)), amc->soc_name, &error_abort, +sizeof (bmc->soc), amc->soc_name, &error_abort,NULL ); sc =ASPEED_SOC_GET_CLASS (&bmc->soc);
hw/microblaze/xlnx-zynqmp-pmu.c +1 -2
@@ -174,8 +174,7 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine) pmu_ram);/* Create the PMU device */ -object_initialize_child (OBJECT (machine),"pmu" , pmu, -sizeof (XlnxZynqMPPMUSoCState), +object_initialize_child (OBJECT (machine),"pmu" , pmu,sizeof (*pmu),TYPE_XLNX_ZYNQMP_PMU_SOC , &error_abort,NULL );object_property_set_bool (OBJECT (pmu), true,"realized" , &error_fatal);
hw/pci-host/pnv_phb4.c +1 -1
@@ -1155,7 +1155,7 @@ static void pnv_phb4_instance_init(Object *obj)QLIST_INIT (&phb->dma_spaces);/* XIVE interrupt source object */ -object_initialize_child (obj,"source" , &phb->xsrc,sizeof (XiveSource), +object_initialize_child (obj,"source" , &phb->xsrc,sizeof (phb->xsrc),TYPE_XIVE_SOURCE , &error_abort,NULL );/* Root Port */
hw/riscv/riscv_hart.c +1 -1
@@ -46,7 +46,7 @@ static void riscv_hart_realize(RISCVHartArrayState *s, int idx,Error *err =NULL ;object_initialize_child (OBJECT (s),"harts[*]" , &s->harts[idx], -sizeof (RISCVCPU ), cpu_type, +sizeof (s->harts[idx]), cpu_type, &error_abort,NULL ); s->harts[idx].env.mhartid = s->hartid_base + idx;qemu_register_reset (riscv_harts_cpu_reset, &s->harts[idx]);
Signature · 1 line
2.21.1
Re: [PATCH 33/55] qom: Tidy up a few object_initialize_child() calls
Quoted 6 lines · Markus Armbruster
The callers of
object_initialize_child()commonly pass either &child, sizeof(child), or pchild,sizeof(*pchild). Tidy up the few that don't, mostly to keep the next commit simpler.Signed-off-by Markus Armbruster <[email protected]>
Alistair
Quoted 64 lines
--- hw/arm/aspeed.c | 2 +- hw/microblaze/xlnx-zynqmp-pmu.c | 3 +-- hw/pci-host/pnv_phb4.c | 2 +- hw/riscv/riscv_hart.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-)hw/arm/aspeed.c +1
-1@@ -267,7 +267,7 @@ static void aspeed_machine_init(MachineState *machine)memory_region_add_subregion (&bmc->ram_container,0 , machine->ram);object_initialize_child (OBJECT (machine),"soc" , &bmc->soc, - (sizeof (bmc->soc)), amc->soc_name, &error_abort, +sizeof (bmc->soc), amc->soc_name, &error_abort,NULL ); sc =ASPEED_SOC_GET_CLASS (&bmc->soc);hw/microblaze/xlnx-zynqmp-pmu.c +1
-2@@ -174,8 +174,7 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine) pmu_ram);/* Create the PMU device */ -object_initialize_child (OBJECT (machine),"pmu" , pmu, -sizeof (XlnxZynqMPPMUSoCState), +object_initialize_child (OBJECT (machine),"pmu" , pmu,sizeof (*pmu),TYPE_XLNX_ZYNQMP_PMU_SOC , &error_abort,NULL );object_property_set_bool (OBJECT (pmu), true,"realized" , &error_fatal);hw/pci-host/pnv_phb4.c +1
-1@@ -1155,7 +1155,7 @@ static void pnv_phb4_instance_init(Object *obj)QLIST_INIT (&phb->dma_spaces);/* XIVE interrupt source object */ -object_initialize_child (obj,"source" , &phb->xsrc,sizeof (XiveSource), +object_initialize_child (obj,"source" , &phb->xsrc,sizeof (phb->xsrc),TYPE_XIVE_SOURCE , &error_abort,NULL );/* Root Port */ hw/riscv/riscv_hart.c +1
-2@@ -46,7 +46,7 @@ static void riscv_hart_realize(RISCVHartArrayState *s, int idx,Error *err =NULL ;object_initialize_child (OBJECT (s),"harts[*]" , &s->harts[idx], -sizeof (RISCVCPU ), cpu_type, +sizeof (s->harts[idx]), cpu_type, &error_abort,NULL ); s->harts[idx].env.mhartid = s->hartid_base + idx;qemu_register_reset (riscv_harts_cpu_reset, &s->harts[idx]); --2.21.1
Re: [PATCH 33/55] qom: Tidy up a few object_initialize_child() calls
In reply to Markus ArmbrusterQuoted 58 lines · Markus Armbruster
The callers of
object_initialize_child()commonly pass either &child, sizeof(child), or pchild,sizeof(*pchild). Tidy up the few that don't, mostly to keep the next commit simpler.Signed-off-by Markus Armbruster <[email protected]>--- hw/arm/aspeed.c | 2 +- hw/microblaze/xlnx-zynqmp-pmu.c | 3 +-- hw/pci-host/pnv_phb4.c | 2 +- hw/riscv/riscv_hart.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-)hw/arm/aspeed.c +1
-1@@ -267,7 +267,7 @@ static void aspeed_machine_init(MachineState *machine)memory_region_add_subregion (&bmc->ram_container,0 , machine->ram);object_initialize_child (OBJECT (machine),"soc" , &bmc->soc, - (sizeof (bmc->soc)), amc->soc_name, &error_abort, +sizeof (bmc->soc), amc->soc_name, &error_abort,NULL ); sc =ASPEED_SOC_GET_CLASS (&bmc->soc);hw/microblaze/xlnx-zynqmp-pmu.c +1
-2@@ -174,8 +174,7 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine) pmu_ram);/* Create the PMU device */ -object_initialize_child (OBJECT (machine),"pmu" , pmu, -sizeof (XlnxZynqMPPMUSoCState), +object_initialize_child (OBJECT (machine),"pmu" , pmu,sizeof (*pmu),TYPE_XLNX_ZYNQMP_PMU_SOC , &error_abort,NULL );object_property_set_bool (OBJECT (pmu), true,"realized" , &error_fatal);hw/pci-host/pnv_phb4.c +1
-1@@ -1155,7 +1155,7 @@ static void pnv_phb4_instance_init(Object *obj)QLIST_INIT (&phb->dma_spaces);/* XIVE interrupt source object */ -object_initialize_child (obj,"source" , &phb->xsrc,sizeof (XiveSource), +object_initialize_child (obj,"source" , &phb->xsrc,sizeof (phb->xsrc),TYPE_XIVE_SOURCE , &error_abort,NULL );/* Root Port */ hw/riscv/riscv_hart.c +0
-0
hw/riscv/riscv_hart.c static void riscv_hart_realize(RISCVHartArrayState *s, int idx, · line 52
Quoted 8 lines
hw/riscv/riscv_hart.c +1
-1@@ -46,7 +46,7 @@ static void riscv_hart_realize(RISCVHartArrayState *s, int idx,Error *err =NULL ;object_initialize_child (OBJECT (s),"harts[*]" , &s->harts[idx], -sizeof (RISCVCPU ), cpu_type, +sizeof (s->harts[idx]), cpu_type, &error_abort,NULL ); s->harts[idx].env.mhartid = s->hartid_base + idx;qemu_register_reset (riscv_harts_cpu_reset, &s->harts[idx]);
PATCH 34/55 qom: Less verbose object_initialize_child()
In reply to Markus ArmbrusterAll users of object_initialize_child() pass the obvious child size argument. Almost all pass &error_abort and no properties. Tiresome.
Rename object_initialize_child() to object_initialize_child_with_props() to free the name. New convenience wrapper object_initialize_child() automates the size argument, and passes &error_abort and no properties.
Rename object_initialize_childv() to object_initialize_child_with_propsv() for consistency.
Convert callers with this Coccinelle script:
@@
expression parent, propname, type;
expression child, size;
symbol error_abort;
@@
- object_initialize_child(parent, propname, OBJECT(child), size, type, &error_abort, NULL)
+ object_initialize_child(parent, propname, child, size, type, &error_abort, NULL)
@@
expression parent, propname, type;
expression child;
symbol error_abort;
@@
- object_initialize_child(parent, propname, child, sizeof(*child), type, &error_abort, NULL)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
symbol error_abort;
@@
- object_initialize_child(parent, propname, &child, sizeof(child), type, &error_abort, NULL)
+ object_initialize_child(parent, propname, &child, type)
@@
expression parent, propname, type;
expression child, size, err;
expression list props;
@@
- object_initialize_child(parent, propname, child, size, type, err, props)
+ object_initialize_child_with_props(parent, propname, child, size, type, err, props)Note that Coccinelle chokes on ARMSSE typedef vs. macro in hw/arm/armsse.c. Worked around by temporarily renaming the macro for the spatch run.
--- include/qom/object.h | 30 +++++++++++++++++++---- hw/arm/allwinner-a10.c | 5 ++-- hw/arm/allwinner-h3.c | 5 ++-- hw/arm/armsse.c | 26 +++++++------------- hw/arm/aspeed.c | 4 +--- hw/arm/aspeed_ast2600.c | 4 +--- hw/arm/aspeed_soc.c | 4 +--- hw/arm/bcm2836.c | 3 +-- hw/arm/digic.c | 4 +--- hw/arm/exynos4210.c | 3 +-- hw/arm/fsl-imx25.c | 4 +--- hw/arm/fsl-imx31.c | 4 +--- hw/arm/fsl-imx6.c | 5 ++-- hw/arm/fsl-imx6ul.c | 4 ++-- hw/arm/fsl-imx7.c | 5 ++-- hw/arm/imx25_pdk.c | 3 +-- hw/arm/kzm.c | 3 +-- hw/arm/mps2-tz.c | 14 +++++------ hw/arm/musca.c | 14 +++++------ hw/arm/raspi.c | 4 ++-- hw/arm/stm32f405_soc.c | 6 ++--- hw/arm/xlnx-versal.c | 5 ++-- hw/arm/xlnx-zcu102.c | 3 +-- hw/arm/xlnx-zynqmp.c | 16 +++++-------- hw/char/serial-isa.c | 3 +-- hw/char/serial-pci-multi.c | 4 +--- hw/char/serial-pci.c | 3 +-- hw/char/serial.c | 6 ++--- hw/core/sysbus.c | 4 ++-- hw/dma/xilinx_axidma.c | 9 +++---- hw/intc/pnv_xive.c | 6 ++--- hw/intc/spapr_xive.c | 6 ++--- hw/microblaze/xlnx-zynqmp-pmu.c | 7 +++--- hw/misc/macio/macio.c | 10 ++++---- hw/net/xilinx_axienet.c | 9 +++---- hw/pci-host/designware.c | 3 +-- hw/pci-host/gpex.c | 3 +-- hw/pci-host/pnv_phb3.c | 12 ++++------ hw/pci-host/pnv_phb4.c | 6 ++--- hw/pci-host/pnv_phb4_pec.c | 6 ++--- hw/pci-host/q35.c | 3 +-- hw/pci-host/xilinx-pcie.c | 3 +-- hw/ppc/pnv.c | 42 ++++++++++++--------------------- hw/ppc/pnv_psi.c | 6 ++--- hw/ppc/spapr.c | 6 ++--- hw/riscv/riscv_hart.c | 4 +--- hw/riscv/sifive_e.c | 4 +--- hw/riscv/sifive_u.c | 12 +++------- hw/virtio/virtio.c | 5 ++-- qom/object.c | 19 +++++++++++---- 50 files changed, 160 insertions(+), 219 deletions(-)
include/qom/object.h +26 -4
@@ -783,7 +783,7 @@ int object_set_propv(Object *obj,void object_initialize (void *obj,size_t size,const char *typename);/** -* object_initialize_child: +* object_initialize_child_with_props: * @parentobj: The parent object to add a property to * @propname: The name of the property * @childobj: A pointer to the memory to be used for the object.
@@ -803,12 +803,13 @@ void object_initialize(void *obj, size_t size, const char *typename);* If the object implements the user creatable interface, the object will * be marked complete once all the properties have been processed. */ -void object_initialize_child(Object *parentobj, const char *propname, +void object_initialize_child_with_props(Object *parentobj, + const char *propname, void *childobj, size_t size, const char *type, Error **errp, ...) QEMU_SENTINEL;/** -* object_initialize_childv: +* object_initialize_child_with_propsv: * @parentobj: The parent object to add a property to * @propname: The name of the property * @childobj: A pointer to the memory to be used for the object.
@@ -819,10 +820,31 @@ void object_initialize_child(Object *parentobj, const char *propname,* * See object_initialize_child() for documentation. */ -void object_initialize_childv (Object *parentobj,const char *propname, +void object_initialize_child_with_propsv (Object *parentobj, +const char *propname,void *childobj,size_t size,const char *type,Error **errp,va_list vargs); +/** +* object_initialize_child: +* @parent: The parent object to add a property to +* @propname: The name of the property +* @child: A precisely typed pointer to the memory to be used for the +* object. +* @type: The name of the type of the object to instantiate. +* +* This is like +* object_initialize_child_with_props(parent, propname, +* child, sizeof(*child), type, +* &error_abort, NULL) +*/ +#define object_initialize_child (parent, propname, child, type) \ + object_initialize_child_internal((parent), (propname), \ + (child), sizeof(*(child)), (type)) +void object_initialize_child_internal (Object *parent,const char *propname, +void *child,size_t size, +const char *type); +/** * object_dynamic_cast: * @obj: The object to cast.
hw/arm/allwinner-a10.c +2 -3
@@ -41,9 +41,8 @@ static void aw_a10_init(Object *obj) {AwA10State *s =AW_A10 (obj); -object_initialize_child (obj,"cpu" , &s->cpu,sizeof (s->cpu), -ARM_CPU_TYPE_NAME ("cortex-a8" ), - &error_abort,NULL ); +object_initialize_child (obj,"cpu" , &s->cpu, +ARM_CPU_TYPE_NAME ("cortex-a8" ));sysbus_init_child_obj (obj,"intc" , &s->intc,sizeof (s->intc),TYPE_AW_A10_PIC );
hw/arm/allwinner-h3.c +2 -3
@@ -194,9 +194,8 @@ static void allwinner_h3_init(Object *obj) s->memmap = allwinner_h3_memmap;for (int i =0 ; i <AW_H3_NUM_CPUS ; i++) { -object_initialize_child (obj,"cpu[*]" , &s->cpus[i],sizeof (s->cpus[i]), -ARM_CPU_TYPE_NAME ("cortex-a7" ), - &error_abort,NULL ); +object_initialize_child (obj,"cpu[*]" , &s->cpus[i], +ARM_CPU_TYPE_NAME ("cortex-a7" )); } sysbus_init_child_obj(obj, "gic", &s->gic, sizeof(s->gic),
hw/arm/armsse.c +8 -18
@@ -252,9 +252,7 @@ static void armsse_init(Object *obj)char *name; name =g_strdup_printf ("cluster%d" , i); -object_initialize_child (obj, name, &s->cluster[i], -sizeof (s->cluster[i]),TYPE_CPU_CLUSTER , - &error_abort,NULL ); +object_initialize_child (obj, name, &s->cluster[i],TYPE_CPU_CLUSTER );qdev_prop_set_uint32 (DEVICE (&s->cluster[i]),"cluster-id" , i);g_free (name);
@@ -288,15 +286,13 @@ static void armsse_init(Object *obj)g_free (name); }object_initialize_child (obj,"mpc-irq-orgate" , &s->mpc_irq_orgate, -sizeof (s->mpc_irq_orgate),TYPE_OR_IRQ , - &error_abort,NULL ); +TYPE_OR_IRQ );for (i =0 ; i <IOTS_NUM_EXP_MPC + info->sram_banks; i++) {char *name =g_strdup_printf ("mpc-irq-splitter-%d" , i);SplitIRQ *splitter = &s->mpc_irq_splitter[i]; -object_initialize_child (obj, name, splitter,sizeof (*splitter), -TYPE_SPLIT_IRQ , &error_abort,NULL ); +object_initialize_child (obj, name, splitter,TYPE_SPLIT_IRQ );g_free (name); } sysbus_init_child_obj(obj, "timer0", &s->timer0, sizeof(s->timer0),
@@ -376,21 +372,16 @@ static void armsse_init(Object *obj)g_free (name); } } -object_initialize_child (obj,"nmi-orgate" , &s->nmi_orgate, -sizeof (s->nmi_orgate),TYPE_OR_IRQ , - &error_abort,NULL ); +object_initialize_child (obj,"nmi-orgate" , &s->nmi_orgate,TYPE_OR_IRQ );object_initialize_child (obj,"ppc-irq-orgate" , &s->ppc_irq_orgate, -sizeof (s->ppc_irq_orgate),TYPE_OR_IRQ , - &error_abort,NULL ); +TYPE_OR_IRQ );object_initialize_child (obj,"sec-resp-splitter" , &s->sec_resp_splitter, -sizeof (s->sec_resp_splitter),TYPE_SPLIT_IRQ , - &error_abort,NULL ); +TYPE_SPLIT_IRQ );for (i =0 ; i <ARRAY_SIZE (s->ppc_irq_splitter); i++) {char *name =g_strdup_printf ("ppc-irq-splitter-%d" , i);SplitIRQ *splitter = &s->ppc_irq_splitter[i]; -object_initialize_child (obj, name, splitter,sizeof (*splitter), -TYPE_SPLIT_IRQ , &error_abort,NULL ); +object_initialize_child (obj, name, splitter,TYPE_SPLIT_IRQ );g_free (name); }if (info->num_cpus >1 ) {
@@ -399,8 +390,7 @@ static void armsse_init(Object *obj)char *name =g_strdup_printf ("cpu-irq-splitter%d" , i);SplitIRQ *splitter = &s->cpu_irq_splitter[i]; -object_initialize_child (obj, name, splitter,sizeof (*splitter), -TYPE_SPLIT_IRQ , &error_abort,NULL ); +object_initialize_child (obj, name, splitter,TYPE_SPLIT_IRQ );g_free (name); } }
hw/arm/aspeed.c +1 -3
@@ -266,9 +266,7 @@ static void aspeed_machine_init(MachineState *machine) UINT32_MAX);memory_region_add_subregion (&bmc->ram_container,0 , machine->ram); -object_initialize_child (OBJECT (machine),"soc" , &bmc->soc, -sizeof (bmc->soc), amc->soc_name, &error_abort, -NULL ); +object_initialize_child (OBJECT (machine),"soc" , &bmc->soc, amc->soc_name); sc =ASPEED_SOC_GET_CLASS (&bmc->soc);
hw/arm/aspeed_ast2600.c +1 -3
@@ -127,9 +127,7 @@ static void aspeed_soc_ast2600_init(Object *obj) }for (i =0 ; i < sc->num_cpus; i++) { -object_initialize_child (obj,"cpu[*]" ,OBJECT (&s->cpu[i]), -sizeof (s->cpu[i]), sc->cpu_type, - &error_abort,NULL ); +object_initialize_child (obj,"cpu[*]" , &s->cpu[i], sc->cpu_type); }snprintf (typename,sizeof (typename),"aspeed.scu-%s" , socname);
hw/arm/aspeed_soc.c +1 -3
@@ -142,9 +142,7 @@ static void aspeed_soc_init(Object *obj) }for (i =0 ; i < sc->num_cpus; i++) { -object_initialize_child (obj,"cpu[*]" ,OBJECT (&s->cpu[i]), -sizeof (s->cpu[i]), sc->cpu_type, - &error_abort,NULL ); +object_initialize_child (obj,"cpu[*]" , &s->cpu[i], sc->cpu_type); }snprintf (typename,sizeof (typename),"aspeed.scu-%s" , socname);
hw/arm/bcm2836.c +1 -2
@@ -53,8 +53,7 @@ static void bcm2836_init(Object *obj)for (n =0 ; n <BCM283X_NCPUS ; n++) {object_initialize_child (obj,"cpu[*]" , &s->cpu[n].core, -sizeof (s->cpu[n].core), info->cpu_type, - &error_abort,NULL ); + info->cpu_type); } sysbus_init_child_obj(obj, "control", &s->control, sizeof(s->control),
hw/arm/digic.c +1 -3
@@ -36,9 +36,7 @@ static void digic_init(Object *obj)DigicState *s =DIGIC (obj);int i; -object_initialize_child (obj,"cpu" , &s->cpu,sizeof (s->cpu), -ARM_CPU_TYPE_NAME ("arm946" ), - &error_abort,NULL ); +object_initialize_child (obj,"cpu" , &s->cpu,ARM_CPU_TYPE_NAME ("arm946" ));for (i =0 ; i <DIGIC4_NB_TIMERS ; i++) {#define DIGIC_TIMER_NAME_MLEN 11
hw/arm/exynos4210.c +1 -2
@@ -482,8 +482,7 @@ static void exynos4210_init(Object *obj)char *name =g_strdup_printf ("pl330-irq-orgate%d" , i);qemu_or_irq *orgate = &s->pl330_irq_orgate[i]; -object_initialize_child (obj, name, orgate,sizeof (*orgate), -TYPE_OR_IRQ , &error_abort,NULL ); +object_initialize_child (obj, name, orgate,TYPE_OR_IRQ );g_free (name); } }
hw/arm/fsl-imx25.c +1 -3
@@ -38,9 +38,7 @@ static void fsl_imx25_init(Object *obj)FslIMX25State *s =FSL_IMX25 (obj);int i; -object_initialize_child (obj,"cpu" , &s->cpu,sizeof (s->cpu), -ARM_CPU_TYPE_NAME ("arm926" ), - &error_abort,NULL ); +object_initialize_child (obj,"cpu" , &s->cpu,ARM_CPU_TYPE_NAME ("arm926" ));sysbus_init_child_obj (obj,"avic" , &s->avic,sizeof (s->avic),TYPE_IMX_AVIC );
hw/arm/fsl-imx31.c +1 -3
@@ -33,9 +33,7 @@ static void fsl_imx31_init(Object *obj)FslIMX31State *s =FSL_IMX31 (obj);int i; -object_initialize_child (obj,"cpu" , &s->cpu,sizeof (s->cpu), -ARM_CPU_TYPE_NAME ("arm1136" ), - &error_abort,NULL ); +object_initialize_child (obj,"cpu" , &s->cpu,ARM_CPU_TYPE_NAME ("arm1136" ));sysbus_init_child_obj (obj,"avic" , &s->avic,sizeof (s->avic),TYPE_IMX_AVIC );
hw/arm/fsl-imx6.c +2 -3
@@ -43,9 +43,8 @@ static void fsl_imx6_init(Object *obj)for (i =0 ; i <MIN (ms->smp.cpus,FSL_IMX6_NUM_CPUS ); i++) {snprintf (name,NAME_SIZE ,"cpu%d" , i); -object_initialize_child (obj, name, &s->cpu[i],sizeof (s->cpu[i]), -ARM_CPU_TYPE_NAME ("cortex-a9" ), - &error_abort,NULL ); +object_initialize_child (obj, name, &s->cpu[i], +ARM_CPU_TYPE_NAME ("cortex-a9" )); } sysbus_init_child_obj(obj, "a9mpcore", &s->a9mpcore, sizeof(s->a9mpcore),
hw/arm/fsl-imx6ul.c +2 -2
@@ -34,8 +34,8 @@ static void fsl_imx6ul_init(Object *obj)char name[NAME_SIZE ];int i; -object_initialize_child (obj,"cpu0" , &s->cpu,sizeof (s->cpu), -ARM_CPU_TYPE_NAME ("cortex-a7" ), &error_abort,NULL ); +object_initialize_child (obj,"cpu0" , &s->cpu, +ARM_CPU_TYPE_NAME ("cortex-a7" ));/* * A7MPCORE
hw/arm/fsl-imx7.c +2 -3
@@ -38,9 +38,8 @@ static void fsl_imx7_init(Object *obj)for (i =0 ; i <MIN (ms->smp.cpus,FSL_IMX7_NUM_CPUS ); i++) {snprintf (name,NAME_SIZE ,"cpu%d" , i); -object_initialize_child (obj, name, &s->cpu[i],sizeof (s->cpu[i]), -ARM_CPU_TYPE_NAME ("cortex-a7" ), &error_abort, -NULL ); +object_initialize_child (obj, name, &s->cpu[i], +ARM_CPU_TYPE_NAME ("cortex-a7" )); }/*
hw/arm/imx25_pdk.c +1 -2
@@ -73,8 +73,7 @@ static void imx25_pdk_init(MachineState *machine)unsigned int alias_offset;int i; -object_initialize_child (OBJECT (machine),"soc" , &s->soc,sizeof (s->soc), -TYPE_FSL_IMX25 , &error_abort,NULL ); +object_initialize_child (OBJECT (machine),"soc" , &s->soc,TYPE_FSL_IMX25 );object_property_set_bool (OBJECT (&s->soc), true,"realized" , &error_fatal);
hw/arm/kzm.c +1 -2
@@ -71,8 +71,7 @@ static void kzm_init(MachineState *machine)unsigned int alias_offset;unsigned int i; -object_initialize_child (OBJECT (machine),"soc" , &s->soc,sizeof (s->soc), -TYPE_FSL_IMX31 , &error_abort,NULL ); +object_initialize_child (OBJECT (machine),"soc" , &s->soc,TYPE_FSL_IMX31 );object_property_set_bool (OBJECT (&s->soc), true,"realized" , &error_fatal);
hw/arm/mps2-tz.c +6 -8
@@ -414,9 +414,10 @@ static void mps2tz_common_init(MachineState *machine)char *name =g_strdup_printf ("mps2-irq-splitter%d" , i);SplitIRQ *splitter = &mms->cpu_irq_splitter[i]; -object_initialize_child (OBJECT (machine), name, - splitter,sizeof (*splitter), -TYPE_SPLIT_IRQ , &error_fatal,NULL ); +object_initialize_child_with_props (OBJECT (machine), name, + splitter,sizeof (*splitter), +TYPE_SPLIT_IRQ , &error_fatal, +NULL );g_free (name); object_property_set_int(OBJECT(splitter), 2, "num-lines",
@@ -436,9 +437,7 @@ static void mps2tz_common_init(MachineState *machine)* lines, one for each of the PPCs we create here, plus one per MSC. */ object_initialize_child (OBJECT (machine),"sec-resp-splitter" , - &mms->sec_resp_splitter, -sizeof (mms->sec_resp_splitter), -TYPE_SPLIT_IRQ , &error_abort,NULL ); + &mms->sec_resp_splitter,TYPE_SPLIT_IRQ );object_property_set_int (OBJECT (&mms->sec_resp_splitter),ARRAY_SIZE (mms->ppc) +ARRAY_SIZE (mms->msc),"num-lines" , &error_fatal);
@@ -472,8 +471,7 @@ static void mps2tz_common_init(MachineState *machine)* Create the OR gate for this. */ object_initialize_child (OBJECT (mms),"uart-irq-orgate" , - &mms->uart_irq_orgate,sizeof (mms->uart_irq_orgate), -TYPE_OR_IRQ , &error_abort,NULL ); + &mms->uart_irq_orgate,TYPE_OR_IRQ );object_property_set_int (OBJECT (&mms->uart_irq_orgate),10 ,"num-lines" , &error_fatal); object_property_set_bool(OBJECT(&mms->uart_irq_orgate), true,
hw/arm/musca.c +7 -7
@@ -404,9 +404,9 @@ static void musca_init(MachineState *machine)char *name =g_strdup_printf ("musca-irq-splitter%d" , i);SplitIRQ *splitter = &mms->cpu_irq_splitter[i]; -object_initialize_child (OBJECT (machine), name, - splitter,sizeof (*splitter), -TYPE_SPLIT_IRQ , &error_fatal,NULL ); +object_initialize_child_with_props (OBJECT (machine), name, splitter, +sizeof (*splitter),TYPE_SPLIT_IRQ , + &error_fatal,NULL );g_free (name); object_property_set_int(OBJECT(splitter), 2, "num-lines",
@@ -424,10 +424,10 @@ static void musca_init(MachineState *machine)* The sec_resp_cfg output from the SSE-200 must be split into multiple * lines, one for each of the PPCs we create here. */ -object_initialize_child (OBJECT (machine),"sec-resp-splitter" , - &mms->sec_resp_splitter, -sizeof (mms->sec_resp_splitter), -TYPE_SPLIT_IRQ , &error_fatal,NULL ); +object_initialize_child_with_props (OBJECT (machine),"sec-resp-splitter" , + &mms->sec_resp_splitter, +sizeof (mms->sec_resp_splitter), +TYPE_SPLIT_IRQ , &error_fatal,NULL );object_property_set_int (OBJECT (&mms->sec_resp_splitter),ARRAY_SIZE (mms->ppc),"num-lines" , &error_fatal);
hw/arm/raspi.c +2 -2
@@ -282,8 +282,8 @@ static void raspi_machine_init(MachineState *machine) machine->ram, 0);/* Setup the SOC */ -object_initialize_child (OBJECT (machine),"soc" , &s->soc,sizeof (s->soc), -board_soc_type (board_rev), &error_abort,NULL ); +object_initialize_child (OBJECT (machine),"soc" , &s->soc, +board_soc_type (board_rev));object_property_add_const_link (OBJECT (&s->soc),"ram" ,OBJECT (machine->ram));object_property_set_int (OBJECT (&s->soc), board_rev,"board-rev" , &error_abort);
hw/arm/stm32f405_soc.c +3 -3
@@ -168,9 +168,9 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp) }/* ADC device, the IRQs are ORed together */ -object_initialize_child (OBJECT (s),"adc-orirq" , &s->adc_irqs, -sizeof (s->adc_irqs),TYPE_OR_IRQ , - &err,NULL ); +object_initialize_child_with_props (OBJECT (s),"adc-orirq" , &s->adc_irqs, +sizeof (s->adc_irqs),TYPE_OR_IRQ , &err, +NULL );if (err !=NULL ) {error_propagate (errp, err);return ;
hw/arm/xlnx-versal.c +2 -3
@@ -32,9 +32,8 @@ static void versal_create_apu_cpus(Versal *s)for (i =0 ; i <ARRAY_SIZE (s->fpd.apu.cpu); i++) {Object *obj; -object_initialize_child (OBJECT (s),"apu-cpu[*]" , - &s->fpd.apu.cpu[i],sizeof (s->fpd.apu.cpu[i]), -XLNX_VERSAL_ACPU_TYPE , &error_abort,NULL ); +object_initialize_child (OBJECT (s),"apu-cpu[*]" , &s->fpd.apu.cpu[i], +XLNX_VERSAL_ACPU_TYPE ); obj =OBJECT (&s->fpd.apu.cpu[i]);object_property_set_int (obj, s->cfg.psci_conduit,"psci-conduit" , &error_abort);
hw/arm/xlnx-zcu102.c +1 -2
@@ -116,8 +116,7 @@ static void xlnx_zcu102_init(MachineState *machine) ram_size); } -object_initialize_child (OBJECT (machine),"soc" , &s->soc,sizeof (s->soc), -TYPE_XLNX_ZYNQMP , &error_abort,NULL ); +object_initialize_child (OBJECT (machine),"soc" , &s->soc,TYPE_XLNX_ZYNQMP );object_property_set_link (OBJECT (&s->soc),OBJECT (machine->ram),"ddr-ram" , &error_abort);
hw/arm/xlnx-zynqmp.c +6 -10
@@ -187,17 +187,15 @@ static void xlnx_zynqmp_create_rpu(MachineState *ms, XlnxZynqMPState *s, }object_initialize_child (OBJECT (s),"rpu-cluster" , &s->rpu_cluster, -sizeof (s->rpu_cluster),TYPE_CPU_CLUSTER , - &error_abort,NULL ); +TYPE_CPU_CLUSTER );qdev_prop_set_uint32 (DEVICE (&s->rpu_cluster),"cluster-id" ,1 );for (i =0 ; i < num_rpus; i++) {char *name;object_initialize_child (OBJECT (&s->rpu_cluster),"rpu-cpu[*]" , - &s->rpu_cpu[i],sizeof (s->rpu_cpu[i]), -ARM_CPU_TYPE_NAME ("cortex-r5f" ), - &error_abort,NULL ); + &s->rpu_cpu[i], +ARM_CPU_TYPE_NAME ("cortex-r5f" )); name =object_get_canonical_path_component (OBJECT (&s->rpu_cpu[i]));if (strcmp (name, boot_cpu)) {
@@ -230,15 +228,13 @@ static void xlnx_zynqmp_init(Object *obj)int num_apus =MIN (ms->smp.cpus,XLNX_ZYNQMP_NUM_APU_CPUS );object_initialize_child (obj,"apu-cluster" , &s->apu_cluster, -sizeof (s->apu_cluster),TYPE_CPU_CLUSTER , - &error_abort,NULL ); +TYPE_CPU_CLUSTER );qdev_prop_set_uint32 (DEVICE (&s->apu_cluster),"cluster-id" ,0 );for (i =0 ; i < num_apus; i++) {object_initialize_child (OBJECT (&s->apu_cluster),"apu-cpu[*]" , - &s->apu_cpu[i],sizeof (s->apu_cpu[i]), -ARM_CPU_TYPE_NAME ("cortex-a53" ), - &error_abort,NULL ); + &s->apu_cpu[i], +ARM_CPU_TYPE_NAME ("cortex-a53" )); } sysbus_init_child_obj(obj, "gic", &s->gic, sizeof(s->gic),
hw/char/serial-isa.c +1 -2
@@ -114,8 +114,7 @@ static void serial_isa_initfn(Object *o) {ISASerialState *self =ISA_SERIAL (o); -object_initialize_child (o,"serial" , &self->state,sizeof (self->state), -TYPE_SERIAL , &error_abort,NULL ); +object_initialize_child (o,"serial" , &self->state,TYPE_SERIAL ); }static const TypeInfo serial_isa_info = {
hw/char/serial-pci-multi.c +1 -3
@@ -187,9 +187,7 @@ static void multi_serial_init(Object *o)size_t i, nports =multi_serial_get_port_count (PCI_DEVICE_GET_CLASS (dev));for (i =0 ; i < nports; i++) { -object_initialize_child (o,"serial[*]" , &pms->state[i], -sizeof (pms->state[i]), -TYPE_SERIAL , &error_abort,NULL ); +object_initialize_child (o,"serial[*]" , &pms->state[i],TYPE_SERIAL ); } }
hw/char/serial-pci.c +1 -2
@@ -108,8 +108,7 @@ static void serial_pci_init(Object *o) {PCISerialState *ps =PCI_SERIAL (o); -object_initialize_child (o,"serial" , &ps->state,sizeof (ps->state), -TYPE_SERIAL , &error_abort,NULL ); +object_initialize_child (o,"serial" , &ps->state,TYPE_SERIAL ); }static const TypeInfo serial_pci_info = {
hw/char/serial.c +2 -4
@@ -1014,8 +1014,7 @@ static void serial_io_instance_init(Object *o) {SerialIO *sio =SERIAL_IO (o); -object_initialize_child (o,"serial" , &sio->serial,sizeof (sio->serial), -TYPE_SERIAL , &error_abort,NULL ); +object_initialize_child (o,"serial" , &sio->serial,TYPE_SERIAL );qdev_alias_all_properties (DEVICE (&sio->serial), o); }
@@ -1148,8 +1147,7 @@ static void serial_mm_instance_init(Object *o) {SerialMM *smm =SERIAL_MM (o); -object_initialize_child (o,"serial" , &smm->serial,sizeof (smm->serial), -TYPE_SERIAL , &error_abort,NULL ); +object_initialize_child (o,"serial" , &smm->serial,TYPE_SERIAL );qdev_alias_all_properties (DEVICE (&smm->serial), o); }
hw/core/sysbus.c +2 -2
@@ -348,8 +348,8 @@ BusState *sysbus_get_default(void)void sysbus_init_child_obj (Object *parent,const char *childname,void *child,size_t childsize,const char *childtype) { -object_initialize_child (parent, childname, child, childsize, childtype, - &error_abort,NULL ); +object_initialize_child_with_props (parent, childname, child, childsize, + childtype, &error_abort,NULL );qdev_set_parent_bus (DEVICE (child),sysbus_get_default ()); }
hw/dma/xilinx_axidma.c +3 -6
@@ -579,13 +579,10 @@ static void xilinx_axidma_init(Object *obj)SysBusDevice *sbd =SYS_BUS_DEVICE (obj);object_initialize_child (OBJECT (s),"axistream-connected-target" , - &s->rx_data_dev,sizeof (s->rx_data_dev), -TYPE_XILINX_AXI_DMA_DATA_STREAM , &error_abort, -NULL ); + &s->rx_data_dev,TYPE_XILINX_AXI_DMA_DATA_STREAM );object_initialize_child (OBJECT (s),"axistream-control-connected-target" , - &s->rx_control_dev,sizeof (s->rx_control_dev), -TYPE_XILINX_AXI_DMA_CONTROL_STREAM , &error_abort, -NULL ); + &s->rx_control_dev, +TYPE_XILINX_AXI_DMA_CONTROL_STREAM ); object_property_add_link(obj, "dma", TYPE_MEMORY_REGION, (Object **)&s->dma_mr, qdev_prop_allow_set_link_before_realize,
hw/intc/pnv_xive.c +2 -4
@@ -1796,11 +1796,9 @@ static void pnv_xive_init(Object *obj)PnvXive *xive =PNV_XIVE (obj);object_initialize_child (obj,"ipi_source" , &xive->ipi_source, -sizeof (xive->ipi_source),TYPE_XIVE_SOURCE , - &error_abort,NULL ); +TYPE_XIVE_SOURCE );object_initialize_child (obj,"end_source" , &xive->end_source, -sizeof (xive->end_source),TYPE_XIVE_END_SOURCE , - &error_abort,NULL ); +TYPE_XIVE_END_SOURCE ); }/*
hw/intc/spapr_xive.c +2 -4
@@ -272,12 +272,10 @@ static void spapr_xive_instance_init(Object *obj) {SpaprXive *xive =SPAPR_XIVE (obj); -object_initialize_child (obj,"source" , &xive->source,sizeof (xive->source), -TYPE_XIVE_SOURCE , &error_abort,NULL ); +object_initialize_child (obj,"source" , &xive->source,TYPE_XIVE_SOURCE );object_initialize_child (obj,"end_source" , &xive->end_source, -sizeof (xive->end_source),TYPE_XIVE_END_SOURCE , - &error_abort,NULL ); +TYPE_XIVE_END_SOURCE );/* Not connected to the KVM XIVE device */ xive->fd =-1 ;
hw/microblaze/xlnx-zynqmp-pmu.c +3 -4
@@ -61,8 +61,7 @@ static void xlnx_zynqmp_pmu_soc_init(Object *obj) {XlnxZynqMPPMUSoCState *s =XLNX_ZYNQMP_PMU_SOC (obj); -object_initialize_child (obj,"pmu-cpu" , &s->cpu,sizeof (s->cpu), -TYPE_MICROBLAZE_CPU , &error_abort,NULL ); +object_initialize_child (obj,"pmu-cpu" , &s->cpu,TYPE_MICROBLAZE_CPU );sysbus_init_child_obj (obj,"intc" , &s->intc,sizeof (s->intc),TYPE_XLNX_PMU_IO_INTC );
@@ -174,8 +173,8 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine) pmu_ram);/* Create the PMU device */ -object_initialize_child (OBJECT (machine),"pmu" , pmu,sizeof (*pmu), -TYPE_XLNX_ZYNQMP_PMU_SOC , &error_abort,NULL ); +object_initialize_child (OBJECT (machine),"pmu" , pmu, +TYPE_XLNX_ZYNQMP_PMU_SOC );object_property_set_bool (OBJECT (pmu), true,"realized" , &error_fatal);/* Load the kernel */
hw/misc/macio/macio.c +4 -6
@@ -98,8 +98,8 @@ static void macio_init_child_obj(MacIOState *s, const char *childname, void *child, size_t childsize, const char *childtype) { -object_initialize_child (OBJECT (s ),childname ,child ,childsize ,childtype , - &error_abort, NULL); +object_initialize_child_with_props (OBJECT (s ),childname ,child ,childsize , + childtype, &error_abort, NULL);qdev_set_parent_bus (DEVICE (child),BUS (&s->macio_bus)); }
@@ -351,8 +351,7 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)object_property_set_bool (OBJECT (&ns->gpio), true,"realized" , &err);/* PMU */ -object_initialize_child (OBJECT (s),"pmu" , &s->pmu,sizeof (s->pmu), -TYPE_VIA_PMU , &error_abort,NULL ); +object_initialize_child (OBJECT (s),"pmu" , &s->pmu,TYPE_VIA_PMU );object_property_set_link (OBJECT (&s->pmu),OBJECT (sysbus_dev),"gpio" , &error_abort);qdev_prop_set_bit (DEVICE (&s->pmu),"has-adb" , ns->has_adb);
@@ -370,8 +369,7 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)object_unparent (OBJECT (&ns->gpio));/* CUDA */ -object_initialize_child (OBJECT (s),"cuda" , &s->cuda,sizeof (s->cuda), -TYPE_CUDA , &error_abort,NULL ); +object_initialize_child (OBJECT (s),"cuda" , &s->cuda,TYPE_CUDA );qdev_prop_set_uint64 (DEVICE (&s->cuda),"timebase-frequency" , s->frequency);
hw/net/xilinx_axienet.c +3 -6
@@ -1020,13 +1020,10 @@ static void xilinx_enet_init(Object *obj)SysBusDevice *sbd =SYS_BUS_DEVICE (obj);object_initialize_child (OBJECT (s),"axistream-connected-target" , - &s->rx_data_dev,sizeof (s->rx_data_dev), -TYPE_XILINX_AXI_ENET_DATA_STREAM , &error_abort, -NULL ); + &s->rx_data_dev,TYPE_XILINX_AXI_ENET_DATA_STREAM );object_initialize_child (OBJECT (s),"axistream-control-connected-target" , - &s->rx_control_dev,sizeof (s->rx_control_dev), -TYPE_XILINX_AXI_ENET_CONTROL_STREAM , &error_abort, -NULL ); + &s->rx_control_dev, +TYPE_XILINX_AXI_ENET_CONTROL_STREAM );sysbus_init_irq (sbd, &s->irq);memory_region_init_io (&s->iomem,OBJECT (s), &enet_ops, s,"enet" ,0x40000 );
hw/pci-host/designware.c +1 -2
@@ -722,8 +722,7 @@ static void designware_pcie_host_init(Object *obj)DesignwarePCIEHost *s =DESIGNWARE_PCIE_HOST (obj);DesignwarePCIERoot *root = &s->root; -object_initialize_child (obj,"root" , root,sizeof (*root), -TYPE_DESIGNWARE_PCIE_ROOT , &error_abort,NULL ); +object_initialize_child (obj,"root" , root,TYPE_DESIGNWARE_PCIE_ROOT );qdev_prop_set_int32 (DEVICE (root),"addr" ,PCI_DEVFN (0 ,0 ));qdev_prop_set_bit (DEVICE (root),"multifunction" , false); }
hw/pci-host/gpex.c +1 -2
@@ -124,8 +124,7 @@ static void gpex_host_initfn(Object *obj)GPEXHost *s =GPEX_HOST (obj);GPEXRootState *root = &s->gpex_root; -object_initialize_child (obj,"gpex_root" , root,sizeof (*root), -TYPE_GPEX_ROOT_DEVICE , &error_abort,NULL ); +object_initialize_child (obj,"gpex_root" , root,TYPE_GPEX_ROOT_DEVICE );qdev_prop_set_int32 (DEVICE (root),"addr" ,PCI_DEVFN (0 ,0 ));qdev_prop_set_bit (DEVICE (root),"multifunction" , false); }
hw/pci-host/pnv_phb3.c +4 -8
@@ -968,23 +968,19 @@ static void pnv_phb3_instance_init(Object *obj)QLIST_INIT (&phb->dma_spaces);/* LSI sources */ -object_initialize_child (obj,"lsi" , &phb->lsis,sizeof (phb->lsis), -TYPE_ICS , &error_abort,NULL ); +object_initialize_child (obj,"lsi" , &phb->lsis,TYPE_ICS );/* Default init ... will be fixed by HW inits */ phb->lsis.offset =0 ;/* MSI sources */ -object_initialize_child (obj,"msi" , &phb->msis,sizeof (phb->msis), -TYPE_PHB3_MSI , &error_abort,NULL ); +object_initialize_child (obj,"msi" , &phb->msis,TYPE_PHB3_MSI );/* Power Bus Common Queue */ -object_initialize_child (obj,"pbcq" , &phb->pbcq,sizeof (phb->pbcq), -TYPE_PNV_PBCQ , &error_abort,NULL ); +object_initialize_child (obj,"pbcq" , &phb->pbcq,TYPE_PNV_PBCQ );/* Root Port */ -object_initialize_child (obj,"root" , &phb->root,sizeof (phb->root), -TYPE_PNV_PHB3_ROOT_PORT , &error_abort,NULL ); +object_initialize_child (obj,"root" , &phb->root,TYPE_PNV_PHB3_ROOT_PORT );qdev_prop_set_int32 (DEVICE (&phb->root),"addr" ,PCI_DEVFN (0 ,0 ));qdev_prop_set_bit (DEVICE (&phb->root),"multifunction" , false); }
hw/pci-host/pnv_phb4.c +2 -4
@@ -1155,12 +1155,10 @@ static void pnv_phb4_instance_init(Object *obj)QLIST_INIT (&phb->dma_spaces);/* XIVE interrupt source object */ -object_initialize_child (obj,"source" , &phb->xsrc,sizeof (phb->xsrc), -TYPE_XIVE_SOURCE , &error_abort,NULL ); +object_initialize_child (obj,"source" , &phb->xsrc,TYPE_XIVE_SOURCE );/* Root Port */ -object_initialize_child (obj,"root" , &phb->root,sizeof (phb->root), -TYPE_PNV_PHB4_ROOT_PORT , &error_abort,NULL ); +object_initialize_child (obj,"root" , &phb->root,TYPE_PNV_PHB4_ROOT_PORT );qdev_prop_set_int32 (DEVICE (&phb->root),"addr" ,PCI_DEVFN (0 ,0 ));qdev_prop_set_bit (DEVICE (&phb->root),"multifunction" , false);
hw/pci-host/pnv_phb4_pec.c +2 -4
@@ -370,8 +370,7 @@ static void pnv_pec_instance_init(Object *obj)for (i =0 ; i <PHB4_PEC_MAX_STACKS ; i++) {object_initialize_child (obj,"stack[*]" , &pec->stacks[i], -sizeof (pec->stacks[i]),TYPE_PNV_PHB4_PEC_STACK , - &error_abort,NULL ); +TYPE_PNV_PHB4_PEC_STACK ); } }
@@ -522,8 +521,7 @@ static void pnv_pec_stk_instance_init(Object *obj) {PnvPhb4PecStack *stack =PNV_PHB4_PEC_STACK (obj); -object_initialize_child (obj,"phb" , &stack->phb,sizeof (stack->phb), -TYPE_PNV_PHB4 , &error_abort,NULL ); +object_initialize_child (obj,"phb" , &stack->phb,TYPE_PNV_PHB4 ); }static void pnv_pec_stk_realize (DeviceState *dev,Error **errp)
hw/pci-host/q35.c +1 -2
@@ -212,8 +212,7 @@ static void q35_host_initfn(Object *obj)memory_region_init_io (&phb->data_mem, obj, &pci_host_data_le_ops, phb,"pci-conf-data" ,4 ); -object_initialize_child (OBJECT (s),"mch" , &s->mch,sizeof (s->mch), -TYPE_MCH_PCI_DEVICE , &error_abort,NULL ); +object_initialize_child (OBJECT (s),"mch" , &s->mch,TYPE_MCH_PCI_DEVICE );qdev_prop_set_int32 (DEVICE (&s->mch),"addr" ,PCI_DEVFN (0 ,0 ));qdev_prop_set_bit (DEVICE (&s->mch),"multifunction" , false);/* mch's object_initialize resets the default value, set it again */
hw/pci-host/xilinx-pcie.c +1 -2
@@ -151,8 +151,7 @@ static void xilinx_pcie_host_init(Object *obj)XilinxPCIEHost *s =XILINX_PCIE_HOST (obj);XilinxPCIERoot *root = &s->root; -object_initialize_child (obj,"root" , root,sizeof (*root), -TYPE_XILINX_PCIE_ROOT , &error_abort,NULL ); +object_initialize_child (obj,"root" , root,TYPE_XILINX_PCIE_ROOT );qdev_prop_set_int32 (DEVICE (root),"addr" ,PCI_DEVFN (0 ,0 ));qdev_prop_set_bit (DEVICE (root),"multifunction" , false); }
hw/ppc/pnv.c +15 -27
77 lines not on this page · raw message
hw/ppc/pnv_psi.c +2 -4
@@ -483,8 +483,7 @@ static void pnv_psi_power8_instance_init(Object *obj) {Pnv8Psi *psi8 =PNV8_PSI (obj); -object_initialize_child (obj,"ics-psi" , &psi8->ics,sizeof (psi8->ics), -TYPE_ICS , &error_abort,NULL ); +object_initialize_child (obj,"ics-psi" , &psi8->ics,TYPE_ICS );object_property_add_alias (obj,ICS_PROP_XICS ,OBJECT (&psi8->ics),ICS_PROP_XICS ); }
@@ -836,8 +835,7 @@ static void pnv_psi_power9_instance_init(Object *obj) {Pnv9Psi *psi =PNV9_PSI (obj); -object_initialize_child (obj,"source" , &psi->source,sizeof (psi->source), -TYPE_XIVE_SOURCE , &error_abort,NULL ); +object_initialize_child (obj,"source" , &psi->source,TYPE_XIVE_SOURCE ); }static void pnv_psi_power9_realize (DeviceState *dev,Error **errp)
hw/ppc/spapr.c +3 -3
@@ -1726,9 +1726,9 @@ static void spapr_create_nvram(SpaprMachineState *spapr)static void spapr_rtc_create (SpaprMachineState *spapr) { -object_initialize_child (OBJECT (spapr),"rtc" , - &spapr->rtc,sizeof (spapr->rtc),TYPE_SPAPR_RTC , - &error_fatal,NULL ); +object_initialize_child_with_props (OBJECT (spapr),"rtc" , &spapr->rtc, +sizeof (spapr->rtc),TYPE_SPAPR_RTC , + &error_fatal,NULL );object_property_set_bool (OBJECT (&spapr->rtc), true,"realized" , &error_fatal); object_property_add_alias(OBJECT(spapr), "rtc-time", OBJECT(&spapr->rtc),
hw/riscv/riscv_hart.c +1 -3
@@ -45,9 +45,7 @@ static void riscv_hart_realize(RISCVHartArrayState *s, int idx, {Error *err =NULL ; -object_initialize_child (OBJECT (s),"harts[*]" , &s->harts[idx], -sizeof (s->harts[idx]), cpu_type, - &error_abort,NULL ); +object_initialize_child (OBJECT (s),"harts[*]" , &s->harts[idx], cpu_type); s->harts[idx].env.mhartid = s->hartid_base + idx;qemu_register_reset (riscv_harts_cpu_reset, &s->harts[idx]); object_property_set_bool(OBJECT(&s->harts[idx]), true,
hw/riscv/sifive_e.c +1 -3
@@ -85,9 +85,7 @@ static void riscv_sifive_e_init(MachineState *machine)int i;/* Initialize SoC */ -object_initialize_child (OBJECT (machine),"soc" , &s->soc, -sizeof (s->soc),TYPE_RISCV_E_SOC , - &error_abort,NULL ); +object_initialize_child (OBJECT (machine),"soc" , &s->soc,TYPE_RISCV_E_SOC );object_property_set_bool (OBJECT (&s->soc), true,"realized" , &error_abort);
hw/riscv/sifive_u.c +3 -9
@@ -328,9 +328,7 @@ static void sifive_u_machine_init(MachineState *machine)int i;/* Initialize SoC */ -object_initialize_child (OBJECT (machine),"soc" , &s->soc, -sizeof (s->soc),TYPE_RISCV_U_SOC , - &error_abort,NULL ); +object_initialize_child (OBJECT (machine),"soc" , &s->soc,TYPE_RISCV_U_SOC );object_property_set_uint (OBJECT (&s->soc), s->serial,"serial" , &error_abort); object_property_set_bool(OBJECT(&s->soc), true, "realized",
@@ -486,9 +484,7 @@ static void riscv_sifive_u_soc_init(Object *obj)MachineState *ms =MACHINE (qdev_get_machine ());SiFiveUSoCState *s =RISCV_U_SOC (obj); -object_initialize_child (obj,"e-cluster" , &s->e_cluster, -sizeof (s->e_cluster),TYPE_CPU_CLUSTER , - &error_abort,NULL ); +object_initialize_child (obj,"e-cluster" , &s->e_cluster,TYPE_CPU_CLUSTER );qdev_prop_set_uint32 (DEVICE (&s->e_cluster),"cluster-id" ,0 ); sysbus_init_child_obj(OBJECT(&s->e_cluster), "e-cpus",
@@ -498,9 +494,7 @@ static void riscv_sifive_u_soc_init(Object *obj)qdev_prop_set_uint32 (DEVICE (&s->e_cpus),"hartid-base" ,0 );qdev_prop_set_string (DEVICE (&s->e_cpus),"cpu-type" ,SIFIVE_E_CPU ); -object_initialize_child (obj,"u-cluster" , &s->u_cluster, -sizeof (s->u_cluster),TYPE_CPU_CLUSTER , - &error_abort,NULL ); +object_initialize_child (obj,"u-cluster" , &s->u_cluster,TYPE_CPU_CLUSTER );qdev_prop_set_uint32 (DEVICE (&s->u_cluster),"cluster-id" ,1 ); sysbus_init_child_obj(OBJECT(&s->u_cluster), "u-cpus",
hw/virtio/virtio.c +3 -2
@@ -3230,8 +3230,9 @@ void virtio_instance_init_common(Object *proxy_obj, void *data, {DeviceState *vdev = data; -object_initialize_child (proxy_obj,"virtio-backend" , vdev, vdev_size, - vdev_name, &error_abort,NULL ); +object_initialize_child_with_props (proxy_obj,"virtio-backend" , vdev, + vdev_size, vdev_name, &error_abort, +NULL );qdev_alias_all_properties (vdev, proxy_obj); }
qom/object.c +15 -4
@@ -529,19 +529,21 @@ void object_initialize(void *data, size_t size, const char *typename)object_initialize_with_type (data, size, type); } -void object_initialize_child (Object *parentobj,const char *propname, +void object_initialize_child_with_props (Object *parentobj, +const char *propname,void *childobj,size_t size,const char *type,Error **errp, ...) {va_list vargs;va_start (vargs, errp); -object_initialize_childv (parentobj, propname, childobj, size, type, errp, - vargs); +object_initialize_child_with_propsv (parentobj, propname, + childobj, size, type, errp, vargs);va_end (vargs); } -void object_initialize_childv (Object *parentobj,const char *propname, +void object_initialize_child_with_propsv (Object *parentobj, +const char *propname,void *childobj,size_t size,const char *type,Error **errp,va_list vargs) {
@@ -582,6 +584,15 @@ out:error_propagate (errp, local_err); } +void object_initialize_child_internal (Object *parent, +const char *propname, +void *child,size_t size, +const char *type) +{ +object_initialize_child_with_props (parent, propname, child, size, type, + &error_abort,NULL ); +} +static inline bool object_property_is_child (ObjectProperty *prop) {return strstart (prop->type,"child<" ,NULL );
Signature · 1 line
2.21.1
Re: [PATCH 34/55] qom: Less verbose object_initialize_child()
On Tue, May 19, 2020 at 8:04 AM Markus Armbruster
Quoted 46 lines · <[email protected]> wrote:
All users of
object_initialize_child()pass the obvious child size argument. Almost all pass&error_abortand no properties. Tiresome.Rename
object_initialize_child()toobject_initialize_child_with_props()to free the name. New convenience wrapperobject_initialize_child()automates the size argument, and passes&error_abortand no properties.Rename
object_initialize_childv()toobject_initialize_child_with_propsv()for consistency.Convert callers with this Coccinelle script:
@@ expression parent, propname, type; expression child, size; symbol error_abort; @@ - object_initialize_child(parent, propname, OBJECT(child), size, type, &error_abort, NULL) + object_initialize_child(parent, propname, child, size, type, &error_abort, NULL) @@ expression parent, propname, type; expression child; symbol error_abort; @@ - object_initialize_child(parent, propname, child, sizeof(*child), type, &error_abort, NULL) + object_initialize_child(parent, propname, child, type) @@ expression parent, propname, type; expression child; symbol error_abort; @@ - object_initialize_child(parent, propname, &child, sizeof(child), type, &error_abort, NULL) + object_initialize_child(parent, propname, &child, type) @@ expression parent, propname, type; expression child, size, err; expression list props; @@ - object_initialize_child(parent, propname, child, size, type, err, props) + object_initialize_child_with_props(parent, propname, child, size, type, err, props)
Quoted 5 lines
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c. Worked around by temporarily renaming the macro for the spatch run.Signed-off-by Markus Armbruster <[email protected]>
Alistair
Quoted 1,197 lines
--- include/qom/object.h | 30 +++++++++++++++++++---- hw/arm/allwinner-a10.c | 5 ++-- hw/arm/allwinner-h3.c | 5 ++-- hw/arm/armsse.c | 26 +++++++------------- hw/arm/aspeed.c | 4 +--- hw/arm/aspeed_ast2600.c | 4 +--- hw/arm/aspeed_soc.c | 4 +--- hw/arm/bcm2836.c | 3 +-- hw/arm/digic.c | 4 +--- hw/arm/exynos4210.c | 3 +-- hw/arm/fsl-imx25.c | 4 +--- hw/arm/fsl-imx31.c | 4 +--- hw/arm/fsl-imx6.c | 5 ++-- hw/arm/fsl-imx6ul.c | 4 ++-- hw/arm/fsl-imx7.c | 5 ++-- hw/arm/imx25_pdk.c | 3 +-- hw/arm/kzm.c | 3 +-- hw/arm/mps2-tz.c | 14 +++++------ hw/arm/musca.c | 14 +++++------ hw/arm/raspi.c | 4 ++-- hw/arm/stm32f405_soc.c | 6 ++--- hw/arm/xlnx-versal.c | 5 ++-- hw/arm/xlnx-zcu102.c | 3 +-- hw/arm/xlnx-zynqmp.c | 16 +++++-------- hw/char/serial-isa.c | 3 +-- hw/char/serial-pci-multi.c | 4 +--- hw/char/serial-pci.c | 3 +-- hw/char/serial.c | 6 ++--- hw/core/sysbus.c | 4 ++-- hw/dma/xilinx_axidma.c | 9 +++---- hw/intc/pnv_xive.c | 6 ++--- hw/intc/spapr_xive.c | 6 ++--- hw/microblaze/xlnx-zynqmp-pmu.c | 7 +++--- hw/misc/macio/macio.c | 10 ++++---- hw/net/xilinx_axienet.c | 9 +++---- hw/pci-host/designware.c | 3 +-- hw/pci-host/gpex.c | 3 +-- hw/pci-host/pnv_phb3.c | 12 ++++------ hw/pci-host/pnv_phb4.c | 6 ++--- hw/pci-host/pnv_phb4_pec.c | 6 ++--- hw/pci-host/q35.c | 3 +-- hw/pci-host/xilinx-pcie.c | 3 +-- hw/ppc/pnv.c | 42 ++++++++++++--------------------- hw/ppc/pnv_psi.c | 6 ++--- hw/ppc/spapr.c | 6 ++--- hw/riscv/riscv_hart.c | 4 +--- hw/riscv/sifive_e.c | 4 +--- hw/riscv/sifive_u.c | 12 +++------- hw/virtio/virtio.c | 5 ++-- qom/object.c | 19 +++++++++++---- 50 files changed, 160 insertions(+), 219 deletions(-)include/qom/object.h +26
-4@@ -783,7 +783,7 @@ int object_set_propv(Object *obj,void object_initialize (void *obj,size_t size,const char *typename);/** -* object_initialize_child: +* object_initialize_child_with_props: * @parentobj: The parent object to add a property to * @propname: The name of the property * @childobj: A pointer to the memory to be used for the object. @@ -803,12 +803,13 @@ void object_initialize(void *obj, size_t size, const char *typename);* If the object implements the user creatable interface, the object will * be marked complete once all the properties have been processed. */ -void object_initialize_child(Object *parentobj, const char *propname, +void object_initialize_child_with_props(Object *parentobj, + const char *propname, void *childobj, size_t size, const char *type, Error **errp, ...) QEMU_SENTINEL;/** -* object_initialize_childv: +* object_initialize_child_with_propsv: * @parentobj: The parent object to add a property to * @propname: The name of the property * @childobj: A pointer to the memory to be used for the object. @@ -819,10 +820,31 @@ void object_initialize_child(Object *parentobj, const char *propname,* * See object_initialize_child() for documentation. */ -void object_initialize_childv (Object *parentobj,const char *propname, +void object_initialize_child_with_propsv (Object *parentobj, +const char *propname,void *childobj,size_t size,const char *type,Error **errp,va_list vargs); +/** +* object_initialize_child: +* @parent: The parent object to add a property to +* @propname: The name of the property +* @child: A precisely typed pointer to the memory to be used for the +* object. +* @type: The name of the type of the object to instantiate. +* +* This is like +* object_initialize_child_with_props(parent, propname, +* child, sizeof(*child), type, +* &error_abort, NULL) +*/ +#define object_initialize_child (parent, propname, child, type) \ + object_initialize_child_internal((parent), (propname), \ + (child), sizeof(*(child)), (type)) +void object_initialize_child_internal (Object *parent,const char *propname, +void *child,size_t size, +const char *type); +/** * object_dynamic_cast: * @obj: The object to cast. hw/arm/allwinner-a10.c +2
-3@@ -41,9 +41,8 @@ static void aw_a10_init(Object *obj) {AwA10State *s =AW_A10 (obj); -object_initialize_child (obj,"cpu" , &s->cpu,sizeof (s->cpu), -ARM_CPU_TYPE_NAME ("cortex-a8" ), - &error_abort,NULL ); +object_initialize_child (obj,"cpu" , &s->cpu, +ARM_CPU_TYPE_NAME ("cortex-a8" ));sysbus_init_child_obj (obj,"intc" , &s->intc,sizeof (s->intc),TYPE_AW_A10_PIC );hw/arm/allwinner-h3.c +2
-3@@ -194,9 +194,8 @@ static void allwinner_h3_init(Object *obj) s->memmap = allwinner_h3_memmap;for (int i =0 ; i <AW_H3_NUM_CPUS ; i++) { -object_initialize_child (obj,"cpu[*]" , &s->cpus[i],sizeof (s->cpus[i]), -ARM_CPU_TYPE_NAME ("cortex-a7" ), - &error_abort,NULL ); +object_initialize_child (obj,"cpu[*]" , &s->cpus[i], +ARM_CPU_TYPE_NAME ("cortex-a7" )); } sysbus_init_child_obj(obj, "gic", &s->gic, sizeof(s->gic),hw/arm/armsse.c +8
-18@@ -252,9 +252,7 @@ static void armsse_init(Object *obj)char *name; name =g_strdup_printf ("cluster%d" , i); -object_initialize_child (obj, name, &s->cluster[i], -sizeof (s->cluster[i]),TYPE_CPU_CLUSTER , - &error_abort,NULL ); +object_initialize_child (obj, name, &s->cluster[i],TYPE_CPU_CLUSTER );qdev_prop_set_uint32 (DEVICE (&s->cluster[i]),"cluster-id" , i);g_free (name);@@ -288,15 +286,13 @@ static void armsse_init(Object *obj)g_free (name); }object_initialize_child (obj,"mpc-irq-orgate" , &s->mpc_irq_orgate, -sizeof (s->mpc_irq_orgate),TYPE_OR_IRQ , - &error_abort,NULL ); +TYPE_OR_IRQ );for (i =0 ; i <IOTS_NUM_EXP_MPC + info->sram_banks; i++) {char *name =g_strdup_printf ("mpc-irq-splitter-%d" , i);SplitIRQ *splitter = &s->mpc_irq_splitter[i]; -object_initialize_child (obj, name, splitter,sizeof (*splitter), -TYPE_SPLIT_IRQ , &error_abort,NULL ); +object_initialize_child (obj, name, splitter,TYPE_SPLIT_IRQ );g_free (name); } sysbus_init_child_obj(obj, "timer0", &s->timer0, sizeof(s->timer0),@@ -376,21 +372,16 @@ static void armsse_init(Object *obj)g_free (name); } } -object_initialize_child (obj,"nmi-orgate" , &s->nmi_orgate, -sizeof (s->nmi_orgate),TYPE_OR_IRQ , - &error_abort,NULL ); +object_initialize_child (obj,"nmi-orgate" , &s->nmi_orgate,TYPE_OR_IRQ );object_initialize_child (obj,"ppc-irq-orgate" , &s->ppc_irq_orgate, -sizeof (s->ppc_irq_orgate),TYPE_OR_IRQ , - &error_abort,NULL ); +TYPE_OR_IRQ );object_initialize_child (obj,"sec-resp-splitter" , &s->sec_resp_splitter, -sizeof (s->sec_resp_splitter),TYPE_SPLIT_IRQ , - &error_abort,NULL ); +TYPE_SPLIT_IRQ );for (i =0 ; i <ARRAY_SIZE (s->ppc_irq_splitter); i++) {char *name =g_strdup_printf ("ppc-irq-splitter-%d" , i);SplitIRQ *splitter = &s->ppc_irq_splitter[i]; -object_initialize_child (obj, name, splitter,sizeof (*splitter), -TYPE_SPLIT_IRQ , &error_abort,NULL ); +object_initialize_child (obj, name, splitter,TYPE_SPLIT_IRQ );g_free (name); }if (info->num_cpus >1 ) {@@ -399,8 +390,7 @@ static void armsse_init(Object *obj)char *name =g_strdup_printf ("cpu-irq-splitter%d" , i);SplitIRQ *splitter = &s->cpu_irq_splitter[i]; -object_initialize_child (obj, name, splitter,sizeof (*splitter), -TYPE_SPLIT_IRQ , &error_abort,NULL ); +object_initialize_child (obj, name, splitter,TYPE_SPLIT_IRQ );g_free (name); } }hw/arm/aspeed.c +1
-3@@ -266,9 +266,7 @@ static void aspeed_machine_init(MachineState *machine) UINT32_MAX);memory_region_add_subregion (&bmc->ram_container,0 , machine->ram); -object_initialize_child (OBJECT (machine),"soc" , &bmc->soc, -sizeof (bmc->soc), amc->soc_name, &error_abort, -NULL ); +object_initialize_child (OBJECT (machine),"soc" , &bmc->soc, amc->soc_name); sc =ASPEED_SOC_GET_CLASS (&bmc->soc);hw/arm/aspeed_ast2600.c +1
-3@@ -127,9 +127,7 @@ static void aspeed_soc_ast2600_init(Object *obj) }for (i =0 ; i < sc->num_cpus; i++) { -object_initialize_child (obj,"cpu[*]" ,OBJECT (&s->cpu[i]), -sizeof (s->cpu[i]), sc->cpu_type, - &error_abort,NULL ); +object_initialize_child (obj,"cpu[*]" , &s->cpu[i], sc->cpu_type); }snprintf (typename,sizeof (typename),"aspeed.scu-%s" , socname);hw/arm/aspeed_soc.c +1
-3@@ -142,9 +142,7 @@ static void aspeed_soc_init(Object *obj) }for (i =0 ; i < sc->num_cpus; i++) { -object_initialize_child (obj,"cpu[*]" ,OBJECT (&s->cpu[i]), -sizeof (s->cpu[i]), sc->cpu_type, - &error_abort,NULL ); +object_initialize_child (obj,"cpu[*]" , &s->cpu[i], sc->cpu_type); }snprintf (typename,sizeof (typename),"aspeed.scu-%s" , socname);hw/arm/bcm2836.c +1
-2@@ -53,8 +53,7 @@ static void bcm2836_init(Object *obj)for (n =0 ; n <BCM283X_NCPUS ; n++) {object_initialize_child (obj,"cpu[*]" , &s->cpu[n].core, -sizeof (s->cpu[n].core), info->cpu_type, - &error_abort,NULL ); + info->cpu_type); } sysbus_init_child_obj(obj, "control", &s->control, sizeof(s->control),hw/arm/digic.c +1
-3@@ -36,9 +36,7 @@ static void digic_init(Object *obj)DigicState *s =DIGIC (obj);int i; -object_initialize_child (obj,"cpu" , &s->cpu,sizeof (s->cpu), -ARM_CPU_TYPE_NAME ("arm946" ), - &error_abort,NULL ); +object_initialize_child (obj,"cpu" , &s->cpu,ARM_CPU_TYPE_NAME ("arm946" ));for (i =0 ; i <DIGIC4_NB_TIMERS ; i++) {#define DIGIC_TIMER_NAME_MLEN 11hw/arm/exynos4210.c +1
-2@@ -482,8 +482,7 @@ static void exynos4210_init(Object *obj)char *name =g_strdup_printf ("pl330-irq-orgate%d" , i);qemu_or_irq *orgate = &s->pl330_irq_orgate[i]; -object_initialize_child (obj, name, orgate,sizeof (*orgate), -TYPE_OR_IRQ , &error_abort,NULL ); +object_initialize_child (obj, name, orgate,TYPE_OR_IRQ );g_free (name); } }hw/arm/fsl-imx25.c +1
-3@@ -38,9 +38,7 @@ static void fsl_imx25_init(Object *obj)FslIMX25State *s =FSL_IMX25 (obj);int i; -object_initialize_child (obj,"cpu" , &s->cpu,sizeof (s->cpu), -ARM_CPU_TYPE_NAME ("arm926" ), - &error_abort,NULL ); +object_initialize_child (obj,"cpu" , &s->cpu,ARM_CPU_TYPE_NAME ("arm926" ));sysbus_init_child_obj (obj,"avic" , &s->avic,sizeof (s->avic),TYPE_IMX_AVIC );hw/arm/fsl-imx31.c +1
-3@@ -33,9 +33,7 @@ static void fsl_imx31_init(Object *obj)FslIMX31State *s =FSL_IMX31 (obj);int i; -object_initialize_child (obj,"cpu" , &s->cpu,sizeof (s->cpu), -ARM_CPU_TYPE_NAME ("arm1136" ), - &error_abort,NULL ); +object_initialize_child (obj,"cpu" , &s->cpu,ARM_CPU_TYPE_NAME ("arm1136" ));sysbus_init_child_obj (obj,"avic" , &s->avic,sizeof (s->avic),TYPE_IMX_AVIC );hw/arm/fsl-imx6.c +2
-3@@ -43,9 +43,8 @@ static void fsl_imx6_init(Object *obj)for (i =0 ; i <MIN (ms->smp.cpus,FSL_IMX6_NUM_CPUS ); i++) {snprintf (name,NAME_SIZE ,"cpu%d" , i); -object_initialize_child (obj, name, &s->cpu[i],sizeof (s->cpu[i]), -ARM_CPU_TYPE_NAME ("cortex-a9" ), - &error_abort,NULL ); +object_initialize_child (obj, name, &s->cpu[i], +ARM_CPU_TYPE_NAME ("cortex-a9" )); } sysbus_init_child_obj(obj, "a9mpcore", &s->a9mpcore, sizeof(s->a9mpcore),hw/arm/fsl-imx6ul.c +2
-2@@ -34,8 +34,8 @@ static void fsl_imx6ul_init(Object *obj)char name[NAME_SIZE ];int i; -object_initialize_child (obj,"cpu0" , &s->cpu,sizeof (s->cpu), -ARM_CPU_TYPE_NAME ("cortex-a7" ), &error_abort,NULL ); +object_initialize_child (obj,"cpu0" , &s->cpu, +ARM_CPU_TYPE_NAME ("cortex-a7" ));/* * A7MPCORE hw/arm/fsl-imx7.c +2
-3@@ -38,9 +38,8 @@ static void fsl_imx7_init(Object *obj)for (i =0 ; i <MIN (ms->smp.cpus,FSL_IMX7_NUM_CPUS ); i++) {snprintf (name,NAME_SIZE ,"cpu%d" , i); -object_initialize_child (obj, name, &s->cpu[i],sizeof (s->cpu[i]), -ARM_CPU_TYPE_NAME ("cortex-a7" ), &error_abort, -NULL ); +object_initialize_child (obj, name, &s->cpu[i], +ARM_CPU_TYPE_NAME ("cortex-a7" )); }/* hw/arm/imx25_pdk.c +1
-2@@ -73,8 +73,7 @@ static void imx25_pdk_init(MachineState *machine)unsigned int alias_offset;int i; -object_initialize_child (OBJECT (machine),"soc" , &s->soc,sizeof (s->soc), -TYPE_FSL_IMX25 , &error_abort,NULL ); +object_initialize_child (OBJECT (machine),"soc" , &s->soc,TYPE_FSL_IMX25 );object_property_set_bool (OBJECT (&s->soc), true,"realized" , &error_fatal);hw/arm/kzm.c +1
-2@@ -71,8 +71,7 @@ static void kzm_init(MachineState *machine)unsigned int alias_offset;unsigned int i; -object_initialize_child (OBJECT (machine),"soc" , &s->soc,sizeof (s->soc), -TYPE_FSL_IMX31 , &error_abort,NULL ); +object_initialize_child (OBJECT (machine),"soc" , &s->soc,TYPE_FSL_IMX31 );object_property_set_bool (OBJECT (&s->soc), true,"realized" , &error_fatal);hw/arm/mps2-tz.c +6
-8@@ -414,9 +414,10 @@ static void mps2tz_common_init(MachineState *machine)char *name =g_strdup_printf ("mps2-irq-splitter%d" , i);SplitIRQ *splitter = &mms->cpu_irq_splitter[i]; -object_initialize_child (OBJECT (machine), name, - splitter,sizeof (*splitter), -TYPE_SPLIT_IRQ , &error_fatal,NULL ); +object_initialize_child_with_props (OBJECT (machine), name, + splitter,sizeof (*splitter), +TYPE_SPLIT_IRQ , &error_fatal, +NULL );g_free (name); object_property_set_int(OBJECT(splitter), 2, "num-lines",@@ -436,9 +437,7 @@ static void mps2tz_common_init(MachineState *machine)* lines, one for each of the PPCs we create here, plus one per MSC. */ object_initialize_child (OBJECT (machine),"sec-resp-splitter" , - &mms->sec_resp_splitter, -sizeof (mms->sec_resp_splitter), -TYPE_SPLIT_IRQ , &error_abort,NULL ); + &mms->sec_resp_splitter,TYPE_SPLIT_IRQ );object_property_set_int (OBJECT (&mms->sec_resp_splitter),ARRAY_SIZE (mms->ppc) +ARRAY_SIZE (mms->msc),"num-lines" , &error_fatal);@@ -472,8 +471,7 @@ static void mps2tz_common_init(MachineState *machine)* Create the OR gate for this. */ object_initialize_child (OBJECT (mms),"uart-irq-orgate" , - &mms->uart_irq_orgate,sizeof (mms->uart_irq_orgate), -TYPE_OR_IRQ , &error_abort,NULL ); + &mms->uart_irq_orgate,TYPE_OR_IRQ );object_property_set_int (OBJECT (&mms->uart_irq_orgate),10 ,"num-lines" , &error_fatal); object_property_set_bool(OBJECT(&mms->uart_irq_orgate), true,hw/arm/musca.c +7
-7@@ -404,9 +404,9 @@ static void musca_init(MachineState *machine)char *name =g_strdup_printf ("musca-irq-splitter%d" , i);SplitIRQ *splitter = &mms->cpu_irq_splitter[i]; -object_initialize_child (OBJECT (machine), name, - splitter,sizeof (*splitter), -TYPE_SPLIT_IRQ , &error_fatal,NULL ); +object_initialize_child_with_props (OBJECT (machine), name, splitter, +sizeof (*splitter),TYPE_SPLIT_IRQ , + &error_fatal,NULL );g_free (name); object_property_set_int(OBJECT(splitter), 2, "num-lines",@@ -424,10 +424,10 @@ static void musca_init(MachineState *machine)* The sec_resp_cfg output from the SSE-200 must be split into multiple * lines, one for each of the PPCs we create here. */ -object_initialize_child (OBJECT (machine),"sec-resp-splitter" , - &mms->sec_resp_splitter, -sizeof (mms->sec_resp_splitter), -TYPE_SPLIT_IRQ , &error_fatal,NULL ); +object_initialize_child_with_props (OBJECT (machine),"sec-resp-splitter" , + &mms->sec_resp_splitter, +sizeof (mms->sec_resp_splitter), +TYPE_SPLIT_IRQ , &error_fatal,NULL );object_property_set_int (OBJECT (&mms->sec_resp_splitter),ARRAY_SIZE (mms->ppc),"num-lines" , &error_fatal);hw/arm/raspi.c +2
-2@@ -282,8 +282,8 @@ static void raspi_machine_init(MachineState *machine) machine->ram, 0);/* Setup the SOC */ -object_initialize_child (OBJECT (machine),"soc" , &s->soc,sizeof (s->soc), -board_soc_type (board_rev), &error_abort,NULL ); +object_initialize_child (OBJECT (machine),"soc" , &s->soc, +board_soc_type (board_rev));object_property_add_const_link (OBJECT (&s->soc),"ram" ,OBJECT (machine->ram));object_property_set_int (OBJECT (&s->soc), board_rev,"board-rev" , &error_abort);hw/arm/stm32f405_soc.c +3
-3@@ -168,9 +168,9 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp) }/* ADC device, the IRQs are ORed together */ -object_initialize_child (OBJECT (s),"adc-orirq" , &s->adc_irqs, -sizeof (s->adc_irqs),TYPE_OR_IRQ , - &err,NULL ); +object_initialize_child_with_props (OBJECT (s),"adc-orirq" , &s->adc_irqs, +sizeof (s->adc_irqs),TYPE_OR_IRQ , &err, +NULL );if (err !=NULL ) {error_propagate (errp, err);return ;hw/arm/xlnx-versal.c +2
-3@@ -32,9 +32,8 @@ static void versal_create_apu_cpus(Versal *s)for (i =0 ; i <ARRAY_SIZE (s->fpd.apu.cpu); i++) {Object *obj; -object_initialize_child (OBJECT (s),"apu-cpu[*]" , - &s->fpd.apu.cpu[i],sizeof (s->fpd.apu.cpu[i]), -XLNX_VERSAL_ACPU_TYPE , &error_abort,NULL ); +object_initialize_child (OBJECT (s),"apu-cpu[*]" , &s->fpd.apu.cpu[i], +XLNX_VERSAL_ACPU_TYPE ); obj =OBJECT (&s->fpd.apu.cpu[i]);object_property_set_int (obj, s->cfg.psci_conduit,"psci-conduit" , &error_abort);hw/arm/xlnx-zcu102.c +1
-2@@ -116,8 +116,7 @@ static void xlnx_zcu102_init(MachineState *machine) ram_size); } -object_initialize_child (OBJECT (machine),"soc" , &s->soc,sizeof (s->soc), -TYPE_XLNX_ZYNQMP , &error_abort,NULL ); +object_initialize_child (OBJECT (machine),"soc" , &s->soc,TYPE_XLNX_ZYNQMP );object_property_set_link (OBJECT (&s->soc),OBJECT (machine->ram),"ddr-ram" , &error_abort);hw/arm/xlnx-zynqmp.c +6
-10@@ -187,17 +187,15 @@ static void xlnx_zynqmp_create_rpu(MachineState *ms, XlnxZynqMPState *s, }object_initialize_child (OBJECT (s),"rpu-cluster" , &s->rpu_cluster, -sizeof (s->rpu_cluster),TYPE_CPU_CLUSTER , - &error_abort,NULL ); +TYPE_CPU_CLUSTER );qdev_prop_set_uint32 (DEVICE (&s->rpu_cluster),"cluster-id" ,1 );for (i =0 ; i < num_rpus; i++) {char *name;object_initialize_child (OBJECT (&s->rpu_cluster),"rpu-cpu[*]" , - &s->rpu_cpu[i],sizeof (s->rpu_cpu[i]), -ARM_CPU_TYPE_NAME ("cortex-r5f" ), - &error_abort,NULL ); + &s->rpu_cpu[i], +ARM_CPU_TYPE_NAME ("cortex-r5f" )); name =object_get_canonical_path_component (OBJECT (&s->rpu_cpu[i]));if (strcmp (name, boot_cpu)) {@@ -230,15 +228,13 @@ static void xlnx_zynqmp_init(Object *obj)int num_apus =MIN (ms->smp.cpus,XLNX_ZYNQMP_NUM_APU_CPUS );object_initialize_child (obj,"apu-cluster" , &s->apu_cluster, -sizeof (s->apu_cluster),TYPE_CPU_CLUSTER , - &error_abort,NULL ); +TYPE_CPU_CLUSTER );qdev_prop_set_uint32 (DEVICE (&s->apu_cluster),"cluster-id" ,0 );for (i =0 ; i < num_apus; i++) {object_initialize_child (OBJECT (&s->apu_cluster),"apu-cpu[*]" , - &s->apu_cpu[i],sizeof (s->apu_cpu[i]), -ARM_CPU_TYPE_NAME ("cortex-a53" ), - &error_abort,NULL ); + &s->apu_cpu[i], +ARM_CPU_TYPE_NAME ("cortex-a53" )); } sysbus_init_child_obj(obj, "gic", &s->gic, sizeof(s->gic),hw/char/serial-isa.c +1
-2@@ -114,8 +114,7 @@ static void serial_isa_initfn(Object *o) {ISASerialState *self =ISA_SERIAL (o); -object_initialize_child (o,"serial" , &self->state,sizeof (self->state), -TYPE_SERIAL , &error_abort,NULL ); +object_initialize_child (o,"serial" , &self->state,TYPE_SERIAL ); }static const TypeInfo serial_isa_info = {hw/char/serial-pci-multi.c +1
-3@@ -187,9 +187,7 @@ static void multi_serial_init(Object *o)size_t i, nports =multi_serial_get_port_count (PCI_DEVICE_GET_CLASS (dev));for (i =0 ; i < nports; i++) { -object_initialize_child (o,"serial[*]" , &pms->state[i], -sizeof (pms->state[i]), -TYPE_SERIAL , &error_abort,NULL ); +object_initialize_child (o,"serial[*]" , &pms->state[i],TYPE_SERIAL ); } }hw/char/serial-pci.c +1
-2@@ -108,8 +108,7 @@ static void serial_pci_init(Object *o) {PCISerialState *ps =PCI_SERIAL (o); -object_initialize_child (o,"serial" , &ps->state,sizeof (ps->state), -TYPE_SERIAL , &error_abort,NULL ); +object_initialize_child (o,"serial" , &ps->state,TYPE_SERIAL ); }static const TypeInfo serial_pci_info = {hw/char/serial.c +2
-4@@ -1014,8 +1014,7 @@ static void serial_io_instance_init(Object *o) {SerialIO *sio =SERIAL_IO (o); -object_initialize_child (o,"serial" , &sio->serial,sizeof (sio->serial), -TYPE_SERIAL , &error_abort,NULL ); +object_initialize_child (o,"serial" , &sio->serial,TYPE_SERIAL );qdev_alias_all_properties (DEVICE (&sio->serial), o); }@@ -1148,8 +1147,7 @@ static void serial_mm_instance_init(Object *o) {SerialMM *smm =SERIAL_MM (o); -object_initialize_child (o,"serial" , &smm->serial,sizeof (smm->serial), -TYPE_SERIAL , &error_abort,NULL ); +object_initialize_child (o,"serial" , &smm->serial,TYPE_SERIAL );qdev_alias_all_properties (DEVICE (&smm->serial), o); }hw/core/sysbus.c +2
-2@@ -348,8 +348,8 @@ BusState *sysbus_get_default(void)void sysbus_init_child_obj (Object *parent,const char *childname,void *child,size_t childsize,const char *childtype) { -object_initialize_child (parent, childname, child, childsize, childtype, - &error_abort,NULL ); +object_initialize_child_with_props (parent, childname, child, childsize, + childtype, &error_abort,NULL );qdev_set_parent_bus (DEVICE (child),sysbus_get_default ()); }hw/dma/xilinx_axidma.c +3
-6@@ -579,13 +579,10 @@ static void xilinx_axidma_init(Object *obj)SysBusDevice *sbd =SYS_BUS_DEVICE (obj);object_initialize_child (OBJECT (s),"axistream-connected-target" , - &s->rx_data_dev,sizeof (s->rx_data_dev), -TYPE_XILINX_AXI_DMA_DATA_STREAM , &error_abort, -NULL ); + &s->rx_data_dev,TYPE_XILINX_AXI_DMA_DATA_STREAM );object_initialize_child (OBJECT (s),"axistream-control-connected-target" , - &s->rx_control_dev,sizeof (s->rx_control_dev), -TYPE_XILINX_AXI_DMA_CONTROL_STREAM , &error_abort, -NULL ); + &s->rx_control_dev, +TYPE_XILINX_AXI_DMA_CONTROL_STREAM ); object_property_add_link(obj, "dma", TYPE_MEMORY_REGION, (Object **)&s->dma_mr, qdev_prop_allow_set_link_before_realize,hw/intc/pnv_xive.c +2
-4@@ -1796,11 +1796,9 @@ static void pnv_xive_init(Object *obj)PnvXive *xive =PNV_XIVE (obj);object_initialize_child (obj,"ipi_source" , &xive->ipi_source, -sizeof (xive->ipi_source),TYPE_XIVE_SOURCE , - &error_abort,NULL ); +TYPE_XIVE_SOURCE );object_initialize_child (obj,"end_source" , &xive->end_source, -sizeof (xive->end_source),TYPE_XIVE_END_SOURCE , - &error_abort,NULL ); +TYPE_XIVE_END_SOURCE ); }/* hw/intc/spapr_xive.c +2
-4@@ -272,12 +272,10 @@ static void spapr_xive_instance_init(Object *obj) {SpaprXive *xive =SPAPR_XIVE (obj); -object_initialize_child (obj,"source" , &xive->source,sizeof (xive->source), -TYPE_XIVE_SOURCE , &error_abort,NULL ); +object_initialize_child (obj,"source" , &xive->source,TYPE_XIVE_SOURCE );object_initialize_child (obj,"end_source" , &xive->end_source, -sizeof (xive->end_source),TYPE_XIVE_END_SOURCE , - &error_abort,NULL ); +TYPE_XIVE_END_SOURCE );/* Not connected to the KVM XIVE device */ xive->fd =-1 ;hw/microblaze/xlnx-zynqmp-pmu.c +3
-4@@ -61,8 +61,7 @@ static void xlnx_zynqmp_pmu_soc_init(Object *obj) {XlnxZynqMPPMUSoCState *s =XLNX_ZYNQMP_PMU_SOC (obj); -object_initialize_child (obj,"pmu-cpu" , &s->cpu,sizeof (s->cpu), -TYPE_MICROBLAZE_CPU , &error_abort,NULL ); +object_initialize_child (obj,"pmu-cpu" , &s->cpu,TYPE_MICROBLAZE_CPU );sysbus_init_child_obj (obj,"intc" , &s->intc,sizeof (s->intc),TYPE_XLNX_PMU_IO_INTC );@@ -174,8 +173,8 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine) pmu_ram);/* Create the PMU device */ -object_initialize_child (OBJECT (machine),"pmu" , pmu,sizeof (*pmu), -TYPE_XLNX_ZYNQMP_PMU_SOC , &error_abort,NULL ); +object_initialize_child (OBJECT (machine),"pmu" , pmu, +TYPE_XLNX_ZYNQMP_PMU_SOC );object_property_set_bool (OBJECT (pmu), true,"realized" , &error_fatal);/* Load the kernel */ hw/misc/macio/macio.c +4
-6@@ -98,8 +98,8 @@ static void macio_init_child_obj(MacIOState *s, const char *childname, void *child, size_t childsize, const char *childtype) { -object_initialize_child (OBJECT (s ),childname ,child ,childsize ,childtype , - &error_abort, NULL); +object_initialize_child_with_props (OBJECT (s ),childname ,child ,childsize , + childtype, &error_abort, NULL);qdev_set_parent_bus (DEVICE (child),BUS (&s->macio_bus)); }@@ -351,8 +351,7 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)object_property_set_bool (OBJECT (&ns->gpio), true,"realized" , &err);/* PMU */ -object_initialize_child (OBJECT (s),"pmu" , &s->pmu,sizeof (s->pmu), -TYPE_VIA_PMU , &error_abort,NULL ); +object_initialize_child (OBJECT (s),"pmu" , &s->pmu,TYPE_VIA_PMU );object_property_set_link (OBJECT (&s->pmu),OBJECT (sysbus_dev),"gpio" , &error_abort);qdev_prop_set_bit (DEVICE (&s->pmu),"has-adb" , ns->has_adb);@@ -370,8 +369,7 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)object_unparent (OBJECT (&ns->gpio));/* CUDA */ -object_initialize_child (OBJECT (s),"cuda" , &s->cuda,sizeof (s->cuda), -TYPE_CUDA , &error_abort,NULL ); +object_initialize_child (OBJECT (s),"cuda" , &s->cuda,TYPE_CUDA );qdev_prop_set_uint64 (DEVICE (&s->cuda),"timebase-frequency" , s->frequency);hw/net/xilinx_axienet.c +3
-6@@ -1020,13 +1020,10 @@ static void xilinx_enet_init(Object *obj)SysBusDevice *sbd =SYS_BUS_DEVICE (obj);object_initialize_child (OBJECT (s),"axistream-connected-target" , - &s->rx_data_dev,sizeof (s->rx_data_dev), -TYPE_XILINX_AXI_ENET_DATA_STREAM , &error_abort, -NULL ); + &s->rx_data_dev,TYPE_XILINX_AXI_ENET_DATA_STREAM );object_initialize_child (OBJECT (s),"axistream-control-connected-target" , - &s->rx_control_dev,sizeof (s->rx_control_dev), -TYPE_XILINX_AXI_ENET_CONTROL_STREAM , &error_abort, -NULL ); + &s->rx_control_dev, +TYPE_XILINX_AXI_ENET_CONTROL_STREAM );sysbus_init_irq (sbd, &s->irq);memory_region_init_io (&s->iomem,OBJECT (s), &enet_ops, s,"enet" ,0x40000 );hw/pci-host/designware.c +1
-2@@ -722,8 +722,7 @@ static void designware_pcie_host_init(Object *obj)DesignwarePCIEHost *s =DESIGNWARE_PCIE_HOST (obj);DesignwarePCIERoot *root = &s->root; -object_initialize_child (obj,"root" , root,sizeof (*root), -TYPE_DESIGNWARE_PCIE_ROOT , &error_abort,NULL ); +object_initialize_child (obj,"root" , root,TYPE_DESIGNWARE_PCIE_ROOT );qdev_prop_set_int32 (DEVICE (root),"addr" ,PCI_DEVFN (0 ,0 ));qdev_prop_set_bit (DEVICE (root),"multifunction" , false); }hw/pci-host/gpex.c +1
-2@@ -124,8 +124,7 @@ static void gpex_host_initfn(Object *obj)GPEXHost *s =GPEX_HOST (obj);GPEXRootState *root = &s->gpex_root; -object_initialize_child (obj,"gpex_root" , root,sizeof (*root), -TYPE_GPEX_ROOT_DEVICE , &error_abort,NULL ); +object_initialize_child (obj,"gpex_root" , root,TYPE_GPEX_ROOT_DEVICE );qdev_prop_set_int32 (DEVICE (root),"addr" ,PCI_DEVFN (0 ,0 ));qdev_prop_set_bit (DEVICE (root),"multifunction" , false); }hw/pci-host/pnv_phb3.c +4
-8@@ -968,23 +968,19 @@ static void pnv_phb3_instance_init(Object *obj)QLIST_INIT (&phb->dma_spaces);/* LSI sources */ -object_initialize_child (obj,"lsi" , &phb->lsis,sizeof (phb->lsis), -TYPE_ICS , &error_abort,NULL ); +object_initialize_child (obj,"lsi" , &phb->lsis,TYPE_ICS );/* Default init ... will be fixed by HW inits */ phb->lsis.offset =0 ;/* MSI sources */ -object_initialize_child (obj,"msi" , &phb->msis,sizeof (phb->msis), -TYPE_PHB3_MSI , &error_abort,NULL ); +object_initialize_child (obj,"msi" , &phb->msis,TYPE_PHB3_MSI );/* Power Bus Common Queue */ -object_initialize_child (obj,"pbcq" , &phb->pbcq,sizeof (phb->pbcq), -TYPE_PNV_PBCQ , &error_abort,NULL ); +object_initialize_child (obj,"pbcq" , &phb->pbcq,TYPE_PNV_PBCQ );/* Root Port */ -object_initialize_child (obj,"root" , &phb->root,sizeof (phb->root), -TYPE_PNV_PHB3_ROOT_PORT , &error_abort,NULL ); +object_initialize_child (obj,"root" , &phb->root,TYPE_PNV_PHB3_ROOT_PORT );qdev_prop_set_int32 (DEVICE (&phb->root),"addr" ,PCI_DEVFN (0 ,0 ));qdev_prop_set_bit (DEVICE (&phb->root),"multifunction" , false); }hw/pci-host/pnv_phb4.c +2
-4@@ -1155,12 +1155,10 @@ static void pnv_phb4_instance_init(Object *obj)QLIST_INIT (&phb->dma_spaces);/* XIVE interrupt source object */ -object_initialize_child (obj,"source" , &phb->xsrc,sizeof (phb->xsrc), -TYPE_XIVE_SOURCE , &error_abort,NULL ); +object_initialize_child (obj,"source" , &phb->xsrc,TYPE_XIVE_SOURCE );/* Root Port */ -object_initialize_child (obj,"root" , &phb->root,sizeof (phb->root), -TYPE_PNV_PHB4_ROOT_PORT , &error_abort,NULL ); +object_initialize_child (obj,"root" , &phb->root,TYPE_PNV_PHB4_ROOT_PORT );qdev_prop_set_int32 (DEVICE (&phb->root),"addr" ,PCI_DEVFN (0 ,0 ));qdev_prop_set_bit (DEVICE (&phb->root),"multifunction" , false);hw/pci-host/pnv_phb4_pec.c +2
-4@@ -370,8 +370,7 @@ static void pnv_pec_instance_init(Object *obj)for (i =0 ; i <PHB4_PEC_MAX_STACKS ; i++) {object_initialize_child (obj,"stack[*]" , &pec->stacks[i], -sizeof (pec->stacks[i]),TYPE_PNV_PHB4_PEC_STACK , - &error_abort,NULL ); +TYPE_PNV_PHB4_PEC_STACK ); } }@@ -522,8 +521,7 @@ static void pnv_pec_stk_instance_init(Object *obj) {PnvPhb4PecStack *stack =PNV_PHB4_PEC_STACK (obj); -object_initialize_child (obj,"phb" , &stack->phb,sizeof (stack->phb), -TYPE_PNV_PHB4 , &error_abort,NULL ); +object_initialize_child (obj,"phb" , &stack->phb,TYPE_PNV_PHB4 ); }static void pnv_pec_stk_realize (DeviceState *dev,Error **errp)hw/pci-host/q35.c +1
-2@@ -212,8 +212,7 @@ static void q35_host_initfn(Object *obj)memory_region_init_io (&phb->data_mem, obj, &pci_host_data_le_ops, phb,"pci-conf-data" ,4 ); -object_initialize_child (OBJECT (s),"mch" , &s->mch,sizeof (s->mch), -TYPE_MCH_PCI_DEVICE , &error_abort,NULL ); +object_initialize_child (OBJECT (s),"mch" , &s->mch,TYPE_MCH_PCI_DEVICE );qdev_prop_set_int32 (DEVICE (&s->mch),"addr" ,PCI_DEVFN (0 ,0 ));qdev_prop_set_bit (DEVICE (&s->mch),"multifunction" , false);/* mch's object_initialize resets the default value, set it again */ hw/pci-host/xilinx-pcie.c +1
-2@@ -151,8 +151,7 @@ static void xilinx_pcie_host_init(Object *obj)XilinxPCIEHost *s =XILINX_PCIE_HOST (obj);XilinxPCIERoot *root = &s->root; -object_initialize_child (obj,"root" , root,sizeof (*root), -TYPE_XILINX_PCIE_ROOT , &error_abort,NULL ); +object_initialize_child (obj,"root" , root,TYPE_XILINX_PCIE_ROOT );qdev_prop_set_int32 (DEVICE (root),"addr" ,PCI_DEVFN (0 ,0 ));qdev_prop_set_bit (DEVICE (root),"multifunction" , false); }hw/ppc/pnv.c +15
-27@@ -1061,22 +1061,16 @@ static void pnv_chip_power8_instance_init(Object *obj) object_property_allow_set_link, OBJ_PROP_LINK_STRONG); -object_initialize_child (obj,"psi" , &chip8->psi,sizeof (chip8->psi), -TYPE_PNV8_PSI , &error_abort,NULL ); +object_initialize_child (obj,"psi" , &chip8->psi,TYPE_PNV8_PSI ); -object_initialize_child (obj,"lpc" , &chip8->lpc,sizeof (chip8->lpc), -TYPE_PNV8_LPC , &error_abort,NULL ); +object_initialize_child (obj,"lpc" , &chip8->lpc,TYPE_PNV8_LPC ); -object_initialize_child (obj,"occ" , &chip8->occ,sizeof (chip8->occ), -TYPE_PNV8_OCC , &error_abort,NULL ); +object_initialize_child (obj,"occ" , &chip8->occ,TYPE_PNV8_OCC ); -object_initialize_child (obj,"homer" , &chip8->homer,sizeof (chip8->homer), -TYPE_PNV8_HOMER , &error_abort,NULL ); +object_initialize_child (obj,"homer" , &chip8->homer,TYPE_PNV8_HOMER );for (i =0 ; i < pcc->num_phbs; i++) { -object_initialize_child (obj,"phb[*]" , &chip8->phbs[i], -sizeof (chip8->phbs[i]),TYPE_PNV_PHB3 , - &error_abort,NULL ); +object_initialize_child (obj,"phb[*]" , &chip8->phbs[i],TYPE_PNV_PHB3 ); }/* @@ -1320,22 +1314,17 @@ static void pnv_chip_power9_instance_init(Object *obj)object_property_add_alias (obj,"xive-fabric" ,OBJECT (&chip9->xive),"xive-fabric" ); -object_initialize_child (obj,"psi" , &chip9->psi,sizeof (chip9->psi), -TYPE_PNV9_PSI , &error_abort,NULL ); +object_initialize_child (obj,"psi" , &chip9->psi,TYPE_PNV9_PSI ); -object_initialize_child (obj,"lpc" , &chip9->lpc,sizeof (chip9->lpc), -TYPE_PNV9_LPC , &error_abort,NULL ); +object_initialize_child (obj,"lpc" , &chip9->lpc,TYPE_PNV9_LPC ); -object_initialize_child (obj,"occ" , &chip9->occ,sizeof (chip9->occ), -TYPE_PNV9_OCC , &error_abort,NULL ); +object_initialize_child (obj,"occ" , &chip9->occ,TYPE_PNV9_OCC ); -object_initialize_child (obj,"homer" , &chip9->homer,sizeof (chip9->homer), -TYPE_PNV9_HOMER , &error_abort,NULL ); +object_initialize_child (obj,"homer" , &chip9->homer,TYPE_PNV9_HOMER );for (i =0 ; i <PNV9_CHIP_MAX_PEC ; i++) {object_initialize_child (obj,"pec[*]" , &chip9->pecs[i], -sizeof (chip9->pecs[i]),TYPE_PNV_PHB4_PEC , - &error_abort,NULL ); +TYPE_PNV_PHB4_PEC ); }/* @@ -1359,8 +1348,9 @@ static void pnv_chip_quad_realize(Pnv9Chip *chip9, Error **errp)int core_id =CPU_CORE (pnv_core)->core_id;snprintf (eq_name,sizeof (eq_name),"eq[%d]" , core_id); -object_initialize_child (OBJECT (chip), eq_name, eq,sizeof (*eq), -TYPE_PNV_QUAD , &error_fatal,NULL ); +object_initialize_child_with_props (OBJECT (chip), eq_name, eq, +sizeof (*eq),TYPE_PNV_QUAD , + &error_fatal,NULL );object_property_set_int (OBJECT (eq), core_id,"id" , &error_fatal);object_property_set_bool (OBJECT (eq), true,"realized" , &error_fatal);@@ -1586,10 +1576,8 @@ static void pnv_chip_power10_instance_init(Object *obj) {Pnv10Chip *chip10 =PNV10_CHIP (obj); -object_initialize_child (obj,"psi" , &chip10->psi,sizeof (chip10->psi), -TYPE_PNV10_PSI , &error_abort,NULL ); -object_initialize_child (obj,"lpc" , &chip10->lpc,sizeof (chip10->lpc), -TYPE_PNV10_LPC , &error_abort,NULL ); +object_initialize_child (obj,"psi" , &chip10->psi,TYPE_PNV10_PSI ); +object_initialize_child (obj,"lpc" , &chip10->lpc,TYPE_PNV10_LPC ); }static void pnv_chip_power10_realize (DeviceState *dev,Error **errp)hw/ppc/pnv_psi.c +2
-4@@ -483,8 +483,7 @@ static void pnv_psi_power8_instance_init(Object *obj) {Pnv8Psi *psi8 =PNV8_PSI (obj); -object_initialize_child (obj,"ics-psi" , &psi8->ics,sizeof (psi8->ics), -TYPE_ICS , &error_abort,NULL ); +object_initialize_child (obj,"ics-psi" , &psi8->ics,TYPE_ICS );object_property_add_alias (obj,ICS_PROP_XICS ,OBJECT (&psi8->ics),ICS_PROP_XICS ); }@@ -836,8 +835,7 @@ static void pnv_psi_power9_instance_init(Object *obj) {Pnv9Psi *psi =PNV9_PSI (obj); -object_initialize_child (obj,"source" , &psi->source,sizeof (psi->source), -TYPE_XIVE_SOURCE , &error_abort,NULL ); +object_initialize_child (obj,"source" , &psi->source,TYPE_XIVE_SOURCE ); }static void pnv_psi_power9_realize (DeviceState *dev,Error **errp)hw/ppc/spapr.c +3
-3@@ -1726,9 +1726,9 @@ static void spapr_create_nvram(SpaprMachineState *spapr)static void spapr_rtc_create (SpaprMachineState *spapr) { -object_initialize_child (OBJECT (spapr),"rtc" , - &spapr->rtc,sizeof (spapr->rtc),TYPE_SPAPR_RTC , - &error_fatal,NULL ); +object_initialize_child_with_props (OBJECT (spapr),"rtc" , &spapr->rtc, +sizeof (spapr->rtc),TYPE_SPAPR_RTC , + &error_fatal,NULL );object_property_set_bool (OBJECT (&spapr->rtc), true,"realized" , &error_fatal); object_property_add_alias(OBJECT(spapr), "rtc-time", OBJECT(&spapr->rtc),hw/riscv/riscv_hart.c +1
-3@@ -45,9 +45,7 @@ static void riscv_hart_realize(RISCVHartArrayState *s, int idx, {Error *err =NULL ; -object_initialize_child (OBJECT (s),"harts[*]" , &s->harts[idx], -sizeof (s->harts[idx]), cpu_type, - &error_abort,NULL ); +object_initialize_child (OBJECT (s),"harts[*]" , &s->harts[idx], cpu_type); s->harts[idx].env.mhartid = s->hartid_base + idx;qemu_register_reset (riscv_harts_cpu_reset, &s->harts[idx]); object_property_set_bool(OBJECT(&s->harts[idx]), true,hw/riscv/sifive_e.c +1
-3@@ -85,9 +85,7 @@ static void riscv_sifive_e_init(MachineState *machine)int i;/* Initialize SoC */ -object_initialize_child (OBJECT (machine),"soc" , &s->soc, -sizeof (s->soc),TYPE_RISCV_E_SOC , - &error_abort,NULL ); +object_initialize_child (OBJECT (machine),"soc" , &s->soc,TYPE_RISCV_E_SOC );object_property_set_bool (OBJECT (&s->soc), true,"realized" , &error_abort);hw/riscv/sifive_u.c +3
-9@@ -328,9 +328,7 @@ static void sifive_u_machine_init(MachineState *machine)int i;/* Initialize SoC */ -object_initialize_child (OBJECT (machine),"soc" , &s->soc, -sizeof (s->soc),TYPE_RISCV_U_SOC , - &error_abort,NULL ); +object_initialize_child (OBJECT (machine),"soc" , &s->soc,TYPE_RISCV_U_SOC );object_property_set_uint (OBJECT (&s->soc), s->serial,"serial" , &error_abort); object_property_set_bool(OBJECT(&s->soc), true, "realized",@@ -486,9 +484,7 @@ static void riscv_sifive_u_soc_init(Object *obj)MachineState *ms =MACHINE (qdev_get_machine ());SiFiveUSoCState *s =RISCV_U_SOC (obj); -object_initialize_child (obj,"e-cluster" , &s->e_cluster, -sizeof (s->e_cluster),TYPE_CPU_CLUSTER , - &error_abort,NULL ); +object_initialize_child (obj,"e-cluster" , &s->e_cluster,TYPE_CPU_CLUSTER );qdev_prop_set_uint32 (DEVICE (&s->e_cluster),"cluster-id" ,0 ); sysbus_init_child_obj(OBJECT(&s->e_cluster), "e-cpus",@@ -498,9 +494,7 @@ static void riscv_sifive_u_soc_init(Object *obj)qdev_prop_set_uint32 (DEVICE (&s->e_cpus),"hartid-base" ,0 );qdev_prop_set_string (DEVICE (&s->e_cpus),"cpu-type" ,SIFIVE_E_CPU ); -object_initialize_child (obj,"u-cluster" , &s->u_cluster, -sizeof (s->u_cluster),TYPE_CPU_CLUSTER , - &error_abort,NULL ); +object_initialize_child (obj,"u-cluster" , &s->u_cluster,TYPE_CPU_CLUSTER );qdev_prop_set_uint32 (DEVICE (&s->u_cluster),"cluster-id" ,1 ); sysbus_init_child_obj(OBJECT(&s->u_cluster), "u-cpus",hw/virtio/virtio.c +3
-2@@ -3230,8 +3230,9 @@ void virtio_instance_init_common(Object *proxy_obj, void *data, {DeviceState *vdev = data; -object_initialize_child (proxy_obj,"virtio-backend" , vdev, vdev_size, - vdev_name, &error_abort,NULL ); +object_initialize_child_with_props (proxy_obj,"virtio-backend" , vdev, + vdev_size, vdev_name, &error_abort, +NULL );qdev_alias_all_properties (vdev, proxy_obj); }qom/object.c +15
-5@@ -529,19 +529,21 @@ void object_initialize(void *data, size_t size, const char *typename)object_initialize_with_type (data, size, type); } -void object_initialize_child (Object *parentobj,const char *propname, +void object_initialize_child_with_props (Object *parentobj, +const char *propname,void *childobj,size_t size,const char *type,Error **errp, ...) {va_list vargs;va_start (vargs, errp); -object_initialize_childv (parentobj, propname, childobj, size, type, errp, - vargs); +object_initialize_child_with_propsv (parentobj, propname, + childobj, size, type, errp, vargs);va_end (vargs); } -void object_initialize_childv (Object *parentobj,const char *propname, +void object_initialize_child_with_propsv (Object *parentobj, +const char *propname,void *childobj,size_t size,const char *type,Error **errp,va_list vargs) {@@ -582,6 +584,15 @@ out:error_propagate (errp, local_err); } +void object_initialize_child_internal (Object *parent, +const char *propname, +void *child,size_t size, +const char *type) +{ +object_initialize_child_with_props (parent, propname, child, size, type, + &error_abort,NULL ); +} +static inline bool object_property_is_child (ObjectProperty *prop) {return strstart (prop->type,"child<" ,NULL ); --2.21.1
PATCH 35/55 macio: Convert use of qdev_set_parent_bus()
In reply to Markus ArmbrusterConvert qdev_set_parent_bus()/realize to qdev_realize(); recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains why.
--- hw/misc/macio/macio.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
hw/misc/macio/macio.c +6 -7
@@ -100,7 +100,6 @@ static void macio_init_child_obj(MacIOState *s, const char *childname, {object_initialize_child_with_props (OBJECT (s), childname, child, childsize, childtype, &error_abort,NULL ); -qdev_set_parent_bus (DEVICE (child),BUS (&s->macio_bus)); }static void macio_common_realize (PCIDevice *d,Error **errp)
@@ -109,7 +108,7 @@ static void macio_common_realize(PCIDevice *d, Error **errp)SysBusDevice *sysbus_dev;Error *err =NULL ; -object_property_set_bool (OBJECT (&s->dbdma), true,"realized" , &err); +qdev_realize (DEVICE (&s->dbdma),BUS (&s->macio_bus), &err);if (err) {error_propagate (errp, err);return ;
@@ -125,7 +124,7 @@ static void macio_common_realize(PCIDevice *d, Error **errp)qdev_prop_set_chr (DEVICE (&s->escc),"chrB" ,serial_hd (1 ));qdev_prop_set_uint32 (DEVICE (&s->escc),"chnBtype" , escc_serial);qdev_prop_set_uint32 (DEVICE (&s->escc),"chnAtype" , escc_serial); -object_property_set_bool (OBJECT (&s->escc), true,"realized" , &err); +qdev_realize (DEVICE (&s->escc),BUS (&s->macio_bus), &err);if (err) {error_propagate (errp, err);return ;
@@ -148,7 +147,7 @@ static void macio_realize_ide(MacIOState *s, MACIOIDEState *ide,object_property_set_link (OBJECT (ide),OBJECT (&s->dbdma),"dbdma" , errp);macio_ide_register_dma (ide); -object_property_set_bool (OBJECT (ide), true,"realized" , errp); +qdev_realize (DEVICE (ide),BUS (&s->macio_bus), errp); }static void macio_oldworld_realize (PCIDevice *d,Error **errp)
@@ -167,7 +166,7 @@ static void macio_oldworld_realize(PCIDevice *d, Error **errp)qdev_prop_set_uint64 (DEVICE (&s->cuda),"timebase-frequency" , s->frequency); -object_property_set_bool (OBJECT (&s->cuda), true,"realized" , &err); +qdev_realize (DEVICE (&s->cuda),BUS (&s->macio_bus), &err);if (err) {error_propagate (errp, err);return ;
@@ -184,7 +183,7 @@ static void macio_oldworld_realize(PCIDevice *d, Error **errp)sysbus_connect_irq (sysbus_dev,1 ,qdev_get_gpio_in (pic_dev,OLDWORLD_ESCCA_IRQ )); -object_property_set_bool (OBJECT (&os->nvram), true,"realized" , &err); +qdev_realize (DEVICE (&os->nvram),BUS (&s->macio_bus), &err);if (err) {error_propagate (errp, err);return ;
@@ -348,7 +347,7 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp) &error_abort);memory_region_add_subregion (&s->bar,0x50 ,sysbus_mmio_get_region (sysbus_dev,0 )); -object_property_set_bool (OBJECT (&ns->gpio), true,"realized" , &err); +qdev_realize (DEVICE (&ns->gpio),BUS (&s->macio_bus), &err);/* PMU */ object_initialize_child (OBJECT (s),"pmu" , &s->pmu,TYPE_VIA_PMU );
Signature · 1 line
2.21.1
PATCH 36/55 macio: Eliminate macio_init_child_obj()
In reply to Markus Armbrustermacio_init_child_obj() has become a trivial wrapper around object_initialize_child_with_props(). Eliminate it, since the general convenience wrapper object_initialize_child() is just as convenient already.
--- hw/misc/macio/macio.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-)
hw/misc/macio/macio.c +9 -21
@@ -94,14 +94,6 @@ static void macio_bar_setup(MacIOState *s)macio_escc_legacy_setup (s); } -static void macio_init_child_obj (MacIOState *s,const char *childname, -void *child,size_t childsize, -const char *childtype) -{ -object_initialize_child_with_props (OBJECT (s), childname, child, childsize, - childtype, &error_abort,NULL ); -} -static void macio_common_realize (PCIDevice *d,Error **errp) {MacIOState *s =MACIO (d);
@@ -218,13 +210,12 @@ static void macio_oldworld_realize(PCIDevice *d, Error **errp) } } -static void macio_init_ide (MacIOState *s,MACIOIDEState *ide,size_t ide_size, -int index) +static void macio_init_ide (MacIOState *s,MACIOIDEState *ide,int index) {gchar *name =g_strdup_printf ("ide[%i]" , index);uint32_t addr =0x1f000 + ((index +1 ) *0x1000 ); -macio_init_child_obj (s, name, ide, ide_size,TYPE_MACIO_IDE ); +object_initialize_child (OBJECT (s), name, ide,TYPE_MACIO_IDE );qdev_prop_set_uint32 (DEVICE (ide),"addr" , addr);memory_region_add_subregion (&s->bar, addr, &ide->mem);g_free (name);
@@ -242,16 +233,15 @@ static void macio_oldworld_init(Object *obj) qdev_prop_allow_set_link_before_realize, 0); -macio_init_child_obj (s,"cuda" , &s->cuda,sizeof (s->cuda),TYPE_CUDA ); +object_initialize_child (OBJECT (s),"cuda" , &s->cuda,TYPE_CUDA ); -macio_init_child_obj (s,"nvram" , &os->nvram,sizeof (os->nvram), -TYPE_MACIO_NVRAM ); +object_initialize_child (OBJECT (s),"nvram" , &os->nvram,TYPE_MACIO_NVRAM ); dev =DEVICE (&os->nvram);qdev_prop_set_uint32 (dev,"size" ,0x2000 );qdev_prop_set_uint32 (dev,"it_shift" ,4 );for (i =0 ; i <2 ; i++) { -macio_init_ide (s, &os->ide[i],sizeof (os->ide[i]), i); +macio_init_ide (s, &os->ide[i], i); } }
@@ -396,11 +386,10 @@ static void macio_newworld_init(Object *obj) qdev_prop_allow_set_link_before_realize, 0); -macio_init_child_obj (s,"gpio" , &ns->gpio,sizeof (ns->gpio), -TYPE_MACIO_GPIO ); +object_initialize_child (OBJECT (s),"gpio" , &ns->gpio,TYPE_MACIO_GPIO );for (i =0 ; i <2 ; i++) { -macio_init_ide (s, &ns->ide[i],sizeof (ns->ide[i]), i); +macio_init_ide (s, &ns->ide[i], i); } }
@@ -413,10 +402,9 @@ static void macio_instance_init(Object *obj)qbus_create_inplace (&s->macio_bus,sizeof (s->macio_bus),TYPE_MACIO_BUS ,DEVICE (obj),"macio.0" ); -macio_init_child_obj (s,"dbdma" , &s->dbdma,sizeof (s->dbdma), -TYPE_MAC_DBDMA ); +object_initialize_child (OBJECT (s),"dbdma" , &s->dbdma,TYPE_MAC_DBDMA ); -macio_init_child_obj (s,"escc" , &s->escc,sizeof (s->escc),TYPE_ESCC ); +object_initialize_child (OBJECT (s),"escc" , &s->escc,TYPE_ESCC ); }static const VMStateDescription vmstate_macio_oldworld = {
Signature · 1 line
2.21.1