qdev: Rework how we plug into the parent bus
Subsystems (11)
PATCH RESEND v3 45/58 sysbus: Convert to sysbus_realize() etc. with Coccinelle
In reply to Markus ArmbrusterConvert from qdev_realize(), qdev_realize_and_unref() with null @bus argument to sysbus_realize(), sysbus_realize_and_unref().
Coccinelle script:
@@
expression dev, errp;
@@
- qdev_realize(DEVICE(dev), NULL, errp);
+ sysbus_realize(SYS_BUS_DEVICE(dev), errp);
@@
expression sysbus_dev, dev, errp;
@@
+ sysbus_dev = SYS_BUS_DEVICE(dev);
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
- sysbus_dev = SYS_BUS_DEVICE(dev);
@@
expression sysbus_dev, dev, errp;
expression expr;
@@
sysbus_dev = SYS_BUS_DEVICE(dev);
... when != dev = expr;
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(DEVICE(dev), NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);Whitespace changes minimized manually.
--- hw/lm32/lm32.h | 6 ++--- hw/lm32/milkymist-hw.h | 18 ++++++------- include/hw/char/cadence_uart.h | 2 +- include/hw/char/cmsdk-apb-uart.h | 2 +- include/hw/char/pl011.h | 4 +-- include/hw/char/xilinx_uartlite.h | 2 +- include/hw/cris/etraxfs.h | 2 +- include/hw/misc/unimp.h | 2 +- include/hw/timer/cmsdk-apb-timer.h | 2 +- hw/alpha/typhoon.c | 2 +- hw/arm/exynos4210.c | 18 ++++++------- hw/arm/exynos4_boards.c | 2 +- hw/arm/highbank.c | 12 ++++----- hw/arm/integratorcp.c | 2 +- hw/arm/mps2-tz.c | 2 +- hw/arm/msf2-som.c | 2 +- hw/arm/musicpal.c | 4 +-- hw/arm/netduino2.c | 2 +- hw/arm/netduinoplus2.c | 2 +- hw/arm/nseries.c | 4 +-- hw/arm/omap1.c | 8 +++--- hw/arm/omap2.c | 8 +++--- hw/arm/pxa2xx.c | 4 +-- hw/arm/pxa2xx_gpio.c | 2 +- hw/arm/pxa2xx_pic.c | 2 +- hw/arm/realview.c | 10 ++++---- hw/arm/sbsa-ref.c | 12 ++++----- hw/arm/spitz.c | 2 +- hw/arm/stellaris.c | 6 ++--- hw/arm/strongarm.c | 4 +-- hw/arm/versatilepb.c | 8 +++--- hw/arm/vexpress.c | 8 +++--- hw/arm/virt.c | 18 ++++++------- hw/arm/xilinx_zynq.c | 16 ++++++------ hw/arm/xlnx-versal-virt.c | 2 +- hw/arm/xlnx-versal.c | 2 +- hw/block/fdc.c | 4 +-- hw/block/pflash_cfi01.c | 2 +- hw/block/pflash_cfi02.c | 2 +- hw/char/exynos4210_uart.c | 2 +- hw/char/mcf_uart.c | 2 +- hw/char/serial.c | 2 +- hw/core/empty_slot.c | 2 +- hw/core/sysbus.c | 2 +- hw/cris/axis_dev88.c | 2 +- hw/display/milkymist-tmu2.c | 2 +- hw/display/sm501.c | 2 +- hw/dma/pxa2xx_dma.c | 4 +-- hw/dma/rc4030.c | 2 +- hw/dma/sparc32_dma.c | 8 +++--- hw/hppa/dino.c | 2 +- hw/hppa/lasi.c | 2 +- hw/hppa/machine.c | 2 +- hw/i386/pc.c | 2 +- hw/i386/pc_q35.c | 2 +- hw/i386/pc_sysfw.c | 2 +- hw/i386/x86.c | 2 +- hw/intc/exynos4210_gic.c | 2 +- hw/intc/s390_flic.c | 2 +- hw/isa/isa-bus.c | 2 +- hw/m68k/mcf5208.c | 2 +- hw/m68k/mcf_intc.c | 2 +- hw/m68k/next-cube.c | 6 ++--- hw/m68k/q800.c | 12 ++++----- hw/microblaze/petalogix_ml605_mmu.c | 10 ++++---- hw/microblaze/petalogix_s3adsp1800_mmu.c | 6 ++--- hw/mips/boston.c | 4 +-- hw/mips/gt64xxx_pci.c | 2 +- hw/mips/jazz.c | 8 +++--- hw/mips/malta.c | 2 +- hw/mips/mipssim.c | 4 +-- hw/net/etraxfs_eth.c | 2 +- hw/net/fsl_etsec/etsec.c | 2 +- hw/net/lan9118.c | 2 +- hw/net/lasi_i82596.c | 2 +- hw/net/smc91c111.c | 2 +- hw/nios2/10m50_devboard.c | 6 ++--- hw/nvram/fw_cfg.c | 4 +-- hw/openrisc/openrisc_sim.c | 4 +-- hw/pci-bridge/pci_expander_bridge.c | 2 +- hw/pci-host/bonito.c | 2 +- hw/pci-host/i440fx.c | 2 +- hw/pcmcia/pxa2xx.c | 2 +- hw/ppc/e500.c | 16 ++++++------ hw/ppc/mac_newworld.c | 16 ++++++------ hw/ppc/mac_oldworld.c | 6 ++--- hw/ppc/pnv.c | 8 +++--- hw/ppc/ppc440_uc.c | 4 +-- hw/ppc/prep.c | 4 +-- hw/ppc/sam460ex.c | 2 +- hw/ppc/spapr.c | 2 +- hw/ppc/spapr_irq.c | 2 +- hw/ppc/spapr_vio.c | 2 +- hw/ppc/virtex_ml507.c | 4 +-- hw/riscv/sifive_clint.c | 2 +- hw/riscv/sifive_e_prci.c | 2 +- hw/riscv/sifive_plic.c | 2 +- hw/riscv/sifive_test.c | 2 +- hw/riscv/virt.c | 4 +-- hw/rtc/m48t59.c | 2 +- hw/rtc/sun4v-rtc.c | 2 +- hw/s390x/ap-bridge.c | 2 +- hw/s390x/css-bridge.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- hw/s390x/sclp.c | 2 +- hw/sd/pxa2xx_mmci.c | 2 +- hw/sh4/r2d.c | 6 ++--- hw/sparc/leon3.c | 10 ++++---- hw/sparc/sun4m.c | 32 ++++++++++++------------ hw/sparc64/sun4u.c | 12 ++++----- hw/xen/xen-bus.c | 2 +- hw/xen/xen-legacy-backend.c | 2 +- hw/xtensa/virt.c | 2 +- hw/xtensa/xtfpga.c | 4 +-- 114 files changed, 257 insertions(+), 257 deletions(-)
hw/lm32/lm32.h +3 -3
@@ -11,8 +11,8 @@ static inline DeviceState *lm32_pic_init(qemu_irq cpu_irq)SysBusDevice *d; dev =qdev_new ("lm32-pic" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); d =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (d, &error_fatal);sysbus_connect_irq (d,0 , cpu_irq);return dev;
@@ -24,7 +24,7 @@ static inline DeviceState *lm32_juart_init(Chardev *chr) dev =qdev_new (TYPE_LM32_JUART );qdev_prop_set_chr (dev,"chardev" , chr); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);return dev; }
@@ -39,7 +39,7 @@ static inline DeviceState *lm32_uart_create(hwaddr addr, dev =qdev_new ("lm32-uart" ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , addr);sysbus_connect_irq (s,0 , irq);return dev;
hw/lm32/milkymist-hw.h +9 -9
@@ -13,7 +13,7 @@ static inline DeviceState *milkymist_uart_create(hwaddr base, dev =qdev_new ("milkymist-uart" );qdev_prop_set_chr (dev,"chardev" , chr); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq);
@@ -25,7 +25,7 @@ static inline DeviceState *milkymist_hpdmc_create(hwaddr base)DeviceState *dev; dev =qdev_new ("milkymist-hpdmc" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return dev;
@@ -36,7 +36,7 @@ static inline DeviceState *milkymist_memcard_create(hwaddr base)DeviceState *dev; dev =qdev_new ("milkymist-memcard" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return dev;
@@ -50,7 +50,7 @@ static inline DeviceState *milkymist_vgafb_create(hwaddr base, dev =qdev_new ("milkymist-vgafb" );qdev_prop_set_uint32 (dev,"fb_offset" , fb_offset);qdev_prop_set_uint32 (dev,"fb_mask" , fb_mask); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return dev;
@@ -68,7 +68,7 @@ static inline DeviceState *milkymist_sysctl_create(hwaddr base,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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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);
@@ -83,7 +83,7 @@ static inline DeviceState *milkymist_pfpu_create(hwaddr base,DeviceState *dev; dev =qdev_new ("milkymist-pfpu" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq);return dev;
@@ -96,7 +96,7 @@ static inline DeviceState *milkymist_ac97_create(hwaddr base,DeviceState *dev; dev =qdev_new ("milkymist-ac97" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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);
@@ -114,7 +114,7 @@ static inline DeviceState *milkymist_minimac2_create(hwaddr base,qemu_check_nic_model (&nd_table[0 ],"minimac2" ); dev =qdev_new ("milkymist-minimac2" );qdev_set_nic_properties (dev, &nd_table[0 ]); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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);
@@ -132,7 +132,7 @@ static inline DeviceState *milkymist_softusb_create(hwaddr base, dev =qdev_new ("milkymist-softusb" );qdev_prop_set_uint32 (dev,"pmem_size" , pmem_size);qdev_prop_set_uint32 (dev,"dmem_size" , dmem_size); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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 +1 -1
@@ -63,7 +63,7 @@ static inline DeviceState *cadence_uart_create(hwaddr addr, dev =qdev_new (TYPE_CADENCE_UART ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , addr);sysbus_connect_irq (s,0 , irq);
include/hw/char/cmsdk-apb-uart.h +1 -1
@@ -66,7 +66,7 @@ static inline DeviceState *cmsdk_apb_uart_create(hwaddr addr, s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr);qdev_prop_set_uint32 (dev,"pclk-frq" , pclk_frq); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (s, &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 +2 -2
@@ -61,7 +61,7 @@ static inline DeviceState *pl011_create(hwaddr addr, dev =qdev_new ("pl011" ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , addr);sysbus_connect_irq (s,0 , irq);
@@ -78,7 +78,7 @@ static inline DeviceState *pl011_luminary_create(hwaddr addr, dev =qdev_new ("pl011_luminary" ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , addr);sysbus_connect_irq (s,0 , irq);
include/hw/char/xilinx_uartlite.h +1 -1
@@ -28,7 +28,7 @@ static inline DeviceState *xilinx_uartlite_create(hwaddr addr, dev =qdev_new ("xlnx.xps-uartlite" ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , addr);sysbus_connect_irq (s,0 , irq);
include/hw/cris/etraxfs.h +1 -1
@@ -44,7 +44,7 @@ static inline DeviceState *etraxfs_ser_create(hwaddr addr, dev =qdev_new ("etraxfs,serial" ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , addr);sysbus_connect_irq (s,0 , irq);return dev;
include/hw/misc/unimp.h +1 -1
@@ -45,7 +45,7 @@ static inline void create_unimplemented_device(const char *name,qdev_prop_set_string (dev,"name" , name);qdev_prop_set_uint64 (dev,"size" , size); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map_overlap (SYS_BUS_DEVICE (dev),0 , base,-1000 ); }
include/hw/timer/cmsdk-apb-timer.h +1 -1
@@ -51,7 +51,7 @@ static inline DeviceState *cmsdk_apb_timer_create(hwaddr addr, dev =qdev_new (TYPE_CMSDK_APB_TIMER ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_uint32 (dev,"pclk-frq" , pclk_frq); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , addr);sysbus_connect_irq (s,0 , timerint);return dev;
hw/alpha/typhoon.c +1 -1
@@ -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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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/exynos4210.c +9 -9
@@ -184,8 +184,8 @@ static DeviceState *pl330_create(uint32_t base, qemu_or_irq *orgate,qdev_prop_set_uint8 (dev,"rd_q_dep" ,8 );qdev_prop_set_uint8 (dev,"data_width" , width);qdev_prop_set_uint16 (dev,"data_buffer_dep" , width); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_mmio_map (busdev,0 , base); object_property_set_int(OBJECT(orgate), nevents + 1, "num-lines",
@@ -234,7 +234,7 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp)for (i =0 ; i <EXYNOS4210_NCPUS ; i++) { dev =qdev_new ("exynos4210.irq_gate" );qdev_prop_set_uint32 (dev,"n_in" ,EXYNOS4210_IRQ_GATE_NINPUTS ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);/* Get IRQ Gate input in gate_irq */ for (n =0 ; n <EXYNOS4210_IRQ_GATE_NINPUTS ; n++) { gate_irq[i][n] =qdev_get_gpio_in (dev, n);
@@ -249,8 +249,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp)/* Private memory region and Internal GIC */ dev =qdev_new (TYPE_A9MPCORE_PRIV );qdev_prop_set_uint32 (dev,"num-cpu" ,EXYNOS4210_NCPUS ); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,EXYNOS4210_SMP_PRIVATE_BASE_ADDR );for (n =0 ; n <EXYNOS4210_NCPUS ; n++) {sysbus_connect_irq (busdev, n, gate_irq[n][0 ]);
@@ -265,8 +265,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp)/* External GIC */ dev =qdev_new ("exynos4210.gic" );qdev_prop_set_uint32 (dev,"num-cpu" ,EXYNOS4210_NCPUS ); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);/* Map CPU interface */ sysbus_mmio_map (busdev,0 ,EXYNOS4210_EXT_GIC_CPU_BASE_ADDR );/* Map Distributer interface */
@@ -280,8 +280,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp)/* Internal Interrupt Combiner */ dev =qdev_new ("exynos4210.combiner" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);for (n =0 ; n <EXYNOS4210_MAX_INT_COMBINER_OUT_IRQ ; n++) {sysbus_connect_irq (busdev, n, s->irqs.int_gic_irq[n]); }
@@ -291,8 +291,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp)/* External Interrupt Combiner */ dev =qdev_new ("exynos4210.combiner" );qdev_prop_set_uint32 (dev,"external" ,1 ); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);for (n =0 ; n <EXYNOS4210_MAX_INT_COMBINER_OUT_IRQ ; n++) {sysbus_connect_irq (busdev, n, s->irqs.ext_gic_irq[n]); }
@@ -354,8 +354,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp)/* Multi Core Timer */ dev =qdev_new ("exynos4210.mct" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);for (n =0 ; n <4 ; n++) {/* Connect global timer interrupts to Combiner gpio_in */ sysbus_connect_irq(busdev, n,
@@ -380,8 +380,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) } dev =qdev_new ("exynos4210.i2c" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_connect_irq (busdev,0 , i2c_irq);sysbus_mmio_map (busdev,0 , addr); s->i2c_if[n] = (I2CBus *)qdev_get_child_bus (dev,"i2c" );
@@ -425,9 +425,9 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp)*/ dev =qdev_new (TYPE_S3C_SDHCI );qdev_prop_set_uint64 (dev,"capareg" ,EXYNOS4210_SDHCI_CAPABILITIES ); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,EXYNOS4210_SDHCI_ADDR (n));sysbus_connect_irq (busdev,0 , s->irq_table[exynos4210_get_irq (29 , n)]);
hw/arm/exynos4_boards.c +1 -1
@@ -84,8 +84,8 @@ static void lan9215_init(uint32_t base, qemu_irq irq) dev =qdev_new (TYPE_LAN9118 );qdev_set_nic_properties (dev, &nd_table[0 ]);qdev_prop_set_uint32 (dev,"mode_16bit" ,1 ); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , base);sysbus_connect_irq (s,0 , irq); }
hw/arm/highbank.c +6 -6
@@ -312,8 +312,8 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)switch (machine_id) {case CALXEDA_HIGHBANK : dev =qdev_new ("l2x0" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,0xfff12000 ); dev =qdev_new (TYPE_A9MPCORE_PRIV );
@@ -324,8 +324,8 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) }qdev_prop_set_uint32 (dev,"num-cpu" , smp_cpus);qdev_prop_set_uint32 (dev,"num-irq" ,NIRQ_GIC ); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,MPCORE_PERIPHBASE );for (n =0 ; n < smp_cpus; n++) {sysbus_connect_irq (busdev, n, cpu_irq[n]);
@@ -341,15 +341,15 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) dev =qdev_new ("sp804" );qdev_prop_set_uint32 (dev,"freq0" ,150000000 );qdev_prop_set_uint32 (dev,"freq1" ,150000000 ); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,0xfff34000 );sysbus_connect_irq (busdev,0 , pic[18 ]);pl011_create (0xfff36000 , pic[20 ],serial_hd (0 )); dev =qdev_new (TYPE_HIGHBANK_REGISTERS ); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,0xfff3c000 );sysbus_create_simple ("pl061" ,0xfff30000 , pic[14 ]);
@@ -365,7 +365,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)qemu_check_nic_model (&nd_table[0 ],"xgmac" ); dev =qdev_new ("xgmac" );qdev_set_nic_properties (dev, &nd_table[0 ]); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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 ]);
@@ -374,7 +374,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)qemu_check_nic_model (&nd_table[1 ],"xgmac" ); dev =qdev_new ("xgmac" );qdev_set_nic_properties (dev, &nd_table[1 ]); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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/integratorcp.c +1 -1
@@ -622,7 +622,7 @@ static void integratorcp_init(MachineState *machine) dev =qdev_new (TYPE_INTEGRATOR_CM );qdev_prop_set_uint32 (dev,"memsz" , ram_size >>20 ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map ((SysBusDevice *)dev,0 ,0x10000000 ); dev = sysbus_create_varargs(TYPE_INTEGRATOR_PIC, 0x14000000,
hw/arm/mps2-tz.c +1 -1
@@ -247,9 +247,9 @@ static MemoryRegion *make_eth_dev(MPS2TZMachineState *mms, void *opaque,qemu_check_nic_model (nd,"lan9118" ); mms->lan9118 =qdev_new (TYPE_LAN9118 );qdev_set_nic_properties (mms->lan9118, nd); -qdev_realize_and_unref (mms->lan9118,NULL , &error_fatal); s =SYS_BUS_DEVICE (mms->lan9118); +sysbus_realize_and_unref (s, &error_fatal);sysbus_connect_irq (s,0 ,get_sse_irq_in (mms,16 ));return sysbus_mmio_get_region (s,0 ); }
hw/arm/msf2-som.c +1 -1
@@ -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 ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); soc =MSF2_SOC (dev);
hw/arm/musicpal.c +2 -2
@@ -1653,7 +1653,7 @@ static void musicpal_init(MachineState *machine)qemu_check_nic_model (&nd_table[0 ],"mv88w8618" ); dev =qdev_new (TYPE_MV88W8618_ETH );qdev_set_nic_properties (dev, &nd_table[0 ]); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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 ]);
@@ -1692,7 +1692,7 @@ static void musicpal_init(MachineState *machine) s =SYS_BUS_DEVICE (dev);object_property_set_link (OBJECT (dev),OBJECT (wm8750_dev),"wm8750" ,NULL ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 ,MP_AUDIO_BASE );sysbus_connect_irq (s,0 , pic[MP_AUDIO_IRQ ]);
hw/arm/netduino2.c +1 -1
@@ -36,7 +36,7 @@ static void netduino2_init(MachineState *machine) dev =qdev_new (TYPE_STM32F205_SOC );qdev_prop_set_string (dev,"cpu-type" ,ARM_CPU_TYPE_NAME ("cortex-m3" )); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);armv7m_load_kernel (ARM_CPU (first_cpu), machine->kernel_filename,FLASH_SIZE );
hw/arm/netduinoplus2.c +1 -1
@@ -36,7 +36,7 @@ static void netduinoplus2_init(MachineState *machine) dev =qdev_new (TYPE_STM32F405_SOC );qdev_prop_set_string (dev,"cpu-type" ,ARM_CPU_TYPE_NAME ("cortex-m4" )); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename,
hw/arm/nseries.c +2 -2
@@ -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_realize_and_unref (s->nand,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (s->nand), &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,
@@ -804,7 +804,7 @@ static void n8x0_usb_setup(struct n800_s *s)SysBusDevice *dev; s->usb =qdev_new ("tusb6010" ); dev =SYS_BUS_DEVICE (s->usb); -qdev_realize_and_unref (s->usb,NULL , &error_fatal); +sysbus_realize_and_unref (dev, &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 +4 -4
@@ -3890,8 +3890,8 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *dram, 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_realize_and_unref (s->ih[0 ],NULL , &error_fatal); busdev =SYS_BUS_DEVICE (s->ih[0 ]); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_connect_irq (busdev,0 ,qdev_get_gpio_in (DEVICE (s->cpu),ARM_CPU_IRQ )); sysbus_connect_irq(busdev, 1,
@@ -3900,8 +3900,8 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *dram, 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_realize_and_unref (s->ih[1 ],NULL , &error_fatal); busdev =SYS_BUS_DEVICE (s->ih[1 ]); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_connect_irq (busdev,0 ,qdev_get_gpio_in (s->ih[0 ],OMAP_INT_15XX_IH2_IRQ ));/* The second interrupt controller's FIQ output is not wired up */
@@ -4013,7 +4013,7 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *dram, 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_realize_and_unref (s->gpio,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (s->gpio), &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 );
@@ -4031,8 +4031,8 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *dram, 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_realize_and_unref (s->i2c[0 ],NULL , &error_fatal); busdev =SYS_BUS_DEVICE (s->i2c[0 ]); +sysbus_realize_and_unref (busdev, &error_fatal);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 ]);sysbus_connect_irq (busdev,2 , s->drq[OMAP_DMA_I2C_RX ]);
hw/arm/omap2.c +4 -4
@@ -2310,8 +2310,8 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sdram,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_realize_and_unref (s->ih[0 ],NULL , &error_fatal); busdev =SYS_BUS_DEVICE (s->ih[0 ]); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_connect_irq (busdev,0 ,qdev_get_gpio_in (DEVICE (s->cpu),ARM_CPU_IRQ )); sysbus_connect_irq(busdev, 1,
@@ -2427,8 +2427,8 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sdram,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_realize_and_unref (s->i2c[0 ],NULL , &error_fatal); busdev =SYS_BUS_DEVICE (s->i2c[0 ]); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_connect_irq (busdev,0 ,qdev_get_gpio_in (s->ih[0 ],OMAP_INT_24XX_I2C1_IRQ ));sysbus_connect_irq (busdev,1 , s->drq[OMAP24XX_DMA_I2C1_TX ]);
@@ -2439,8 +2439,8 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sdram,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_realize_and_unref (s->i2c[1 ],NULL , &error_fatal); busdev =SYS_BUS_DEVICE (s->i2c[1 ]); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_connect_irq (busdev,0 ,qdev_get_gpio_in (s->ih[0 ],OMAP_INT_24XX_I2C2_IRQ ));sysbus_connect_irq (busdev,1 , s->drq[OMAP24XX_DMA_I2C2_TX ]);
@@ -2458,8 +2458,8 @@ 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_realize_and_unref (s->gpio,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (s->gpio); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_connect_irq (busdev,0 ,qdev_get_gpio_in (s->ih[0 ],OMAP_INT_24XX_GPIO_BANK1 )); sysbus_connect_irq(busdev, 3,
hw/arm/pxa2xx.c +2 -2
@@ -1513,9 +1513,9 @@ PXA2xxI2CState *pxa2xx_i2c_init(hwaddr base, 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_realize_and_unref (dev,NULL , &error_fatal); i2c_dev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (i2c_dev, &error_fatal);sysbus_mmio_map (i2c_dev,0 , base & ~region_size);sysbus_connect_irq (i2c_dev,0 , irq);
@@ -2075,8 +2075,8 @@ static PXA2xxFIrState *pxa2xx_fir_init(MemoryRegion *sysmem, dev =qdev_new (TYPE_PXA2XX_FIR );qdev_prop_set_chr (dev,"chardev" , chr); -qdev_realize_and_unref (dev,NULL , &error_fatal); sbd =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (sbd, &error_fatal);sysbus_mmio_map (sbd,0 , base);sysbus_connect_irq (sbd,0 , irq);sysbus_connect_irq (sbd,1 , rx_dma);
hw/arm/pxa2xx_gpio.c +1 -1
@@ -273,7 +273,7 @@ DeviceState *pxa2xx_gpio_init(hwaddr base, dev =qdev_new (TYPE_PXA2XX_GPIO );qdev_prop_set_int32 (dev,"lines" , lines);qdev_prop_set_int32 (dev,"ncpu" , cs->cpu_index); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,
hw/arm/pxa2xx_pic.c +1 -1
@@ -280,7 +280,7 @@ DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu) s->is_fiq[0 ] =0 ; s->is_fiq[1 ] =0 ; -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);qdev_init_gpio_in (dev, pxa2xx_pic_set_irq,PXA2XX_PIC_SRCS );
hw/arm/realview.c +5 -5
@@ -164,14 +164,14 @@ static void realview_init(MachineState *machine, sysctl =qdev_new ("realview_sysctl" );qdev_prop_set_uint32 (sysctl,"sys_id" , sys_id);qdev_prop_set_uint32 (sysctl,"proc_id" , proc_id); -qdev_realize_and_unref (sysctl,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (sysctl), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (sysctl),0 ,0x10000000 );if (is_mpcore) { dev =qdev_new (is_pb ?TYPE_A9MPCORE_PRIV :"realview_mpcore" );qdev_prop_set_uint32 (dev,"num-cpu" , smp_cpus); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_mmio_map (busdev,0 , periphbase);for (n =0 ; n < smp_cpus; n++) {sysbus_connect_irq (busdev, n, cpu_irq[n]);
@@ -190,7 +190,7 @@ static void realview_init(MachineState *machine, pl041 =qdev_new ("pl041" );qdev_prop_set_uint32 (pl041,"nc_fifo_depth" ,512 ); -qdev_realize_and_unref (pl041,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (pl041), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (pl041),0 ,0x10004000 );sysbus_connect_irq (SYS_BUS_DEVICE (pl041),0 , pic[19 ]);
@@ -206,8 +206,8 @@ static void realview_init(MachineState *machine, dev =qdev_new ("pl081" );object_property_set_link (OBJECT (dev),OBJECT (sysmem),"downstream" , &error_fatal); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,0x10030000 );sysbus_connect_irq (busdev,0 , pic[24 ]);
@@ -241,7 +241,7 @@ static void realview_init(MachineState *machine,if (!is_pb) { dev =qdev_new ("realview_pci" ); busdev =SYS_BUS_DEVICE (dev); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (busdev, &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 +6 -6
@@ -243,7 +243,7 @@ static void sbsa_flash_map1(PFlashCFI01 *flash,assert (QEMU_IS_ALIGNED (size,SBSA_FLASH_SECTOR_SIZE ));assert (size /SBSA_FLASH_SECTOR_SIZE <=UINT32_MAX );qdev_prop_set_uint32 (dev,"num-blocks" , size /SBSA_FLASH_SECTOR_SIZE ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); memory_region_add_subregion(sysmem, base, sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),
@@ -356,8 +356,8 @@ 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_realize_and_unref (sms->gic,NULL , &error_fatal); gicbusdev =SYS_BUS_DEVICE (sms->gic); +sysbus_realize_and_unref (gicbusdev, &error_fatal);sysbus_mmio_map (gicbusdev,0 , sbsa_ref_memmap[SBSA_GIC_DIST ].base);sysbus_mmio_map (gicbusdev,1 , sbsa_ref_memmap[SBSA_GIC_REDIST ].base);
@@ -413,7 +413,7 @@ static void create_uart(const SBSAMachineState *sms, int uart,SysBusDevice *s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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));
@@ -466,7 +466,7 @@ static void create_ahci(const SBSAMachineState *sms) dev =qdev_new ("sysbus-ahci" );qdev_prop_set_uint32 (dev,"num-ports" ,NUM_SATA_PORTS ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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));
@@ -501,7 +501,7 @@ static void create_smmu(const SBSAMachineState *sms, PCIBus *bus)object_property_set_link (OBJECT (dev),OBJECT (bus),"primary-bus" , &error_abort); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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,
@@ -526,7 +526,7 @@ static void create_pcie(SBSAMachineState *sms)int i; dev =qdev_new (TYPE_GPEX_HOST ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);/* Map ECAM space */ ecam_alias =g_new0 (MemoryRegion,1 );
hw/arm/spitz.c +1 -1
@@ -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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,FLASH_BASE ); }
hw/arm/stellaris.c +3 -3
@@ -1315,7 +1315,7 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board)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_realize_and_unref (nvic,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (nvic), &error_fatal);qdev_connect_gpio_out_named (nvic,"SYSRESETREQ" ,0 ,qemu_allocate_irq (&do_sys_reset,NULL ,0 ));
@@ -1353,7 +1353,7 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board)uint32_t mainclk =NANOSECONDS_PER_SECOND / system_clock_scale;qdev_prop_set_uint32 (dev,"wdogclk-frq" , mainclk); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0x40000000u );
@@ -1427,7 +1427,7 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board) enet =qdev_new ("stellaris_enet" );qdev_set_nic_properties (enet, &nd_table[0 ]); -qdev_realize_and_unref (enet,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (enet), &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 +2 -2
@@ -646,7 +646,7 @@ static DeviceState *strongarm_gpio_init(hwaddr base,int i; dev =qdev_new (TYPE_STRONGARM_GPIO ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);for (i =0 ; i <12 ; i++)
@@ -1629,7 +1629,7 @@ StrongARMState *sa1110_init(const char *cpu_type)for (i =0 ; sa_serial[i].io_base; i++) {DeviceState *dev =qdev_new (TYPE_STRONGARM_UART );qdev_prop_set_chr (dev,"chardev" ,serial_hd (i)); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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 +4 -4
@@ -226,7 +226,7 @@ static void versatile_init(MachineState *machine, int board_id) sysctl =qdev_new ("realview_sysctl" );qdev_prop_set_uint32 (sysctl,"sys_id" ,0x41007004 );qdev_prop_set_uint32 (sysctl,"proc_id" ,0x02000000 ); -qdev_realize_and_unref (sysctl,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (sysctl), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (sysctl),0 ,0x10000000 ); dev = sysbus_create_varargs("pl190", 0x10140000,
@@ -247,7 +247,7 @@ static void versatile_init(MachineState *machine, int board_id) dev =qdev_new ("versatile_pci" ); busdev =SYS_BUS_DEVICE (dev); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (busdev, &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 */
@@ -289,8 +289,8 @@ static void versatile_init(MachineState *machine, int board_id) dev =qdev_new ("pl080" );object_property_set_link (OBJECT (dev),OBJECT (sysmem),"downstream" , &error_fatal); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,0x10130000 );sysbus_connect_irq (busdev,0 , pic[17 ]);
@@ -321,7 +321,7 @@ static void versatile_init(MachineState *machine, int board_id)/* Add PL041 AACI Interface to the LM4549 codec */ pl041 =qdev_new ("pl041" );qdev_prop_set_uint32 (pl041,"nc_fifo_depth" ,512 ); -qdev_realize_and_unref (pl041,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (pl041), &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 +4 -4
@@ -238,8 +238,8 @@ static void init_cpus(MachineState *ms, const char *cpu_type,*/ dev =qdev_new (privdev);qdev_prop_set_uint32 (dev,"num-cpu" , smp_cpus); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_mmio_map (busdev,0 , periphbase);/* Interrupts [42:0] are from the motherboard;
@@ -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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return PFLASH_CFI01 (dev);
@@ -610,7 +610,7 @@ static void vexpress_common_init(MachineState *machine)qdev_prop_set_uint32 (sysctl, propname, daughterboard->clocks[i]);g_free (propname); } -qdev_realize_and_unref (sysctl,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (sysctl), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (sysctl),0 , map[VE_SYSREGS ]);/* VE_SP810: not modelled */
@@ -618,7 +618,7 @@ static void vexpress_common_init(MachineState *machine) pl041 =qdev_new ("pl041" );qdev_prop_set_uint32 (pl041,"nc_fifo_depth" ,512 ); -qdev_realize_and_unref (pl041,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (pl041), &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 +9 -9
@@ -579,7 +579,7 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms)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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);return dev; }
@@ -598,7 +598,7 @@ static void create_its(VirtMachineState *vms)object_property_set_link (OBJECT (dev),OBJECT (vms->gic),"parent-gicv3" , &error_abort); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , vms->memmap[VIRT_GIC_ITS ].base);fdt_add_its_gic_node (vms);
@@ -614,7 +614,7 @@ static void create_v2m(VirtMachineState *vms)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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);for (i =0 ; i <NUM_GICV2M_SPIS ; i++) { sysbus_connect_irq(SYS_BUS_DEVICE(dev), i,
@@ -671,8 +671,8 @@ static void create_gic(VirtMachineState *vms) vms->virt); } } -qdev_realize_and_unref (vms->gic,NULL , &error_fatal); gicbusdev =SYS_BUS_DEVICE (vms->gic); +sysbus_realize_and_unref (gicbusdev, &error_fatal);sysbus_mmio_map (gicbusdev,0 , vms->memmap[VIRT_GIC_DIST ].base);if (type ==3 ) {sysbus_mmio_map (gicbusdev,1 , vms->memmap[VIRT_GIC_REDIST ].base);
@@ -758,7 +758,7 @@ static void create_uart(const VirtMachineState *vms, int uart,SysBusDevice *s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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));
@@ -980,7 +980,7 @@ static void virt_flash_map1(PFlashCFI01 *flash,assert (QEMU_IS_ALIGNED (size,VIRT_FLASH_SECTOR_SIZE ));assert (size /VIRT_FLASH_SECTOR_SIZE <=UINT32_MAX );qdev_prop_set_uint32 (dev,"num-blocks" , size /VIRT_FLASH_SECTOR_SIZE ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); memory_region_add_subregion(sysmem, base, sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),
@@ -1177,7 +1177,7 @@ static void create_smmu(const VirtMachineState *vms,object_property_set_link (OBJECT (dev),OBJECT (bus),"primary-bus" , &error_abort); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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,
@@ -1254,7 +1254,7 @@ static void create_pcie(VirtMachineState *vms)PCIHostState *pci; dev =qdev_new (TYPE_GPEX_HOST ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); ecam_id =VIRT_ECAM_ID (vms->highmem_ecam); base_ecam = vms->memmap[ecam_id].base;
@@ -1376,7 +1376,7 @@ static void create_platform_bus(VirtMachineState *vms) 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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); vms->platform_bus_dev = dev; s =SYS_BUS_DEVICE (dev);
hw/arm/xilinx_zynq.c +8 -8
@@ -119,8 +119,8 @@ static void gem_init(NICInfo *nd, uint32_t base, qemu_irq irq)qemu_check_nic_model (nd,TYPE_CADENCE_GEM );qdev_set_nic_properties (dev, nd); } -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , base);sysbus_connect_irq (s,0 , irq); }
@@ -140,8 +140,8 @@ static inline void zynq_init_spi_flashes(uint32_t base_addr, qemu_irq irq,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_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_mmio_map (busdev,0 , base_addr);if (is_qspi) {sysbus_mmio_map (busdev,1 ,0xFC000000 );
@@ -223,7 +223,7 @@ static void zynq_init(MachineState *machine)/* Create slcr, keep a pointer to connect clocks */ slcr =qdev_new ("xilinx,zynq_slcr" ); -qdev_realize_and_unref (slcr,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (slcr), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (slcr),0 ,0xF8000000 );/* Create the main clock source, and feed slcr with it */
@@ -236,8 +236,8 @@ static void zynq_init(MachineState *machine) dev =qdev_new (TYPE_A9MPCORE_PRIV );qdev_prop_set_uint32 (dev,"num-cpu" ,1 ); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,MPCORE_PERIPHBASE );sysbus_connect_irq (busdev,0 ,qdev_get_gpio_in (DEVICE (cpu),ARM_CPU_IRQ ));
@@ -283,7 +283,7 @@ static void zynq_init(MachineState *machine) 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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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 ]);
@@ -296,7 +296,7 @@ static void zynq_init(MachineState *machine) } dev =qdev_new (TYPE_ZYNQ_XADC ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0xF8007100 );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[39 -IRQ_OFFSET ]);
@@ -312,8 +312,8 @@ 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_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,0xF8003000 );sysbus_connect_irq (busdev,0 , pic[45 -IRQ_OFFSET ]);/* abort irq line */ for (n =0 ; n <ARRAY_SIZE (dma_irqs); ++n) {/* event irqs */
@@ -321,8 +321,8 @@ static void zynq_init(MachineState *machine) } dev =qdev_new ("xlnx.ps7-dev-cfg" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_connect_irq (busdev,0 , pic[40 -IRQ_OFFSET ]);sysbus_mmio_map (busdev,0 ,0xF8007000 );
hw/arm/xlnx-versal-virt.c +1 -1
@@ -434,7 +434,7 @@ static void create_virtio_regions(VersalVirt *s) pic_irq =qdev_get_gpio_in (DEVICE (&s->soc.fpd.apu.gic), irq); dev =qdev_new ("virtio-mmio" );object_property_add_child (OBJECT (&s->soc), name,OBJECT (dev)); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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);
hw/arm/xlnx-versal.c +1 -1
@@ -309,7 +309,7 @@ static void versal_unimp_area(Versal *s, const char *name,qdev_prop_set_string (dev,"name" , name);qdev_prop_set_uint64 (dev,"size" , size);object_property_add_child (OBJECT (s), name,OBJECT (dev)); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); mr_dev =sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 );memory_region_add_subregion (mr, base, mr_dev);
hw/block/fdc.c +2 -2
@@ -2583,8 +2583,8 @@ 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_realize_and_unref (dev,NULL , &error_fatal); sbd =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (sbd, &error_fatal);sysbus_connect_irq (sbd,0 , irq);sysbus_mmio_map (sbd,0 , mmio_base); }
@@ -2600,7 +2600,7 @@ void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base,qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (fds[0 ]), &error_fatal); } -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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 +1 -1
@@ -974,7 +974,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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return PFLASH_CFI01 (dev);
hw/block/pflash_cfi02.c +1 -1
@@ -1016,7 +1016,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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return PFLASH_CFI02 (dev);
hw/char/exynos4210_uart.c +1 -1
@@ -661,7 +661,7 @@ DeviceState *exynos4210_uart_create(hwaddr addr,qdev_prop_set_uint32 (dev,"tx-size" , fifo_size); bus =SYS_BUS_DEVICE (dev); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (bus, &error_fatal);if (addr != (hwaddr)-1 ) {sysbus_mmio_map (bus,0 , addr); }
hw/char/mcf_uart.c +1 -1
@@ -348,7 +348,7 @@ void *mcf_uart_init(qemu_irq irq, Chardev *chrdrv)if (chrdrv) {qdev_prop_set_chr (dev,"chardev" , chrdrv); } -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq);
hw/char/serial.c +1 -1
@@ -1134,7 +1134,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_realize_and_unref (DEVICE (smm),NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (smm), &error_fatal);sysbus_connect_irq (SYS_BUS_DEVICE (smm),0 , irq); mr =sysbus_mmio_get_region (SYS_BUS_DEVICE (smm),0 );
hw/core/empty_slot.c +1 -1
@@ -66,7 +66,7 @@ void empty_slot_init(hwaddr addr, uint64_t slot_size) e =EMPTY_SLOT (dev); e->size = slot_size; -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , addr); }
hw/core/sysbus.c +1 -1
@@ -232,7 +232,7 @@ DeviceState *sysbus_create_varargs(const char *name, dev =qdev_new (name); s =SYS_BUS_DEVICE (dev); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (s, &error_fatal);if (addr != (hwaddr)-1 ) {sysbus_mmio_map (s,0 , addr); }
hw/cris/axis_dev88.c +1 -1
@@ -290,8 +290,8 @@ void axisdev88_init(MachineState *machine) dev =qdev_new ("etraxfs,pic" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 ,0x3001c000 );sysbus_connect_irq (s,0 ,qdev_get_gpio_in (DEVICE (cpu),CRIS_CPU_IRQ ));sysbus_connect_irq (s,1 ,qdev_get_gpio_in (DEVICE (cpu),CRIS_CPU_NMI ));
hw/display/milkymist-tmu2.c +1 -1
@@ -544,7 +544,7 @@ DeviceState *milkymist_tmu2_create(hwaddr base, qemu_irq irq)XCloseDisplay (d); dev =qdev_new (TYPE_MILKYMIST_TMU2 ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq);
hw/display/sm501.c +1 -1
@@ -1971,7 +1971,7 @@ static void sm501_realize_sysbus(DeviceState *dev, Error **errp) 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_realize_and_unref (usb_dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (usb_dev), &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 +2 -2
@@ -497,7 +497,7 @@ DeviceState *pxa27x_dma_init(hwaddr base, qemu_irq irq) dev =qdev_new ("pxa2xx-dma" );qdev_prop_set_int32 (dev,"channels" ,PXA27X_DMA_NUM_CHANNELS ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq);
@@ -511,7 +511,7 @@ DeviceState *pxa255_dma_init(hwaddr base, qemu_irq irq) dev =qdev_new ("pxa2xx-dma" );qdev_prop_set_int32 (dev,"channels" ,PXA27X_DMA_NUM_CHANNELS ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq);
hw/dma/rc4030.c +1 -1
@@ -746,7 +746,7 @@ DeviceState *rc4030_init(rc4030_dma **dmas, IOMMUMemoryRegion **dma_mr)DeviceState *dev; dev =qdev_new (TYPE_RC4030 ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); *dmas =rc4030_allocate_dmas (dev,4 ); *dma_mr = &RC4030 (dev)->dma_mr;
hw/dma/sparc32_dma.c +4 -4
@@ -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_realize_and_unref (d,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (d), &error_fatal); }static void sparc32_espdma_device_class_init (ObjectClass *klass,void *data)
@@ -347,7 +347,7 @@ static void sparc32_ledma_device_realize(DeviceState *dev, Error **errp)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_realize_and_unref (d,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (d), &error_fatal); }static void sparc32_ledma_device_class_init (ObjectClass *klass,void *data)
@@ -381,7 +381,7 @@ static void sparc32_dma_realize(DeviceState *dev, Error **errp) 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_realize_and_unref (espdma,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (espdma), &error_fatal); esp =DEVICE (object_resolve_path_component (OBJECT (espdma),"esp" )); sbd =SYS_BUS_DEVICE (esp);
@@ -396,7 +396,7 @@ static void sparc32_dma_realize(DeviceState *dev, Error **errp) 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_realize_and_unref (ledma,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (ledma), &error_fatal); lance =DEVICE (object_resolve_path_component (OBJECT (ledma),"lance" )); sbd =SYS_BUS_DEVICE (lance);
hw/hppa/dino.c +1 -1
@@ -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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);/* Set up windows into PCI bus memory. */ for (i =1 ; i <31 ; i++) {
hw/hppa/lasi.c +1 -1
@@ -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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);/* LAN */ if (enable_lasi_lan ()) {
hw/hppa/machine.c +1 -1
@@ -125,8 +125,8 @@ static void machine_hppa_init(MachineState *machine)/* Graphics setup. */ if (machine->enable_graphics && vga_interface_type !=VGA_NONE ) { dev =qdev_new ("artist" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 ,LASI_GFX_HPA );sysbus_mmio_map (s,1 ,ARTIST_FB_ADDR ); }
hw/i386/pc.c +1 -1
@@ -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_realize_and_unref (hpet,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (hpet), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (hpet),0 ,HPET_BASE );for (i =0 ; i <GSI_NUM_PINS ; i++) {
hw/i386/pc_q35.c +1 -1
@@ -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_realize_and_unref (DEVICE (q35_host),NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (q35_host), &error_fatal); phb =PCI_HOST_BRIDGE (q35_host); host_bus = phb->bus;/* create ISA bus */
hw/i386/pc_sysfw.c +1 -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_realize_and_unref (DEVICE (system_flash),NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (system_flash), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (system_flash),0 ,0x100000000ULL - total_size);
hw/i386/x86.c +1 -1
@@ -351,8 +351,8 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name) }object_property_add_child (object_resolve_path (parent_name,NULL ),"ioapic" ,OBJECT (dev)); -qdev_realize_and_unref (dev,NULL , &error_fatal); d =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (d, &error_fatal);sysbus_mmio_map (d,0 ,IO_APIC_DEFAULT_ADDRESS );for (i =0 ; i <IOAPIC_NUM_PINS ; i++) {
hw/intc/exynos4210_gic.c +1 -1
@@ -300,8 +300,8 @@ static void exynos4210_gic_realize(DeviceState *dev, Error **errp) 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_realize_and_unref (s->gic,NULL , &error_fatal); gicbusdev =SYS_BUS_DEVICE (s->gic); +sysbus_realize_and_unref (gicbusdev, &error_fatal);/* Pass through outbound IRQ lines from the GIC */ sysbus_pass_irq (sbd, gicbusdev);
hw/intc/s390_flic.c +1 -1
@@ -71,7 +71,7 @@ void s390_flic_init(void)object_property_add_child (qdev_get_machine (),TYPE_QEMU_S390_FLIC ,OBJECT (dev)); } -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); } static int qemu_s390_register_io_adapter(S390FLICState *fs, uint32_t id,
hw/isa/isa-bus.c +1 -1
@@ -62,7 +62,7 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion* address_space, }if (!dev) { dev =qdev_new ("isabus-bridge" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); } isabus =ISA_BUS (qbus_create (TYPE_ISA_BUS , dev,NULL ));
hw/m68k/mcf5208.c +1 -1
@@ -216,9 +216,9 @@ static void mcf_fec_init(MemoryRegion *sysmem, NICInfo *nd, hwaddr base,qemu_check_nic_model (nd,TYPE_MCF_FEC_NET ); dev =qdev_new (TYPE_MCF_FEC_NET );qdev_set_nic_properties (dev, nd); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);for (i =0 ; i <FEC_NUM_IRQ ; i++) {sysbus_connect_irq (s, i, irqs[i]); }
hw/m68k/mcf_intc.c +1 -1
@@ -206,7 +206,7 @@ qemu_irq *mcf_intc_init(MemoryRegion *sysmem,mcf_intc_state *s; dev =qdev_new (TYPE_MCF_INTC ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); s =MCF_INTC (dev); s->cpu = cpu;
hw/m68k/next-cube.c +3 -3
@@ -848,9 +848,9 @@ 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_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_connect_irq (s,0 , ser_irq[0 ]);sysbus_connect_irq (s,1 , ser_irq[1 ]);sysbus_mmio_map (s,0 ,0x2118000 );
@@ -896,7 +896,7 @@ static void next_cube_init(MachineState *machine)/* Framebuffer */ dev =qdev_new (TYPE_NEXTFB ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0x0B000000 );/* MMIO */
@@ -919,7 +919,7 @@ static void next_cube_init(MachineState *machine)/* KBD */ dev =qdev_new (TYPE_NEXTKBD ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0x0200e000 );/* Load ROM here */
hw/m68k/q800.c +6 -6
@@ -224,8 +224,8 @@ static void q800_init(MachineState *machine)qdev_prop_set_drive (via_dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_abort); } -qdev_realize_and_unref (via_dev,NULL , &error_fatal); sysbus =SYS_BUS_DEVICE (via_dev); +sysbus_realize_and_unref (sysbus, &error_fatal);sysbus_mmio_map (sysbus,0 ,VIA_BASE );qdev_connect_gpio_out_named (DEVICE (sysbus),"irq" ,0 , pic[0 ]);qdev_connect_gpio_out_named (DEVICE (sysbus),"irq" ,1 , pic[1 ]);
@@ -265,8 +265,8 @@ static void q800_init(MachineState *machine)qdev_prop_set_bit (dev,"big_endian" , true);object_property_set_link (OBJECT (dev),OBJECT (get_system_memory ()),"dma_mr" , &error_abort); -qdev_realize_and_unref (dev,NULL , &error_fatal); sysbus =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (sysbus, &error_fatal);sysbus_mmio_map (sysbus,0 ,SONIC_BASE );sysbus_mmio_map (sysbus,1 ,SONIC_PROM_BASE );sysbus_connect_irq (sysbus,0 , pic[2 ]);
@@ -282,8 +282,8 @@ 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_realize_and_unref (dev,NULL , &error_fatal); sysbus =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (sysbus, &error_fatal);sysbus_connect_irq (sysbus,0 , pic[3 ]);sysbus_connect_irq (sysbus,1 , pic[3 ]);sysbus_mmio_map (sysbus,0 ,SCC_BASE );
@@ -298,9 +298,9 @@ static void q800_init(MachineState *machine) esp->dma_opaque =NULL ; sysbus_esp->it_shift =4 ; esp->dma_enabled =1 ; -qdev_realize_and_unref (dev,NULL , &error_fatal); sysbus =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (sysbus, &error_fatal);sysbus_connect_irq (sysbus,0 ,qdev_get_gpio_in_named (via_dev,"via2-irq" ,VIA2_IRQ_SCSI_BIT ));
@@ -315,13 +315,13 @@ static void q800_init(MachineState *machine)/* SWIM floppy controller */ dev =qdev_new (TYPE_SWIM ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,SWIM_BASE );/* NuBus */ dev =qdev_new (TYPE_MAC_NUBUS_BRIDGE ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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 );
hw/microblaze/petalogix_ml605_mmu.c +5 -5
@@ -112,7 +112,7 @@ petalogix_ml605_init(MachineState *machine) dev =qdev_new ("xlnx.xps-intc" );qdev_prop_set_uint32 (dev,"kind-of-intr" ,1 <<TIMER_IRQ ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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 ));
@@ -128,7 +128,7 @@ petalogix_ml605_init(MachineState *machine) 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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,TIMER_BASEADDR );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq[TIMER_IRQ ]);
@@ -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_realize_and_unref (eth0,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (eth0), &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_realize_and_unref (dma,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dma), &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 ]);
@@ -175,8 +175,8 @@ petalogix_ml605_init(MachineState *machine) dev =qdev_new ("xlnx.xps-spi" );qdev_prop_set_uint8 (dev,"num-ss-bits" ,NUM_SPI_FLASHES ); -qdev_realize_and_unref (dev,NULL , &error_fatal); busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,SPI_BASEADDR );sysbus_connect_irq (busdev,0 , irq[SPI_IRQ ]);
hw/microblaze/petalogix_s3adsp1800_mmu.c +3 -3
@@ -92,7 +92,7 @@ petalogix_s3adsp1800_init(MachineState *machine) dev =qdev_new ("xlnx.xps-intc" );qdev_prop_set_uint32 (dev,"kind-of-intr" ,1 <<ETHLITE_IRQ |1 <<UARTLITE_IRQ ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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 ));
@@ -107,7 +107,7 @@ petalogix_s3adsp1800_init(MachineState *machine) 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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,TIMER_BASEADDR );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq[TIMER_IRQ ]);
@@ -116,7 +116,7 @@ petalogix_s3adsp1800_init(MachineState *machine)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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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 +2 -2
@@ -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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); cfg =sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 );memory_region_add_subregion_overlap (sys_mem, cfg_base, cfg,0 );
@@ -442,7 +442,7 @@ static void boston_mach_init(MachineState *machine) } dev =qdev_new (TYPE_MIPS_BOSTON ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); s =BOSTON (dev); s->mach = machine;
hw/mips/gt64xxx_pci.c +1 -1
@@ -1213,7 +1213,7 @@ PCIBus *gt64120_register(qemu_irq *pic) &d->pci0_mem,get_system_io (), PCI_DEVFN(18, 0), 4, TYPE_PCI_BUS); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);memory_region_init_io (&d->ISD_mem,OBJECT (dev), &isd_mem_ops, d,"isd-mem" ,0x1000 );
hw/mips/jazz.c +4 -4
@@ -256,8 +256,8 @@ static void mips_jazz_init(MachineState *machine,switch (jazz_model) {case JAZZ_MAGNUM : dev =qdev_new ("sysbus-g364" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); sysbus =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (sysbus, &error_fatal);sysbus_mmio_map (sysbus,0 ,0x60080000 );sysbus_mmio_map (sysbus,1 ,0x40000000 );sysbus_connect_irq (sysbus,0 ,qdev_get_gpio_in (rc4030,3 ));
@@ -292,8 +292,8 @@ static void mips_jazz_init(MachineState *machine,qdev_prop_set_uint8 (dev,"it_shift" ,2 );object_property_set_link (OBJECT (dev),OBJECT (rc4030_dma_mr),"dma_mr" , &error_abort); -qdev_realize_and_unref (dev,NULL , &error_fatal); sysbus =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (sysbus, &error_fatal);sysbus_mmio_map (sysbus,0 ,0x80001000 );sysbus_mmio_map (sysbus,1 ,0x8000b000 );sysbus_connect_irq (sysbus,0 ,qdev_get_gpio_in (rc4030,4 ));
@@ -317,9 +317,9 @@ 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_realize_and_unref (dev,NULL , &error_fatal); sysbus =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (sysbus, &error_fatal);sysbus_connect_irq (sysbus,0 ,qdev_get_gpio_in (rc4030,5 ));sysbus_mmio_map (sysbus,0 ,0x80002000 );
@@ -363,8 +363,8 @@ static void mips_jazz_init(MachineState *machine,/* NVRAM */ dev =qdev_new ("ds1225y" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); sysbus =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (sysbus, &error_fatal);sysbus_mmio_map (sysbus,0 ,0x80009000 );/* LED indicator */
hw/mips/malta.c +1 -1
@@ -1243,7 +1243,7 @@ void mips_malta_init(MachineState *machine)*/ empty_slot_init (0 ,0x20000000 ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);/* create CPU */ mips_create_cpu (machine, s, &cbus_irq, &i8259_irq);
hw/mips/mipssim.c +2 -2
@@ -131,9 +131,9 @@ static void mipsnet_init(int base, qemu_irq irq, NICInfo *nd) dev =qdev_new ("mipsnet" );qdev_set_nic_properties (dev, nd); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_connect_irq (s,0 , irq); memory_region_add_subregion(get_system_io(), base,
@@ -220,7 +220,7 @@ mips_mipssim_init(MachineState *machine)qdev_prop_set_chr (dev,"chardev" ,serial_hd (0 ));qdev_set_legacy_instance_id (dev,0x3f8 ,2 ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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 +1 -1
@@ -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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return dev;
hw/net/fsl_etsec/etsec.c +1 -1
@@ -455,7 +455,7 @@ DeviceState *etsec_create(hwaddr base, dev =qdev_new ("eTSEC" );qdev_set_nic_properties (dev, nd); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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 +1 -1
@@ -1397,8 +1397,8 @@ void lan9118_init(NICInfo *nd, uint32_t base, qemu_irq irq)qemu_check_nic_model (nd,"lan9118" ); dev =qdev_new (TYPE_LAN9118 );qdev_set_nic_properties (dev, nd); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , base);sysbus_connect_irq (s,0 , irq); }
hw/net/lasi_i82596.c +1 -1
@@ -131,7 +131,7 @@ SysBusI82596State *lasi_82596_init(MemoryRegion *addr_space, s =SYSBUS_I82596 (dev); s->state.irq = lan_irq;qdev_set_nic_properties (dev, &nd_table[0 ]); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); s->state.conf.macaddr =HP_MAC ;/* set HP MAC prefix */ /* LASI 82596 ports in main memory. */
hw/net/smc91c111.c +1 -1
@@ -824,8 +824,8 @@ void smc91c111_init(NICInfo *nd, uint32_t base, qemu_irq irq)qemu_check_nic_model (nd,"smc91c111" ); dev =qdev_new (TYPE_SMC91C111 );qdev_set_nic_properties (dev, nd); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , base);sysbus_connect_irq (s,0 , irq); }
hw/nios2/10m50_devboard.c +3 -3
@@ -82,7 +82,7 @@ static void nios2_10m50_ghrd_init(MachineState *machine)/* Register: Internal Interrupt Controller (IIC) */ dev =qdev_new ("altera,iic" );object_property_add_const_link (OBJECT (dev),"cpu" ,OBJECT (cpu)); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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);
@@ -95,14 +95,14 @@ static void nios2_10m50_ghrd_init(MachineState *machine)/* Register: Timer sys_clk_timer */ dev =qdev_new ("ALTR.timer" );qdev_prop_set_uint32 (dev,"clock-frequency" ,75 *1000000 ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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_new ("ALTR.timer" );qdev_prop_set_uint32 (dev,"clock-frequency" ,75 *1000000 ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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 +2 -2
@@ -1106,9 +1106,9 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase,object_property_add_child (OBJECT (qdev_get_machine ()),TYPE_FW_CFG ,OBJECT (dev)); -qdev_realize_and_unref (dev,NULL , &error_fatal); sbd =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (sbd, &error_fatal); ios =FW_CFG_IO (dev);sysbus_add_io (sbd, iobase, &ios->comb_iomem);
@@ -1146,9 +1146,9 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr,object_property_add_child (OBJECT (qdev_get_machine ()),TYPE_FW_CFG ,OBJECT (dev)); -qdev_realize_and_unref (dev,NULL , &error_fatal); sbd =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (sbd, &error_fatal);sysbus_mmio_map (sbd,0 , ctl_addr);sysbus_mmio_map (sbd,1 , data_addr);
hw/openrisc/openrisc_sim.c +2 -2
@@ -61,9 +61,9 @@ static void openrisc_sim_net_init(hwaddr base, hwaddr descriptors, dev =qdev_new ("open_eth" );qdev_set_nic_properties (dev, nd); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);for (i =0 ; i < num_cpus; i++) {sysbus_connect_irq (s,0 , cpu_irqs[i][irq_pin]); }
@@ -80,9 +80,9 @@ static void openrisc_sim_ompic_init(hwaddr base, int num_cpus, dev =qdev_new ("or1k-ompic" );qdev_prop_set_uint32 (dev,"num-cpus" , num_cpus); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);for (i =0 ; i < num_cpus; i++) {sysbus_connect_irq (s, i, cpu_irqs[i][irq_pin]); }
hw/pci-bridge/pci_expander_bridge.c +1 -1
@@ -255,7 +255,7 @@ static void pxb_dev_realize_common(PCIDevice *dev, bool pcie, Error **errp) goto err_register_bus; } -qdev_realize_and_unref (ds,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (ds), &error_fatal);if (bds) {qdev_realize_and_unref (bds, &bus->qbus, &error_fatal); }
hw/pci-host/bonito.c +1 -1
@@ -748,7 +748,7 @@ PCIBus *bonito_init(qemu_irq *pic) phb =PCI_HOST_BRIDGE (dev); pcihost =BONITO_PCI_HOST_BRIDGE (dev); pcihost->pic = pic; -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); d =pci_new (PCI_DEVFN (0 ,0 ),TYPE_PCI_BONITO ); s =PCI_BONITO (d);
hw/pci-host/i440fx.c +1 -1
@@ -276,7 +276,7 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type, address_space_io, 0, TYPE_PCI_BUS); s->bus = b;object_property_add_child (qdev_get_machine (),"i440fx" ,OBJECT (dev)); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); d =pci_create_simple (b,0 , pci_type); *pi440fx_state =I440FX_PCI_DEVICE (d);
hw/pcmcia/pxa2xx.c +1 -1
@@ -152,7 +152,7 @@ PXA2xxPCMCIAState *pxa2xx_pcmcia_init(MemoryRegion *sysmem,sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base); s =PXA2XX_PCMCIA (dev); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);return s; }
hw/ppc/e500.c +8 -8
@@ -748,8 +748,8 @@ static DeviceState *ppce500_init_mpic_qemu(PPCE500MachineState *pms,qdev_prop_set_uint32 (dev,"model" , pmc->mpic_version);qdev_prop_set_uint32 (dev,"nb_cpus" , smp_cpus); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal); k =0 ;for (i =0 ; i < smp_cpus; i++) {
@@ -771,7 +771,7 @@ static DeviceState *ppce500_init_mpic_kvm(const PPCE500MachineClass *pmc, dev =qdev_new (TYPE_KVM_OPENPIC );qdev_prop_set_uint32 (dev,"model" , pmc->mpic_version); -qdev_realize_and_unref (dev,NULL , &err); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &err);if (err) {error_propagate (errp, err);object_unparent (OBJECT (dev));
@@ -916,7 +916,7 @@ void ppce500_init(MachineState *machine) dev =qdev_new ("e500-ccsr" );object_property_add_child (qdev_get_machine (),"e500-ccsr" ,OBJECT (dev)); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); ccsr =CCSR (dev); ccsr_addr_space = &ccsr->ccsr_space; memory_region_add_subregion(address_space_mem, pmc->ccsrbar_base,
@@ -939,7 +939,7 @@ void ppce500_init(MachineState *machine)/* I2C */ dev =qdev_new ("mpc-i2c" ); s =SYS_BUS_DEVICE (dev); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (s, &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 ));
@@ -949,8 +949,8 @@ void ppce500_init(MachineState *machine)/* General Utility device */ dev =qdev_new ("mpc8544-guts" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);memory_region_add_subregion (ccsr_addr_space,MPC8544_UTIL_OFFSET ,sysbus_mmio_get_region (s,0 ));
@@ -959,8 +959,8 @@ void ppce500_init(MachineState *machine)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_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);for (i =0 ; i <PCI_NUM_PINS ; i++) {sysbus_connect_irq (s, i,qdev_get_gpio_in (mpicdev, pci_irq_nrs[i])); }
@@ -987,7 +987,7 @@ void ppce500_init(MachineState *machine) dev =qdev_new ("mpc8xxx_gpio" ); s =SYS_BUS_DEVICE (dev); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (s, &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 ));
@@ -1003,7 +1003,7 @@ void ppce500_init(MachineState *machine) 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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); pms->pbus_dev =PLATFORM_BUS_DEVICE (dev); s =SYS_BUS_DEVICE (pms->pbus_dev);
hw/ppc/mac_newworld.c +8 -8
@@ -243,8 +243,8 @@ static void ppc_core99_init(MachineState *machine)/* UniN init */ dev =qdev_new (TYPE_UNI_NORTH ); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);memory_region_add_subregion (get_system_memory (),0xf8000000 ,sysbus_mmio_get_region (s,0 ));
@@ -290,8 +290,8 @@ static void ppc_core99_init(MachineState *machine) pic_dev =qdev_new (TYPE_OPENPIC );qdev_prop_set_uint32 (pic_dev,"model" ,OPENPIC_MODEL_KEYLARGO ); -qdev_realize_and_unref (pic_dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (pic_dev); +sysbus_realize_and_unref (s, &error_fatal); k =0 ;for (i =0 ; i < smp_cpus; i++) {for (j =0 ; j <OPENPIC_OUTPUT_NB ; j++) {
@@ -306,7 +306,7 @@ static void ppc_core99_init(MachineState *machine) dev =qdev_new (TYPE_U3_AGP_HOST_BRIDGE );object_property_set_link (OBJECT (dev),OBJECT (pic_dev),"pic" , &error_abort); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); uninorth_pci =U3_AGP_HOST_BRIDGE (dev); s =SYS_BUS_DEVICE (dev);/* PCI hole */
@@ -325,8 +325,8 @@ static void ppc_core99_init(MachineState *machine) dev =qdev_new (TYPE_UNI_NORTH_AGP_HOST_BRIDGE );object_property_set_link (OBJECT (dev),OBJECT (pic_dev),"pic" , &error_abort); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 ,0xf0800000 );sysbus_mmio_map (s,1 ,0xf0c00000 );
@@ -334,8 +334,8 @@ static void ppc_core99_init(MachineState *machine) dev =qdev_new (TYPE_UNI_NORTH_INTERNAL_PCI_HOST_BRIDGE );object_property_set_link (OBJECT (dev),OBJECT (pic_dev),"pic" , &error_abort); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 ,0xf4800000 );sysbus_mmio_map (s,1 ,0xf4c00000 );
@@ -344,7 +344,7 @@ static void ppc_core99_init(MachineState *machine)qdev_prop_set_uint32 (dev,"ofw-addr" ,0xf2000000 );object_property_set_link (OBJECT (dev),OBJECT (pic_dev),"pic" , &error_abort); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); uninorth_pci =UNI_NORTH_PCI_HOST_BRIDGE (dev); s =SYS_BUS_DEVICE (dev);/* PCI hole */
@@ -444,7 +444,7 @@ static void ppc_core99_init(MachineState *machine) dev =qdev_new (TYPE_MACIO_NVRAM );qdev_prop_set_uint32 (dev,"size" ,0x2000 );qdev_prop_set_uint32 (dev,"it_shift" ,1 ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , nvram_addr); nvr =MACIO_NVRAM (dev);pmac_format_nvram_partition (nvr,0x2000 );
@@ -456,8 +456,8 @@ static void ppc_core99_init(MachineState *machine)qdev_prop_set_bit (dev,"dma_enabled" , false);object_property_add_child (OBJECT (qdev_get_machine ()),TYPE_FW_CFG ,OBJECT (fw_cfg)); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 ,CFG_ADDR );sysbus_mmio_map (s,1 ,CFG_ADDR +2 );
hw/ppc/mac_oldworld.c +3 -3
@@ -223,7 +223,7 @@ static void ppc_heathrow_init(MachineState *machine)/* XXX: we register only 1 output pin for heathrow PIC */ pic_dev =qdev_new (TYPE_HEATHROW ); -qdev_realize_and_unref (pic_dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (pic_dev), &error_fatal);/* Connect the heathrow PIC outputs to the 6xx bus */ for (i =0 ; i < smp_cpus; i++) {
@@ -256,8 +256,8 @@ static void ppc_heathrow_init(MachineState *machine)qdev_prop_set_uint32 (dev,"ofw-addr" ,0x80000000 );object_property_set_link (OBJECT (dev),OBJECT (pic_dev),"pic" , &error_abort); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 ,GRACKLE_BASE );sysbus_mmio_map (s,1 ,GRACKLE_BASE +0x200000 );/* PCI hole */
@@ -315,8 +315,8 @@ static void ppc_heathrow_init(MachineState *machine)qdev_prop_set_bit (dev,"dma_enabled" , false);object_property_add_child (OBJECT (qdev_get_machine ()),TYPE_FW_CFG ,OBJECT (fw_cfg)); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 ,CFG_ADDR );sysbus_mmio_map (s,1 ,CFG_ADDR +2 );
hw/ppc/pnv.c +4 -4
@@ -733,7 +733,7 @@ static void pnv_init(MachineState *machine)qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (pnor), &error_abort); } -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); pnv->pnor =PNV_PNOR (dev);/* load skiboot firmware */
@@ -849,7 +849,7 @@ static void pnv_init(MachineState *machine)object_property_set_link (chip,OBJECT (pnv),"xive-fabric" , &error_abort); } -qdev_realize_and_unref (DEVICE (chip),NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (chip), &error_fatal); }g_free (chip_typename);
@@ -1205,7 +1205,7 @@ 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); -qdev_realize (DEVICE (phb),NULL , &local_err); +sysbus_realize (SYS_BUS_DEVICE (phb), &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1410,7 +1410,7 @@ 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); -qdev_realize (DEVICE (obj),NULL , &local_err); +sysbus_realize (SYS_BUS_DEVICE (obj), &local_err);if (local_err) {error_propagate (errp, local_err);return ;
hw/ppc/ppc440_uc.c +2 -2
@@ -1369,11 +1369,11 @@ void ppc460ex_pcie_init(CPUPPCState *env) dev =qdev_new (TYPE_PPC460EX_PCIE_HOST );qdev_prop_set_int32 (dev,"dcrn-base" ,DCRN_PCIE0_BASE ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);ppc460ex_pcie_register_dcrs (PPC460EX_PCIE_HOST (dev), env); dev =qdev_new (TYPE_PPC460EX_PCIE_HOST );qdev_prop_set_int32 (dev,"dcrn-base" ,DCRN_PCIE1_BASE ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);ppc460ex_pcie_register_dcrs (PPC460EX_PCIE_HOST (dev), env); }
hw/ppc/prep.c +2 -2
@@ -278,7 +278,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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (pcihost, &error_fatal); pci_bus =PCI_BUS (qdev_get_child_bus (dev,"pci.0" ));if (!pci_bus) {error_report ("could not create PCI host controller" );
@@ -351,8 +351,8 @@ static void ibm_40p_init(MachineState *machine)qdev_prop_set_bit (dev,"dma_enabled" , false);object_property_add_child (OBJECT (qdev_get_machine ()),TYPE_FW_CFG ,OBJECT (fw_cfg)); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 ,CFG_ADDR );sysbus_mmio_map (s,1 ,CFG_ADDR +2 );
hw/ppc/sam460ex.c +1 -1
@@ -373,8 +373,8 @@ static void sam460ex_init(MachineState *machine) dev =qdev_new ("sysbus-ohci" );qdev_prop_set_string (dev,"masterbus" ,"usb-bus.0" );qdev_prop_set_uint32 (dev,"num-ports" ,6 ); -qdev_realize_and_unref (dev,NULL , &error_fatal); sbdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (sbdev, &error_fatal);sysbus_mmio_map (sbdev,0 ,0x4bffd0000 );sysbus_connect_irq (sbdev,0 , uic[2 ][30 ]);usb_create_simple (usb_bus_find (-1 ),"usb-kbd" );
hw/ppc/spapr.c +1 -1
@@ -2642,7 +2642,7 @@ static PCIHostState *spapr_create_default_phb(void) dev =qdev_new (TYPE_SPAPR_PCI_HOST_BRIDGE );qdev_prop_set_uint32 (dev,"index" ,0 ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);return PCI_HOST_BRIDGE (dev); }
hw/ppc/spapr_irq.c +1 -1
@@ -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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); spapr->xive =SPAPR_XIVE (dev);
hw/ppc/spapr_vio.c +1 -1
@@ -577,7 +577,7 @@ SpaprVioBus *spapr_vio_bus_init(void)/* Create bridge device */ dev =qdev_new (TYPE_SPAPR_VIO_BRIDGE ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);/* Create bus on bridge device */ qbus =qbus_create (TYPE_SPAPR_VIO_BUS , dev,"spapr-vio" );
hw/ppc/virtex_ml507.c +2 -2
@@ -231,7 +231,7 @@ static void virtex_init(MachineState *machine) cpu_irq = (qemu_irq *) &env->irq_inputs[PPC40x_INPUT_INT]; dev =qdev_new ("xlnx.xps-intc" );qdev_prop_set_uint32 (dev,"kind-of-intr" ,0 ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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++) {
@@ -245,7 +245,7 @@ static void virtex_init(MachineState *machine) 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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &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 +1 -1
@@ -252,7 +252,7 @@ DeviceState *sifive_clint_create(hwaddr addr, hwaddr size, uint32_t num_harts,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_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , addr);return dev; }
hw/riscv/sifive_e_prci.c +1 -1
@@ -119,7 +119,7 @@ type_init(sifive_e_prci_register_types)DeviceState *sifive_e_prci_create (hwaddr addr) {DeviceState *dev =qdev_new (TYPE_SIFIVE_E_PRCI ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , addr);return dev; }
hw/riscv/sifive_plic.c +1 -1
@@ -508,7 +508,7 @@ DeviceState *sifive_plic_create(hwaddr addr, char *hart_config,qdev_prop_set_uint32 (dev,"context-base" , context_base);qdev_prop_set_uint32 (dev,"context-stride" , context_stride);qdev_prop_set_uint32 (dev,"aperture-size" , aperture_size); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , addr);return dev; }
hw/riscv/sifive_test.c +1 -1
@@ -94,7 +94,7 @@ type_init(sifive_test_register_types)DeviceState *sifive_test_create (hwaddr addr) {DeviceState *dev =qdev_new (TYPE_SIFIVE_TEST ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , addr);return dev; }
hw/riscv/virt.c +2 -2
@@ -114,7 +114,7 @@ static void virt_flash_map1(PFlashCFI01 *flash,assert (QEMU_IS_ALIGNED (size,VIRT_FLASH_SECTOR_SIZE ));assert (size /VIRT_FLASH_SECTOR_SIZE <=UINT32_MAX );qdev_prop_set_uint32 (dev,"num-blocks" , size /VIRT_FLASH_SECTOR_SIZE ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); memory_region_add_subregion(sysmem, base, sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),
@@ -445,7 +445,7 @@ static inline DeviceState *gpex_pcie_init(MemoryRegion *sys_mem, dev =qdev_new (TYPE_GPEX_HOST ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); ecam_alias =g_new0 (MemoryRegion,1 ); ecam_reg =sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 );
hw/rtc/m48t59.c +1 -1
@@ -582,8 +582,8 @@ Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base, dev =qdev_new (m48txx_sysbus_info[i].bus_name);qdev_prop_set_int32 (dev,"base-year" , base_year); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_connect_irq (s,0 ,IRQ );if (io_base !=0 ) { memory_region_add_subregion(get_system_io(), io_base,
hw/rtc/sun4v-rtc.c +1 -1
@@ -59,7 +59,7 @@ void sun4v_rtc_init(hwaddr addr) dev =qdev_new (TYPE_SUN4V_RTC ); s =SYS_BUS_DEVICE (dev); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , addr); }
hw/s390x/ap-bridge.c +1 -1
@@ -52,7 +52,7 @@ void s390_init_ap(void) dev =qdev_new (TYPE_AP_BRIDGE );object_property_add_child (qdev_get_machine (),TYPE_AP_BRIDGE ,OBJECT (dev)); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);/* Create bus on bridge device */ bus =qbus_create (TYPE_AP_BUS , dev,TYPE_AP_BUS );
hw/s390x/css-bridge.c +1 -1
@@ -104,7 +104,7 @@ VirtualCssBus *virtual_css_bus_init(void) dev =qdev_new (TYPE_VIRTUAL_CSS_BRIDGE );object_property_add_child (qdev_get_machine (),TYPE_VIRTUAL_CSS_BRIDGE ,OBJECT (dev)); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);/* Create bus on bridge device */ bus =qbus_create (TYPE_VIRTUAL_CSS_BUS , dev,"virtual-css" );
hw/s390x/s390-virtio-ccw.c +1 -1
@@ -272,7 +272,7 @@ static void ccw_init(MachineState *machine) dev =qdev_new (TYPE_S390_PCI_HOST_BRIDGE );object_property_add_child (qdev_get_machine (),TYPE_S390_PCI_HOST_BRIDGE ,OBJECT (dev)); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);/* register hypercalls */ virtio_ccw_register_hcalls ();
hw/s390x/sclp.c +1 -1
@@ -338,7 +338,7 @@ static void sclp_realize(DeviceState *dev, Error **errp)* 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_realize (DEVICE (sclp->event_facility),NULL , &err); +sysbus_realize (SYS_BUS_DEVICE (sclp->event_facility), &err);if (err) { goto out; }
hw/sd/pxa2xx_mmci.c +1 -1
@@ -492,7 +492,7 @@ PXA2xxMMCIState *pxa2xx_mmci_init(MemoryRegion *sysmem,sysbus_connect_irq (sbd,0 , irq);qdev_connect_gpio_out_named (dev,"rx-dma" ,0 , rx_dma);qdev_connect_gpio_out_named (dev,"tx-dma" ,0 , tx_dma); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (sbd, &error_fatal);/* Create and plug in the sd card */ carddev =qdev_new (TYPE_SD_CARD );
hw/sh4/r2d.c +3 -3
@@ -259,7 +259,7 @@ static void r2d_init(MachineState *machine) dev =qdev_new ("sh_pci" ); busdev =SYS_BUS_DEVICE (dev); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (busdev, &error_fatal); pci_bus =PCI_BUS (qdev_get_child_bus (dev,"pci" ));sysbus_mmio_map (busdev,0 ,P4ADDR (0x1e200000 ));sysbus_mmio_map (busdev,1 ,A7ADDR (0x1e200000 ));
@@ -273,7 +273,7 @@ static void r2d_init(MachineState *machine)qdev_prop_set_uint32 (dev,"vram-size" ,SM501_VRAM_SIZE );qdev_prop_set_uint32 (dev,"base" ,0x10000000 );qdev_prop_set_chr (dev,"chardev" ,serial_hd (2 )); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,0x10000000 );sysbus_mmio_map (busdev,1 ,0x13e00000 );sysbus_connect_irq (busdev,0 , irq[SM501 ]);
@@ -284,7 +284,7 @@ static void r2d_init(MachineState *machine) busdev =SYS_BUS_DEVICE (dev);sysbus_connect_irq (busdev,0 , irq[CF_IDE ]);qdev_prop_set_uint32 (dev,"shift" ,1 ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,0x14001000 );sysbus_mmio_map (busdev,1 ,0x1400080c );mmio_ide_init_drives (dev, dinfo,NULL );
hw/sparc/leon3.c +5 -5
@@ -214,14 +214,14 @@ static void leon3_generic_hw_init(MachineState *machine)qemu_register_reset (main_cpu_reset, reset_info); ahb_pnp =GRLIB_AHB_PNP (qdev_new (TYPE_GRLIB_AHB_PNP )); -qdev_realize_and_unref (DEVICE (ahb_pnp),NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (ahb_pnp), &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_new (TYPE_GRLIB_APB_PNP )); -qdev_realize_and_unref (DEVICE (apb_pnp),NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (apb_pnp), &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,
@@ -233,7 +233,7 @@ static void leon3_generic_hw_init(MachineState *machine) env, "pil", 1);qdev_connect_gpio_out_named (dev,"grlib-irq" ,0 ,qdev_get_gpio_in_named (DEVICE (cpu),"pil" ,0 )); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,LEON3_IRQMP_OFFSET ); env->irq_manager = dev; env->qemu_irq_ack = leon3_irq_manager;
@@ -326,7 +326,7 @@ static void leon3_generic_hw_init(MachineState *machine)qdev_prop_set_uint32 (dev,"nr-timers" ,LEON3_TIMER_COUNT );qdev_prop_set_uint32 (dev,"frequency" ,CPU_CLK );qdev_prop_set_uint32 (dev,"irq-line" ,LEON3_TIMER_IRQ ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,LEON3_TIMER_OFFSET );for (i =0 ; i <LEON3_TIMER_COUNT ; i++) {
@@ -342,7 +342,7 @@ static void leon3_generic_hw_init(MachineState *machine)if (serial_hd (0 )) { dev =qdev_new (TYPE_GRLIB_APB_UART );qdev_prop_set_chr (dev,"chrdev" ,serial_hd (0 )); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,LEON3_UART_OFFSET );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , cpu_irqs[LEON3_UART_IRQ ]); grlib_apb_pnp_add_entry(apb_pnp, LEON3_UART_OFFSET, 0xFFF,
hw/sparc/sun4m.c +16 -16
@@ -317,8 +317,8 @@ static void *iommu_init(hwaddr addr, uint32_t version, qemu_irq irq) dev =qdev_new (TYPE_SUN4M_IOMMU );qdev_prop_set_uint32 (dev,"version" , version); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_connect_irq (s,0 , irq);sysbus_mmio_map (s,0 , addr);
@@ -336,7 +336,7 @@ static void *sparc32_dma_init(hwaddr dma_base,SysBusPCNetState *lance; dma =qdev_new (TYPE_SPARC32_DMA ); -qdev_realize_and_unref (dma,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dma), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dma),0 , dma_base); espdma = SPARC32_ESPDMA_DEVICE(object_resolve_path_component(
@@ -367,9 +367,9 @@ static DeviceState *slavio_intctl_init(hwaddr addr,unsigned int i, j; dev =qdev_new ("slavio_intctl" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);for (i =0 ; i <MAX_CPUS ; i++) {for (j =0 ; j <MAX_PILS ; j++) {
@@ -396,8 +396,8 @@ static void slavio_timer_init_all(hwaddr addr, qemu_irq master_irq, dev =qdev_new ("slavio_timer" );qdev_prop_set_uint32 (dev,"num_cpus" , num_cpus); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_connect_irq (s,0 , master_irq);sysbus_mmio_map (s,0 , addr +SYS_TIMER_OFFSET );
@@ -433,8 +433,8 @@ static void slavio_misc_init(hwaddr base,SysBusDevice *s; dev =qdev_new ("slavio_misc" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);if (base) {/* 8 bit registers */ /* Slavio control */
@@ -471,8 +471,8 @@ static void ecc_init(hwaddr base, qemu_irq irq, uint32_t version) dev =qdev_new ("eccmemctl" );qdev_prop_set_uint32 (dev,"version" , version); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_connect_irq (s,0 , irq);sysbus_mmio_map (s,0 , base);if (version ==0 ) {// SS-600MP only
@@ -486,8 +486,8 @@ static void apc_init(hwaddr power_base, qemu_irq cpu_halt)SysBusDevice *s; dev =qdev_new ("apc" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);/* Power management (APC) XXX: not a Slavio device */ sysbus_mmio_map (s,0 , power_base);sysbus_connect_irq (s,0 , cpu_halt);
@@ -504,8 +504,8 @@ static void tcx_init(hwaddr addr, qemu_irq irq, int vram_size, int width,qdev_prop_set_uint16 (dev,"width" , width);qdev_prop_set_uint16 (dev,"height" , height);qdev_prop_set_uint16 (dev,"depth" , depth); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);/* 10/ROM : FCode ROM */ sysbus_mmio_map (s,0 , addr);
@@ -556,8 +556,8 @@ static void cg3_init(hwaddr addr, qemu_irq irq, int vram_size, int width,qdev_prop_set_uint16 (dev,"width" , width);qdev_prop_set_uint16 (dev,"height" , height);qdev_prop_set_uint16 (dev,"depth" , depth); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);/* FCode ROM */ sysbus_mmio_map (s,0 , addr);
@@ -581,8 +581,8 @@ static void idreg_init(hwaddr addr)SysBusDevice *s; dev =qdev_new (TYPE_MACIO_ID_REGISTER ); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , addr); address_space_write_rom(&address_space_memory, addr,
@@ -647,8 +647,8 @@ static void afx_init(hwaddr addr)SysBusDevice *s; dev =qdev_new (TYPE_TCX_AFX ); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , addr); }
@@ -708,8 +708,8 @@ static void prom_init(hwaddr addr, const char *bios_name)int ret; dev =qdev_new (TYPE_OPENPROM ); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , addr);
@@ -878,7 +878,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,/* Create and map RAM frontend */ dev =qdev_new ("memory" );object_property_set_link (OBJECT (dev), ram_memdev,"memdev" , &error_fatal); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0 );/* models without ECC don't trap when missing ram is accessed */
@@ -985,8 +985,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,qdev_prop_set_chr (dev,"chrA" ,NULL );qdev_prop_set_uint32 (dev,"chnBtype" , escc_mouse);qdev_prop_set_uint32 (dev,"chnAtype" , escc_kbd); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_connect_irq (s,0 , slavio_irq[14 ]);sysbus_connect_irq (s,1 , slavio_irq[14 ]);sysbus_mmio_map (s,0 , hwdef->ms_kb_base);
@@ -999,9 +999,9 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,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_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_connect_irq (s,0 , slavio_irq[15 ]);sysbus_connect_irq (s,1 , slavio_irq[15 ]);sysbus_mmio_map (s,0 , hwdef->serial_base);
@@ -1061,8 +1061,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,qdev_prop_set_bit (dev,"dma_enabled" , false);object_property_add_child (OBJECT (qdev_get_machine ()),TYPE_FW_CFG ,OBJECT (fw_cfg)); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 ,CFG_ADDR );sysbus_mmio_map (s,1 ,CFG_ADDR +2 );
hw/sparc64/sun4u.c +6 -6
@@ -354,8 +354,8 @@ static void ebus_realize(PCIDevice *pci_dev, Error **errp)/* Power */ dev =qdev_new (TYPE_SUN4U_POWER ); -qdev_realize_and_unref (dev,NULL , &error_fatal); sbd =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (sbd, &error_fatal);memory_region_add_subregion (pci_address_space_io (pci_dev),0x7240 ,sysbus_mmio_get_region (sbd,0 ));
@@ -429,8 +429,8 @@ static void prom_init(hwaddr addr, const char *bios_name)int ret; dev =qdev_new (TYPE_OPENPROM ); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , addr);
@@ -527,7 +527,7 @@ static void ram_init(hwaddr addr, ram_addr_t RAM_size) d =SUN4U_RAM (dev); d->size = RAM_size; -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , addr); }
@@ -575,7 +575,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,/* IOMMU */ iommu =qdev_new (TYPE_SUN4U_IOMMU ); -qdev_realize_and_unref (iommu,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (iommu), &error_fatal);/* set up devices */ ram_init (0 , machine->ram_size);
@@ -588,7 +588,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,qdev_prop_set_uint64 (DEVICE (sabre),"mem-base" ,PBM_MEM_BASE );object_property_set_link (OBJECT (sabre),OBJECT (iommu),"iommu" , &error_abort); -qdev_realize_and_unref (DEVICE (sabre),NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (sabre), &error_fatal);/* Wire up PCI interrupts to CPU */ for (i =0 ; i <IVEC_MAX ; i++) {
@@ -698,7 +698,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, dev =qdev_new (TYPE_FW_CFG_IO );qdev_prop_set_bit (dev,"dma_enabled" , false);object_property_add_child (OBJECT (ebus),TYPE_FW_CFG ,OBJECT (dev)); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);memory_region_add_subregion (pci_address_space_io (ebus),BIOS_CFG_IOPORT , &FW_CFG_IO (dev)->comb_iomem);
hw/xen/xen-bus.c +1 -1
@@ -1390,6 +1390,6 @@ void xen_bus_init(void)DeviceState *dev =qdev_new (TYPE_XEN_BRIDGE );BusState *bus =qbus_create (TYPE_XEN_BUS , dev,NULL ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);qbus_set_bus_hotplug_handler (bus, &error_abort); }
hw/xen/xen-legacy-backend.c +1 -1
@@ -703,7 +703,7 @@ int xen_be_init(void) } xen_sysdev =qdev_new (TYPE_XENSYSDEV ); -qdev_realize_and_unref (xen_sysdev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (xen_sysdev), &error_fatal); xen_sysbus =qbus_create (TYPE_XENSYSBUS , xen_sysdev,"xen-sysbus" );qbus_set_bus_hotplug_handler (xen_sysbus, &error_abort);
hw/xtensa/virt.c +1 -1
@@ -63,7 +63,7 @@ static void create_pcie(CPUXtensaState *env, int irq_base, hwaddr addr_base)int i; dev =qdev_new (TYPE_GPEX_HOST ); -qdev_realize_and_unref (dev,NULL , &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);/* Map only the first size_ecam bytes of ECAM space. */ ecam_alias =g_new0 (MemoryRegion,1 );
hw/xtensa/xtfpga.c +2 -2
@@ -150,9 +150,9 @@ static void xtfpga_net_init(MemoryRegion *address_space, dev =qdev_new ("open_eth" );qdev_set_nic_properties (dev, nd); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);sysbus_connect_irq (s,0 , irq);memory_region_add_subregion (address_space, base,sysbus_mmio_get_region (s,0 ));
@@ -181,8 +181,8 @@ static PFlashCFI01 *xtfpga_flash_init(MemoryRegion *address_space,qdev_prop_set_uint8 (dev,"width" ,2 );qdev_prop_set_bit (dev,"big-endian" , be);qdev_prop_set_string (dev,"name" ,"xtfpga.io.flash" ); -qdev_realize_and_unref (dev,NULL , &error_fatal); s =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (s, &error_fatal);memory_region_add_subregion (address_space, board->flash->base,sysbus_mmio_get_region (s,0 ));return PFLASH_CFI01 (dev);
Signature · 1 line
2.26.2
PATCH RESEND v3 46/58 qdev: Drop qdev_realize() support for null bus
In reply to Markus ArmbrusterThe "null @bus means main system bus" convenience feature is no longer used. Drop it.
--- hw/core/qdev.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)
hw/core/qdev.c +2 -14
@@ -408,8 +408,7 @@ void qdev_init_nofail(DeviceState *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. +* Plug @dev into @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.
@@ -419,18 +418,7 @@ 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 (); - } +assert (bus);qdev_set_parent_bus (dev, bus);
Signature · 1 line
2.26.2
PATCH RESEND v3 47/58 sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
In reply to Markus ArmbrusterI'm converting from qdev_set_parent_bus()/realize to qdev_realize(); recent commit "qdev: Convert uses of qdev_set_parent_bus() with Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around object_initialize_child_with_props() and qdev_set_parent_bus(). It passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/ qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)--- hw/arm/bcm2835_peripherals.c | 5 ++-- hw/arm/exynos4_boards.c | 7 +++-- hw/arm/mps2-tz.c | 50 ++++++++++++++++-------------------- hw/arm/mps2.c | 19 +++++--------- hw/arm/musca.c | 37 ++++++++++++-------------- hw/arm/xlnx-versal-virt.c | 6 ++--- hw/arm/xlnx-versal.c | 36 +++++++++++--------------- hw/intc/armv7m_nvic.c | 8 +++--- hw/mips/boston.c | 6 ++--- hw/mips/cps.c | 20 ++++++--------- hw/mips/malta.c | 6 ++--- hw/misc/mac_via.c | 14 +++++----- hw/riscv/spike.c | 7 +++-- hw/riscv/virt.c | 7 +++-- 14 files changed, 96 insertions(+), 132 deletions(-)
hw/arm/bcm2835_peripherals.c +2 -3
@@ -27,11 +27,10 @@ static void create_unimp(BCM2835PeripheralState *ps,UnimplementedDeviceState *uds, const char *name, hwaddr ofs, hwaddr size) { - sysbus_init_child_obj(OBJECT(ps), name, uds, sizeof(*uds), -TYPE_UNIMPLEMENTED_DEVICE ); +object_initialize_child (OBJECT (ps ),name ,uds ,TYPE_UNIMPLEMENTED_DEVICE );qdev_prop_set_string (DEVICE (uds),"name" , name);qdev_prop_set_uint64 (DEVICE (uds),"size" , size); -object_property_set_bool (OBJECT (uds), true,"realized" , &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (uds), &error_fatal);memory_region_add_subregion_overlap (&ps->peri_mr, ofs,sysbus_mmio_get_region (SYS_BUS_DEVICE (uds),0 ),-1000 ); }
hw/arm/exynos4_boards.c +3 -4
@@ -128,10 +128,9 @@ exynos4_boards_init_common(MachineState *machine,exynos4_boards_init_ram (s,get_system_memory (), exynos4_board_ram_size[board_type]); -sysbus_init_child_obj (OBJECT (machine),"soc" , - &s->soc,sizeof (s->soc),TYPE_EXYNOS4210_SOC ); -object_property_set_bool (OBJECT (&s->soc), true,"realized" , - &error_fatal); +object_initialize_child (OBJECT (machine),"soc" , &s->soc, +TYPE_EXYNOS4210_SOC ); +sysbus_realize (SYS_BUS_DEVICE (&s->soc), &error_fatal);return s; }
hw/arm/mps2-tz.c +22 -28
138 lines not on this page · raw message
hw/arm/mps2.c +7 -12
@@ -180,8 +180,7 @@ static void mps2_common_init(MachineState *machine)g_assert_not_reached (); } -sysbus_init_child_obj (OBJECT (mms),"armv7m" , &mms->armv7m, -sizeof (mms->armv7m),TYPE_ARMV7M ); +object_initialize_child (OBJECT (mms),"armv7m" , &mms->armv7m,TYPE_ARMV7M ); armv7m =DEVICE (&mms->armv7m);switch (mmc->fpga_type) {case FPGA_AN385 :
@@ -197,8 +196,7 @@ static void mps2_common_init(MachineState *machine)qdev_prop_set_bit (armv7m,"enable-bitband" , true);object_property_set_link (OBJECT (&mms->armv7m),OBJECT (system_memory),"memory" , &error_abort); -object_property_set_bool (OBJECT (&mms->armv7m), true,"realized" , - &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (&mms->armv7m), &error_fatal);create_unimplemented_device ("zbtsmram mirror" ,0x00400000 ,0x00400000 );create_unimplemented_device ("RESERVED 1" ,0x00800000 ,0x00800000 );
@@ -305,23 +303,20 @@ static void mps2_common_init(MachineState *machine)cmsdk_apb_timer_create (0x40000000 ,qdev_get_gpio_in (armv7m,8 ),SYSCLK_FRQ );cmsdk_apb_timer_create (0x40001000 ,qdev_get_gpio_in (armv7m,9 ),SYSCLK_FRQ ); -sysbus_init_child_obj (OBJECT (mms),"dualtimer" , &mms->dualtimer, -sizeof (mms->dualtimer),TYPE_CMSDK_APB_DUALTIMER ); +object_initialize_child (OBJECT (mms),"dualtimer" , &mms->dualtimer, +TYPE_CMSDK_APB_DUALTIMER );qdev_prop_set_uint32 (DEVICE (&mms->dualtimer),"pclk-frq" ,SYSCLK_FRQ ); -object_property_set_bool (OBJECT (&mms->dualtimer), true,"realized" , - &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (&mms->dualtimer), &error_fatal);sysbus_connect_irq (SYS_BUS_DEVICE (&mms->dualtimer),0 ,qdev_get_gpio_in (armv7m,10 ));sysbus_mmio_map (SYS_BUS_DEVICE (&mms->dualtimer),0 ,0x40002000 ); -sysbus_init_child_obj (OBJECT (mms),"scc" , &mms->scc, -sizeof (mms->scc),TYPE_MPS2_SCC ); +object_initialize_child (OBJECT (mms),"scc" , &mms->scc,TYPE_MPS2_SCC ); sccdev =DEVICE (&mms->scc);qdev_prop_set_uint32 (sccdev,"scc-cfg4" ,0x2 );qdev_prop_set_uint32 (sccdev,"scc-aid" ,0x00200008 );qdev_prop_set_uint32 (sccdev,"scc-id" , mmc->scc_id); -object_property_set_bool (OBJECT (&mms->scc), true,"realized" , - &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (&mms->scc), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (sccdev),0 ,0x4002f000 );/* In hardware this is a LAN9220; the LAN9118 is software compatible
hw/arm/musca.c +17 -20
@@ -142,11 +142,10 @@ static MemoryRegion *make_unimp_dev(MuscaMachineState *mms,*/ UnimplementedDeviceState *uds = opaque; -sysbus_init_child_obj (OBJECT (mms), name, uds,sizeof (*uds), -TYPE_UNIMPLEMENTED_DEVICE ); +object_initialize_child (OBJECT (mms), name, uds,TYPE_UNIMPLEMENTED_DEVICE );qdev_prop_set_string (DEVICE (uds),"name" , name);qdev_prop_set_uint64 (DEVICE (uds),"size" , size); -object_property_set_bool (OBJECT (uds), true,"realized" , &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (uds), &error_fatal);return sysbus_mmio_get_region (SYS_BUS_DEVICE (uds),0 ); }
@@ -245,22 +244,21 @@ static MemoryRegion *make_mpc(MuscaMachineState *mms, void *opaque,case MPC_CRYPTOISLAND :/* We don't implement the CryptoIsland yet */ uds = &mms->cryptoisland; -sysbus_init_child_obj (OBJECT (mms), name, uds,sizeof (*uds), -TYPE_UNIMPLEMENTED_DEVICE ); +object_initialize_child (OBJECT (mms), name, uds, +TYPE_UNIMPLEMENTED_DEVICE );qdev_prop_set_string (DEVICE (uds),"name" , mpcinfo[i].name);qdev_prop_set_uint64 (DEVICE (uds),"size" , mpcinfo[i].size); -object_property_set_bool (OBJECT (uds), true,"realized" , &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (uds), &error_fatal); downstream =sysbus_mmio_get_region (SYS_BUS_DEVICE (uds),0 );break ;default :g_assert_not_reached (); } -sysbus_init_child_obj (OBJECT (mms), mpcname, mpc,sizeof (*mpc), -TYPE_TZ_MPC ); +object_initialize_child (OBJECT (mms), mpcname, mpc,TYPE_TZ_MPC );object_property_set_link (OBJECT (mpc),OBJECT (downstream),"downstream" , &error_fatal); -object_property_set_bool (OBJECT (mpc), true,"realized" , &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (mpc), &error_fatal);/* Map the upstream end of the MPC into system memory */ upstream =sysbus_mmio_get_region (SYS_BUS_DEVICE (mpc),1 );memory_region_add_subregion (get_system_memory (), mpcinfo[i].addr, upstream);
@@ -279,8 +277,8 @@ static MemoryRegion *make_rtc(MuscaMachineState *mms, void *opaque, {PL031State *rtc = opaque; -sysbus_init_child_obj (OBJECT (mms), name, rtc,sizeof (*rtc),TYPE_PL031 ); -object_property_set_bool (OBJECT (rtc), true,"realized" , &error_fatal); +object_initialize_child (OBJECT (mms), name, rtc,TYPE_PL031 ); +sysbus_realize (SYS_BUS_DEVICE (rtc), &error_fatal);sysbus_connect_irq (SYS_BUS_DEVICE (rtc),0 ,get_sse_irq_in (mms,39 ));return sysbus_mmio_get_region (SYS_BUS_DEVICE (rtc),0 ); }
@@ -293,9 +291,9 @@ static MemoryRegion *make_uart(MuscaMachineState *mms, void *opaque,int irqbase =7 + i *6 ;SysBusDevice *s; -sysbus_init_child_obj (OBJECT (mms), name, uart,sizeof (*uart),TYPE_PL011 ); +object_initialize_child (OBJECT (mms), name, uart,TYPE_PL011 );qdev_prop_set_chr (DEVICE (uart),"chardev" ,serial_hd (i)); -object_property_set_bool (OBJECT (uart), true,"realized" , &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (uart), &error_fatal); s =SYS_BUS_DEVICE (uart);sysbus_connect_irq (s,0 ,get_sse_irq_in (mms, irqbase +5 ));/* combined */ sysbus_connect_irq (s,1 ,get_sse_irq_in (mms, irqbase +0 ));/* RX */
@@ -373,8 +371,8 @@ static void musca_init(MachineState *machine)exit (1 ); } -sysbus_init_child_obj (OBJECT (machine),"sse-200" , &mms->sse, -sizeof (mms->sse),TYPE_SSE200 ); +object_initialize_child (OBJECT (machine),"sse-200" , &mms->sse, +TYPE_SSE200 ); ssedev =DEVICE (&mms->sse);object_property_set_link (OBJECT (&mms->sse),OBJECT (system_memory),"memory" , &error_fatal);
@@ -390,8 +388,7 @@ static void musca_init(MachineState *machine)qdev_prop_set_bit (ssedev,"CPU0_FPU" , true);qdev_prop_set_bit (ssedev,"CPU0_DSP" , true); } -object_property_set_bool (OBJECT (&mms->sse), true,"realized" , - &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (&mms->sse), &error_fatal);/* * We need to create splitters to feed the IRQ inputs
@@ -531,8 +528,8 @@ static void musca_init(MachineState *machine)int port;char *gpioname; -sysbus_init_child_obj (OBJECT (machine), ppcinfo->name, ppc, -sizeof (*ppc),TYPE_TZ_PPC ); +object_initialize_child (OBJECT (machine), ppcinfo->name, ppc, +TYPE_TZ_PPC ); ppcdev =DEVICE (ppc);for (port =0 ; port <TZ_NUM_PORTS ; port++) {
@@ -551,7 +548,7 @@ static void musca_init(MachineState *machine)g_free (portname); } -object_property_set_bool (OBJECT (ppc), true,"realized" , &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (ppc), &error_fatal);for (port =0 ; port <TZ_NUM_PORTS ; port++) {const PPCPortInfo *pinfo = &ppcinfo->ports[port];
hw/arm/xlnx-versal-virt.c +3 -3
@@ -500,13 +500,13 @@ static void versal_virt_init(MachineState *machine) psci_conduit =QEMU_PSCI_CONDUIT_SMC ; } -sysbus_init_child_obj (OBJECT (machine),"xlnx-versal" , &s->soc, -sizeof (s->soc),TYPE_XLNX_VERSAL ); +object_initialize_child (OBJECT (machine),"xlnx-versal" , &s->soc, +TYPE_XLNX_VERSAL );object_property_set_link (OBJECT (&s->soc),OBJECT (machine->ram),"ddr" , &error_abort);object_property_set_int (OBJECT (&s->soc), psci_conduit,"psci-conduit" , &error_abort); -object_property_set_bool (OBJECT (&s->soc), true,"realized" , &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (&s->soc), &error_fatal);fdt_create (s);create_virtio_regions (s);
hw/arm/xlnx-versal.c +15 -21
@@ -62,9 +62,8 @@ static void versal_create_apu_gic(Versal *s, qemu_irq *pic)int nr_apu_cpus =ARRAY_SIZE (s->fpd.apu.cpu);int i; -sysbus_init_child_obj (OBJECT (s),"apu-gic" , - &s->fpd.apu.gic,sizeof (s->fpd.apu.gic), -gicv3_class_name ()); +object_initialize_child (OBJECT (s),"apu-gic" , &s->fpd.apu.gic, +gicv3_class_name ()); gicbusdev =SYS_BUS_DEVICE (&s->fpd.apu.gic); gicdev =DEVICE (&s->fpd.apu.gic);qdev_prop_set_uint32 (gicdev,"revision" ,3 );
@@ -74,8 +73,7 @@ static void versal_create_apu_gic(Versal *s, qemu_irq *pic)qdev_prop_set_uint32 (gicdev,"redist-region-count[0]" ,2 );qdev_prop_set_bit (gicdev,"has-security-extensions" , true); -object_property_set_bool (OBJECT (&s->fpd.apu.gic), true,"realized" , - &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (&s->fpd.apu.gic), &error_fatal);for (i =0 ; i <ARRAY_SIZE (addrs); i++) {MemoryRegion *mr;
@@ -133,12 +131,11 @@ static void versal_create_uarts(Versal *s, qemu_irq *pic)DeviceState *dev;MemoryRegion *mr; -sysbus_init_child_obj (OBJECT (s), name, - &s->lpd.iou.uart[i],sizeof (s->lpd.iou.uart[i]), -TYPE_PL011 ); +object_initialize_child (OBJECT (s), name, &s->lpd.iou.uart[i], +TYPE_PL011 ); dev =DEVICE (&s->lpd.iou.uart[i]);qdev_prop_set_chr (dev,"chardev" ,serial_hd (i)); -qdev_init_nofail (dev); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); mr =sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 );memory_region_add_subregion (&s->mr_ps, addrs[i], mr);
@@ -160,9 +157,8 @@ static void versal_create_gems(Versal *s, qemu_irq *pic)DeviceState *dev;MemoryRegion *mr; -sysbus_init_child_obj (OBJECT (s), name, - &s->lpd.iou.gem[i],sizeof (s->lpd.iou.gem[i]), -TYPE_CADENCE_GEM ); +object_initialize_child (OBJECT (s), name, &s->lpd.iou.gem[i], +TYPE_CADENCE_GEM ); dev =DEVICE (&s->lpd.iou.gem[i]);if (nd->used) {qemu_check_nic_model (nd,"cadence_gem" );
@@ -174,7 +170,7 @@ static void versal_create_gems(Versal *s, qemu_irq *pic)object_property_set_link (OBJECT (dev),OBJECT (&s->mr_ps),"dma" , &error_abort); -qdev_init_nofail (dev); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); mr =sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 );memory_region_add_subregion (&s->mr_ps, addrs[i], mr);
@@ -193,12 +189,11 @@ static void versal_create_admas(Versal *s, qemu_irq *pic)DeviceState *dev;MemoryRegion *mr; -sysbus_init_child_obj (OBJECT (s), name, - &s->lpd.iou.adma[i],sizeof (s->lpd.iou.adma[i]), -TYPE_XLNX_ZDMA ); +object_initialize_child (OBJECT (s), name, &s->lpd.iou.adma[i], +TYPE_XLNX_ZDMA ); dev =DEVICE (&s->lpd.iou.adma[i]);object_property_set_int (OBJECT (dev),128 ,"bus-width" , &error_abort); -qdev_init_nofail (dev); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); mr =sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 ); memory_region_add_subregion(&s->mr_ps,
@@ -218,9 +213,8 @@ static void versal_create_sds(Versal *s, qemu_irq *pic)DeviceState *dev;MemoryRegion *mr; -sysbus_init_child_obj (OBJECT (s),"sd[*]" , - &s->pmc.iou.sd[i],sizeof (s->pmc.iou.sd[i]), -TYPE_SYSBUS_SDHCI ); +object_initialize_child (OBJECT (s),"sd[*]" , &s->pmc.iou.sd[i], +TYPE_SYSBUS_SDHCI ); dev =DEVICE (&s->pmc.iou.sd[i]); object_property_set_uint(OBJECT(dev),
@@ -228,7 +222,7 @@ static void versal_create_sds(Versal *s, qemu_irq *pic)object_property_set_uint (OBJECT (dev),SDHCI_CAPABILITIES ,"capareg" , &error_fatal);object_property_set_uint (OBJECT (dev),UHS_I ,"uhs" , &error_fatal); -qdev_init_nofail (dev); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); mr =sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 ); memory_region_add_subregion(&s->mr_ps,
hw/intc/armv7m_nvic.c +3 -5
@@ -2655,12 +2655,10 @@ static void armv7m_nvic_realize(DeviceState *dev, Error **errp)* as we didn't know then if the CPU had the security extensions; * so we have to do it here. */ -sysbus_init_child_obj (OBJECT (dev),"systick-reg-s" , - &s->systick[M_REG_S ], -sizeof (s->systick[M_REG_S ]),TYPE_SYSTICK ); +object_initialize_child (OBJECT (dev),"systick-reg-s" , + &s->systick[M_REG_S ],TYPE_SYSTICK ); -object_property_set_bool (OBJECT (&s->systick[M_REG_S ]), true, -"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->systick[M_REG_S ]), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
hw/mips/boston.c +2 -4
@@ -454,14 +454,12 @@ static void boston_mach_init(MachineState *machine) is_64b =cpu_supports_isa (machine->cpu_type,ISA_MIPS64 ); -sysbus_init_child_obj (OBJECT (machine),"cps" , &s->cps,sizeof (s->cps), -TYPE_MIPS_CPS ); +object_initialize_child (OBJECT (machine),"cps" , &s->cps,TYPE_MIPS_CPS );object_property_set_str (OBJECT (&s->cps), machine->cpu_type,"cpu-type" , &error_fatal);object_property_set_int (OBJECT (&s->cps), machine->smp.cpus,"num-vp" , &error_fatal); -object_property_set_bool (OBJECT (&s->cps), true,"realized" , - &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (&s->cps), &error_fatal);sysbus_mmio_map_overlap (SYS_BUS_DEVICE (&s->cps),0 ,0 ,1 );
hw/mips/cps.c +8 -12
@@ -99,8 +99,7 @@ static void mips_cps_realize(DeviceState *dev, Error **errp)/* Inter-Thread Communication Unit */ if (itu_present) { -sysbus_init_child_obj (OBJECT (dev),"itu" , &s->itu,sizeof (s->itu), -TYPE_MIPS_ITU ); +object_initialize_child (OBJECT (dev),"itu" , &s->itu,TYPE_MIPS_ITU );object_property_set_int (OBJECT (&s->itu),16 ,"num-fifo" , &err);object_property_set_int (OBJECT (&s->itu),16 ,"num-semaphores" , &err); object_property_set_bool(OBJECT(&s->itu), saar_present, "saar-present",
@@ -108,7 +107,7 @@ static void mips_cps_realize(DeviceState *dev, Error **errp)if (saar_present) { s->itu.saar = &env->CP0_SAAR; } -object_property_set_bool (OBJECT (&s->itu), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->itu), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -119,11 +118,10 @@ static void mips_cps_realize(DeviceState *dev, Error **errp) }/* Cluster Power Controller */ -sysbus_init_child_obj (OBJECT (dev),"cpc" , &s->cpc,sizeof (s->cpc), -TYPE_MIPS_CPC ); +object_initialize_child (OBJECT (dev),"cpc" , &s->cpc,TYPE_MIPS_CPC );object_property_set_int (OBJECT (&s->cpc), s->num_vp,"num-vp" , &err);object_property_set_int (OBJECT (&s->cpc),1 ,"vp-start-running" , &err); -object_property_set_bool (OBJECT (&s->cpc), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->cpc), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -133,11 +131,10 @@ static void mips_cps_realize(DeviceState *dev, Error **errp) sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->cpc), 0));/* Global Interrupt Controller */ -sysbus_init_child_obj (OBJECT (dev),"gic" , &s->gic,sizeof (s->gic), -TYPE_MIPS_GIC ); +object_initialize_child (OBJECT (dev),"gic" , &s->gic,TYPE_MIPS_GIC );object_property_set_int (OBJECT (&s->gic), s->num_vp,"num-vp" , &err);object_property_set_int (OBJECT (&s->gic),128 ,"num-irq" , &err); -object_property_set_bool (OBJECT (&s->gic), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->gic), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -149,14 +146,13 @@ static void mips_cps_realize(DeviceState *dev, Error **errp)/* Global Configuration Registers */ gcr_base = env->CP0_CMGCRBase <<4 ; -sysbus_init_child_obj (OBJECT (dev),"gcr" , &s->gcr,sizeof (s->gcr), -TYPE_MIPS_GCR ); +object_initialize_child (OBJECT (dev),"gcr" , &s->gcr,TYPE_MIPS_GCR );object_property_set_int (OBJECT (&s->gcr), s->num_vp,"num-vp" , &err);object_property_set_int (OBJECT (&s->gcr),0x800 ,"gcr-rev" , &err);object_property_set_int (OBJECT (&s->gcr), gcr_base,"gcr-base" , &err);object_property_set_link (OBJECT (&s->gcr),OBJECT (&s->gic.mr),"gic" , &err);object_property_set_link (OBJECT (&s->gcr),OBJECT (&s->cpc.mr),"cpc" , &err); -object_property_set_bool (OBJECT (&s->gcr), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->gcr), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
hw/mips/malta.c +2 -4
@@ -1183,14 +1183,12 @@ static void create_cpu_without_cps(MachineState *ms,static void create_cps (MachineState *ms,MaltaState *s,qemu_irq *cbus_irq,qemu_irq *i8259_irq) { -sysbus_init_child_obj (OBJECT (s),"cps" , &s->cps,sizeof (s->cps), -TYPE_MIPS_CPS ); +object_initialize_child (OBJECT (s),"cps" , &s->cps,TYPE_MIPS_CPS );object_property_set_str (OBJECT (&s->cps), ms->cpu_type,"cpu-type" , &error_fatal);object_property_set_int (OBJECT (&s->cps), ms->smp.cpus,"num-vp" , &error_fatal); -object_property_set_bool (OBJECT (&s->cps), true,"realized" , - &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (&s->cps), &error_fatal);sysbus_mmio_map_overlap (SYS_BUS_DEVICE (&s->cps),0 ,0 ,1 );
hw/misc/mac_via.c +6 -8
@@ -876,11 +876,11 @@ static void mac_via_realize(DeviceState *dev, Error **errp)int ret;/* Init VIAs 1 and 2 */ -sysbus_init_child_obj (OBJECT (dev),"via1" , &m->mos6522_via1, -sizeof (m->mos6522_via1),TYPE_MOS6522_Q800_VIA1 ); +object_initialize_child (OBJECT (dev),"via1" , &m->mos6522_via1, +TYPE_MOS6522_Q800_VIA1 ); -sysbus_init_child_obj (OBJECT (dev),"via2" , &m->mos6522_via2, -sizeof (m->mos6522_via2),TYPE_MOS6522_Q800_VIA2 ); +object_initialize_child (OBJECT (dev),"via2" , &m->mos6522_via2, +TYPE_MOS6522_Q800_VIA2 );/* Pass through mos6522 output IRQs */ ms =MOS6522 (&m->mos6522_via1);
@@ -890,10 +890,8 @@ static void mac_via_realize(DeviceState *dev, Error **errp)object_property_add_alias (OBJECT (dev),"irq[1]" ,OBJECT (ms),SYSBUS_DEVICE_GPIO_IRQ "[0]" ); -object_property_set_bool (OBJECT (&m->mos6522_via1), true,"realized" , - &error_abort); -object_property_set_bool (OBJECT (&m->mos6522_via2), true,"realized" , - &error_abort); +sysbus_realize (SYS_BUS_DEVICE (&m->mos6522_via1), &error_abort); +sysbus_realize (SYS_BUS_DEVICE (&m->mos6522_via2), &error_abort);/* Pass through mos6522 input IRQs */ qdev_pass_gpios (DEVICE (&m->mos6522_via1), dev,"via1-irq" );
hw/riscv/spike.c +3 -4
@@ -169,14 +169,13 @@ static void spike_board_init(MachineState *machine)unsigned int smp_cpus = machine->smp.cpus;/* Initialize SOC */ -sysbus_init_child_obj (OBJECT (machine),"soc" , &s->soc,sizeof (s->soc), -TYPE_RISCV_HART_ARRAY ); +object_initialize_child (OBJECT (machine),"soc" , &s->soc, +TYPE_RISCV_HART_ARRAY );object_property_set_str (OBJECT (&s->soc), machine->cpu_type,"cpu-type" , &error_abort);object_property_set_int (OBJECT (&s->soc), smp_cpus,"num-harts" , &error_abort); -object_property_set_bool (OBJECT (&s->soc), true,"realized" , - &error_abort); +sysbus_realize (SYS_BUS_DEVICE (&s->soc), &error_abort);/* register system main memory (actual RAM) */ memory_region_init_ram(main_mem, NULL, "riscv.spike.ram",
hw/riscv/virt.c +3 -4
@@ -485,14 +485,13 @@ static void virt_machine_init(MachineState *machine)unsigned int smp_cpus = machine->smp.cpus;/* Initialize SOC */ -sysbus_init_child_obj (OBJECT (machine),"soc" , &s->soc,sizeof (s->soc), -TYPE_RISCV_HART_ARRAY ); +object_initialize_child (OBJECT (machine),"soc" , &s->soc, +TYPE_RISCV_HART_ARRAY );object_property_set_str (OBJECT (&s->soc), machine->cpu_type,"cpu-type" , &error_abort);object_property_set_int (OBJECT (&s->soc), smp_cpus,"num-harts" , &error_abort); -object_property_set_bool (OBJECT (&s->soc), true,"realized" , - &error_abort); +sysbus_realize (SYS_BUS_DEVICE (&s->soc), &error_abort);/* register system main memory (actual RAM) */ memory_region_init_ram(main_mem, NULL, "riscv_virt_board.ram",
Signature · 1 line
2.26.2
PATCH RESEND v3 48/58 sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 2
In reply to Markus ArmbrusterThis is the same transformation as in the previous commit, except sysbus_init_child_obj() and realize are too separated for the commit's Coccinelle script to handle, typically because sysbus_init_child_obj() is in a device's instance_init() method, and the matching realize is in its realize() method.
Perhaps a Coccinelle wizard could make it transform that pattern, but I'm just a bungler, and the best I can do is transforming the two separate parts separately:
@@
expression errp;
expression child;
symbol true;
@@
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
// only correct with a matching sysbus_init_child_obj() transformation!
@@
expression errp;
expression child;
symbol true;
@@
- object_property_set_bool(child, true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
// only correct with a matching sysbus_init_child_obj() transformation!
@@
expression child;
@@
- qdev_init_nofail(DEVICE(child));
+ sysbus_realize(SYS_BUS_DEVICE(child), &error_fatal);
// only correct with a matching sysbus_init_child_obj() transformation!
@@
expression child;
expression dev;
@@
dev = DEVICE(child);
...
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
// only correct with a matching sysbus_init_child_obj() transformation!
@@
expression child;
identifier dev;
@@
DeviceState *dev = DEVICE(child);
...
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
// only correct with a matching sysbus_init_child_obj() transformation!
@@
expression parent, name, size, type;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)This script is *unsound*: we need to manually verify init and realize conversions are properly paired.
This commit has only the pairs where object_initialize_child()'s @child and sysbus_realize()'s @dev argument text match exactly within the same source file.
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.
--- hw/arm/allwinner-a10.c | 43 ++++++--------- hw/arm/allwinner-h3.c | 50 +++++++---------- hw/arm/armsse.c | 96 ++++++++++++++------------------ hw/arm/armv7m.c | 4 +- hw/arm/aspeed_ast2600.c | 89 +++++++++++++----------------- hw/arm/aspeed_soc.c | 69 ++++++++++------------- hw/arm/bcm2835_peripherals.c | 75 +++++++++++-------------- hw/arm/bcm2836.c | 11 ++-- hw/arm/digic.c | 10 ++-- hw/arm/fsl-imx25.c | 58 ++++++++----------- hw/arm/fsl-imx31.c | 37 ++++++------- hw/arm/fsl-imx6.c | 69 ++++++++++------------- hw/arm/fsl-imx6ul.c | 98 ++++++++++++--------------------- hw/arm/fsl-imx7.c | 93 +++++++++++-------------------- hw/arm/msf2-soc.c | 25 ++++----- hw/arm/nrf51_soc.c | 30 +++++----- hw/arm/stm32f205_soc.c | 32 +++++------ hw/arm/stm32f405_soc.c | 37 ++++++------- hw/arm/xlnx-zynqmp.c | 60 +++++++++----------- hw/cpu/a15mpcore.c | 5 +- hw/cpu/a9mpcore.c | 23 ++++---- hw/cpu/arm11mpcore.c | 18 +++--- hw/cpu/realview_mpcore.c | 5 +- hw/intc/realview_gic.c | 4 +- hw/microblaze/xlnx-zynqmp-pmu.c | 11 ++-- hw/misc/macio/cuda.c | 8 +-- hw/misc/macio/pmu.c | 8 +-- hw/ppc/pnv.c | 6 +- hw/riscv/opentitan.c | 6 +- hw/riscv/sifive_e.c | 13 ++--- hw/riscv/sifive_u.c | 31 ++++------- 31 files changed, 463 insertions(+), 661 deletions(-)
hw/arm/allwinner-a10.c +18 -25
@@ -44,33 +44,28 @@ static void aw_a10_init(Object *obj)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 ); +object_initialize_child (obj,"intc" , &s->intc,TYPE_AW_A10_PIC ); -sysbus_init_child_obj (obj,"timer" , &s->timer,sizeof (s->timer), -TYPE_AW_A10_PIT ); +object_initialize_child (obj,"timer" , &s->timer,TYPE_AW_A10_PIT ); -sysbus_init_child_obj (obj,"emac" , &s->emac,sizeof (s->emac),TYPE_AW_EMAC ); +object_initialize_child (obj,"emac" , &s->emac,TYPE_AW_EMAC ); -sysbus_init_child_obj (obj,"sata" , &s->sata,sizeof (s->sata), -TYPE_ALLWINNER_AHCI ); +object_initialize_child (obj,"sata" , &s->sata,TYPE_ALLWINNER_AHCI );if (machine_usb (current_machine)) {int i;for (i =0 ; i <AW_A10_NUM_USB ; i++) { -sysbus_init_child_obj (obj,"ehci[*]" , &s->ehci[i], -sizeof (s->ehci[i]),TYPE_PLATFORM_EHCI ); -sysbus_init_child_obj (obj,"ohci[*]" , &s->ohci[i], -sizeof (s->ohci[i]),TYPE_SYSBUS_OHCI ); +object_initialize_child (obj,"ehci[*]" , &s->ehci[i], +TYPE_PLATFORM_EHCI ); +object_initialize_child (obj,"ohci[*]" , &s->ohci[i], +TYPE_SYSBUS_OHCI ); } } -sysbus_init_child_obj (obj,"mmc0" , &s->mmc0,sizeof (s->mmc0), -TYPE_AW_SDHOST_SUN4I ); +object_initialize_child (obj,"mmc0" , &s->mmc0,TYPE_AW_SDHOST_SUN4I ); -sysbus_init_child_obj (obj,"rtc" , &s->rtc,sizeof (s->rtc), -TYPE_AW_RTC_SUN4I ); +object_initialize_child (obj,"rtc" , &s->rtc,TYPE_AW_RTC_SUN4I ); }static void aw_a10_realize (DeviceState *dev,Error **errp)
@@ -85,7 +80,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)return ; } -object_property_set_bool (OBJECT (&s->intc), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->intc), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -98,7 +93,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp) qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_FIQ));qdev_pass_gpios (DEVICE (&s->intc), dev,NULL ); -object_property_set_bool (OBJECT (&s->timer), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->timer), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -122,7 +117,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)qemu_check_nic_model (&nd_table[0 ],TYPE_AW_EMAC );qdev_set_nic_properties (DEVICE (&s->emac), &nd_table[0 ]); } -object_property_set_bool (OBJECT (&s->emac), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->emac), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -131,7 +126,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (sysbusdev,0 ,AW_A10_EMAC_BASE );sysbus_connect_irq (sysbusdev,0 ,qdev_get_gpio_in (dev,55 )); -object_property_set_bool (OBJECT (&s->sata), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->sata), &err);if (err) {error_propagate (errp, err);return ;
@@ -154,8 +149,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)object_property_set_bool (OBJECT (&s->ehci[i]), true,"companion-enable" , &error_fatal); -object_property_set_bool (OBJECT (&s->ehci[i]), true,"realized" , - &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (&s->ehci[i]), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (&s->ehci[i]),0 ,AW_A10_EHCI_BASE + i *0x8000 ); sysbus_connect_irq(SYS_BUS_DEVICE(&s->ehci[i]), 0,
@@ -163,8 +157,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)object_property_set_str (OBJECT (&s->ohci[i]), bus,"masterbus" , &error_fatal); -object_property_set_bool (OBJECT (&s->ohci[i]), true,"realized" , - &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (&s->ohci[i]), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (&s->ohci[i]),0 ,AW_A10_OHCI_BASE + i *0x8000 ); sysbus_connect_irq(SYS_BUS_DEVICE(&s->ohci[i]), 0,
@@ -173,14 +166,14 @@ static void aw_a10_realize(DeviceState *dev, Error **errp) }/* SD/MMC */ -qdev_init_nofail (DEVICE (&s->mmc0)); +sysbus_realize (SYS_BUS_DEVICE (&s->mmc0), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (&s->mmc0),0 ,AW_A10_MMC0_BASE );sysbus_connect_irq (SYS_BUS_DEVICE (&s->mmc0),0 ,qdev_get_gpio_in (dev,32 ));object_property_add_alias (OBJECT (s),"sd-bus" ,OBJECT (&s->mmc0),"sd-bus" );/* RTC */ -qdev_init_nofail (DEVICE (&s->rtc)); +sysbus_realize (SYS_BUS_DEVICE (&s->rtc), &error_fatal);sysbus_mmio_map_overlap (SYS_BUS_DEVICE (&s->rtc),0 ,AW_A10_RTC_BASE ,10 ); }
hw/arm/allwinner-h3.c +20 -30
122 lines not on this page · raw message
hw/arm/armsse.c +42 -54
224 lines not on this page · raw message
hw/arm/armv7m.c +2 -2
@@ -136,7 +136,7 @@ static void armv7m_instance_init(Object *obj)memory_region_init (&s->container, obj,"armv7m-container" ,UINT64_MAX ); -sysbus_init_child_obj (obj,"nvnic" , &s->nvic,sizeof (s->nvic),TYPE_NVIC ); +object_initialize_child (obj,"nvnic" , &s->nvic,TYPE_NVIC );object_property_add_alias (obj,"num-irq" ,OBJECT (&s->nvic),"num-irq" );
@@ -223,7 +223,7 @@ static void armv7m_realize(DeviceState *dev, Error **errp) }/* Note that we must realize the NVIC after the CPU */ -object_property_set_bool (OBJECT (&s->nvic), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->nvic), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
hw/arm/aspeed_ast2600.c +39 -50
243 lines not on this page · raw message
hw/arm/aspeed_soc.c +30 -39
196 lines not on this page · raw message
hw/arm/bcm2835_peripherals.c +32 -43
217 lines not on this page · raw message
hw/arm/bcm2836.c +5 -6
@@ -56,11 +56,10 @@ static void bcm2836_init(Object *obj) info->cpu_type); } -sysbus_init_child_obj (obj,"control" , &s->control,sizeof (s->control), -TYPE_BCM2836_CONTROL ); +object_initialize_child (obj,"control" , &s->control,TYPE_BCM2836_CONTROL ); -sysbus_init_child_obj (obj,"peripherals" , &s->peripherals, -sizeof (s->peripherals),TYPE_BCM2835_PERIPHERALS ); +object_initialize_child (obj,"peripherals" , &s->peripherals, +TYPE_BCM2835_PERIPHERALS );object_property_add_alias (obj,"board-rev" ,OBJECT (&s->peripherals),"board-rev" ); object_property_add_alias(obj, "vcram-size", OBJECT(&s->peripherals),
@@ -87,7 +86,7 @@ static void bcm2836_realize(DeviceState *dev, Error **errp)object_property_add_const_link (OBJECT (&s->peripherals),"ram" , obj); -object_property_set_bool (OBJECT (&s->peripherals), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->peripherals), &err);if (err) {error_propagate (errp, err);return ;
@@ -100,7 +99,7 @@ static void bcm2836_realize(DeviceState *dev, Error **errp) info->peri_base, 1);/* bcm2836 interrupt controller (and mailboxes, etc.) */ -object_property_set_bool (OBJECT (&s->control), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->control), &err);if (err) {error_propagate (errp, err);return ;
hw/arm/digic.c +4 -6
@@ -43,12 +43,10 @@ static void digic_init(Object *obj)char name[DIGIC_TIMER_NAME_MLEN ];snprintf (name,DIGIC_TIMER_NAME_MLEN ,"timer[%d]" , i); -sysbus_init_child_obj (obj, name, &s->timer[i],sizeof (s->timer[i]), -TYPE_DIGIC_TIMER ); +object_initialize_child (obj, name, &s->timer[i],TYPE_DIGIC_TIMER ); } -sysbus_init_child_obj (obj,"uart" , &s->uart,sizeof (s->uart), -TYPE_DIGIC_UART ); +object_initialize_child (obj,"uart" , &s->uart,TYPE_DIGIC_UART ); }static void digic_realize (DeviceState *dev,Error **errp)
@@ -71,7 +69,7 @@ static void digic_realize(DeviceState *dev, Error **errp) }for (i =0 ; i <DIGIC4_NB_TIMERS ; i++) { -object_property_set_bool (OBJECT (&s->timer[i]), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->timer[i]), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -82,7 +80,7 @@ static void digic_realize(DeviceState *dev, Error **errp) }qdev_prop_set_chr (DEVICE (&s->uart),"chardev" ,serial_hd (0 )); -object_property_set_bool (OBJECT (&s->uart), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->uart), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
hw/arm/fsl-imx25.c +24 -34
161 lines not on this page · raw message
hw/arm/fsl-imx31.c +16 -21
@@ -35,34 +35,29 @@ static void fsl_imx31_init(Object *obj)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 ); +object_initialize_child (obj,"avic" , &s->avic,TYPE_IMX_AVIC ); -sysbus_init_child_obj (obj,"ccm" , &s->ccm,sizeof (s->ccm),TYPE_IMX31_CCM ); +object_initialize_child (obj,"ccm" , &s->ccm,TYPE_IMX31_CCM );for (i =0 ; i <FSL_IMX31_NUM_UARTS ; i++) { -sysbus_init_child_obj (obj,"uart[*]" , &s->uart[i],sizeof (s->uart[i]), -TYPE_IMX_SERIAL ); +object_initialize_child (obj,"uart[*]" , &s->uart[i],TYPE_IMX_SERIAL ); } -sysbus_init_child_obj (obj,"gpt" , &s->gpt,sizeof (s->gpt),TYPE_IMX31_GPT ); +object_initialize_child (obj,"gpt" , &s->gpt,TYPE_IMX31_GPT );for (i =0 ; i <FSL_IMX31_NUM_EPITS ; i++) { -sysbus_init_child_obj (obj,"epit[*]" , &s->epit[i],sizeof (s->epit[i]), -TYPE_IMX_EPIT ); +object_initialize_child (obj,"epit[*]" , &s->epit[i],TYPE_IMX_EPIT ); }for (i =0 ; i <FSL_IMX31_NUM_I2CS ; i++) { -sysbus_init_child_obj (obj,"i2c[*]" , &s->i2c[i],sizeof (s->i2c[i]), -TYPE_IMX_I2C ); +object_initialize_child (obj,"i2c[*]" , &s->i2c[i],TYPE_IMX_I2C ); }for (i =0 ; i <FSL_IMX31_NUM_GPIOS ; i++) { -sysbus_init_child_obj (obj,"gpio[*]" , &s->gpio[i],sizeof (s->gpio[i]), -TYPE_IMX_GPIO ); +object_initialize_child (obj,"gpio[*]" , &s->gpio[i],TYPE_IMX_GPIO ); } -sysbus_init_child_obj (obj,"wdt" , &s->wdt,sizeof (s->wdt),TYPE_IMX2_WDT ); +object_initialize_child (obj,"wdt" , &s->wdt,TYPE_IMX2_WDT ); }static void fsl_imx31_realize (DeviceState *dev,Error **errp)
@@ -77,7 +72,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp)return ; } -object_property_set_bool (OBJECT (&s->avic), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->avic), &err);if (err) {error_propagate (errp, err);return ;
@@ -88,7 +83,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp)sysbus_connect_irq (SYS_BUS_DEVICE (&s->avic),1 ,qdev_get_gpio_in (DEVICE (&s->cpu),ARM_CPU_FIQ )); -object_property_set_bool (OBJECT (&s->ccm), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->ccm), &err);if (err) {error_propagate (errp, err);return ;
@@ -107,7 +102,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp)qdev_prop_set_chr (DEVICE (&s->uart[i]),"chardev" ,serial_hd (i)); -object_property_set_bool (OBJECT (&s->uart[i]), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->uart[i]), &err);if (err) {error_propagate (errp, err);return ;
@@ -121,7 +116,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp) s->gpt.ccm =IMX_CCM (&s->ccm); -object_property_set_bool (OBJECT (&s->gpt), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->gpt), &err);if (err) {error_propagate (errp, err);return ;
@@ -143,7 +138,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp) s->epit[i].ccm =IMX_CCM (&s->ccm); -object_property_set_bool (OBJECT (&s->epit[i]), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->epit[i]), &err);if (err) {error_propagate (errp, err);return ;
@@ -167,7 +162,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp) };/* Initialize the I2C */ -object_property_set_bool (OBJECT (&s->i2c[i]), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->i2c[i]), &err);if (err) {error_propagate (errp, err);return ;
@@ -193,7 +188,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp)object_property_set_bool (OBJECT (&s->gpio[i]), false,"has-edge-sel" , &error_abort); -object_property_set_bool (OBJECT (&s->gpio[i]), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->gpio[i]), &err);if (err) {error_propagate (errp, err);return ;
@@ -206,7 +201,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp) }/* Watchdog */ -object_property_set_bool (OBJECT (&s->wdt), true,"realized" , &error_abort); +sysbus_realize (SYS_BUS_DEVICE (&s->wdt), &error_abort);sysbus_mmio_map (SYS_BUS_DEVICE (&s->wdt),0 ,FSL_IMX31_WDT_ADDR );/* On a real system, the first 16k is a `secure boot rom' */
hw/arm/fsl-imx6.c +28 -41
198 lines not on this page · raw message
hw/arm/fsl-imx6ul.c +35 -63
286 lines not on this page · raw message
hw/arm/fsl-imx7.c +33 -60
260 lines not on this page · raw message
hw/arm/msf2-soc.c +10 -15
@@ -71,22 +71,17 @@ static void m2sxxx_soc_initfn(Object *obj)MSF2State *s =MSF2_SOC (obj);int i; -sysbus_init_child_obj (obj,"armv7m" , &s->armv7m,sizeof (s->armv7m), -TYPE_ARMV7M ); +object_initialize_child (obj,"armv7m" , &s->armv7m,TYPE_ARMV7M ); -sysbus_init_child_obj (obj,"sysreg" , &s->sysreg,sizeof (s->sysreg), -TYPE_MSF2_SYSREG ); +object_initialize_child (obj,"sysreg" , &s->sysreg,TYPE_MSF2_SYSREG ); -sysbus_init_child_obj (obj,"timer" , &s->timer,sizeof (s->timer), -TYPE_MSS_TIMER ); +object_initialize_child (obj,"timer" , &s->timer,TYPE_MSS_TIMER );for (i =0 ; i <MSF2_NUM_SPIS ; i++) { -sysbus_init_child_obj (obj,"spi[*]" , &s->spi[i],sizeof (s->spi[i]), -TYPE_MSS_SPI ); +object_initialize_child (obj,"spi[*]" , &s->spi[i],TYPE_MSS_SPI ); } -sysbus_init_child_obj (obj,"emac" , &s->emac,sizeof (s->emac), -TYPE_MSS_EMAC ); +object_initialize_child (obj,"emac" , &s->emac,TYPE_MSS_EMAC );if (nd_table[0 ].used) {qemu_check_nic_model (&nd_table[0 ],TYPE_MSS_EMAC );qdev_set_nic_properties (DEVICE (&s->emac), &nd_table[0 ]);
@@ -130,7 +125,7 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp)qdev_prop_set_bit (armv7m,"enable-bitband" , true);object_property_set_link (OBJECT (&s->armv7m),OBJECT (get_system_memory ()),"memory" , &error_abort); -object_property_set_bool (OBJECT (&s->armv7m), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->armv7m), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -158,7 +153,7 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp) dev =DEVICE (&s->timer);/* APB0 clock is the timer input clock */ qdev_prop_set_uint32 (dev,"clock-frequency" , s->m3clk / s->apb0div); -object_property_set_bool (OBJECT (&s->timer), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->timer), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -173,7 +168,7 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp) dev =DEVICE (&s->sysreg);qdev_prop_set_uint32 (dev,"apb0divisor" , s->apb0div);qdev_prop_set_uint32 (dev,"apb1divisor" , s->apb1div); -object_property_set_bool (OBJECT (&s->sysreg), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->sysreg), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -184,7 +179,7 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp)for (i =0 ; i <MSF2_NUM_SPIS ; i++) {gchar *bus_name; -object_property_set_bool (OBJECT (&s->spi[i]), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->spi[i]), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -204,7 +199,7 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp) dev =DEVICE (&s->emac);object_property_set_link (OBJECT (&s->emac),OBJECT (get_system_memory ()),"ahb-bus" , &error_abort); -object_property_set_bool (OBJECT (&s->emac), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->emac), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
hw/arm/nrf51_soc.c +13 -17
@@ -71,7 +71,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp)error_propagate (errp, err);return ; } -object_property_set_bool (OBJECT (&s->cpu), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->cpu), &err);if (err) {error_propagate (errp, err);return ;
@@ -88,7 +88,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp)memory_region_add_subregion (&s->container,NRF51_SRAM_BASE , &s->sram);/* UART */ -object_property_set_bool (OBJECT (&s->uart), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->uart), &err);if (err) {error_propagate (errp, err);return ;
@@ -100,7 +100,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) BASE_TO_IRQ(NRF51_UART_BASE)));/* RNG */ -object_property_set_bool (OBJECT (&s->rng), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->rng), &err);if (err) {error_propagate (errp, err);return ;
@@ -120,7 +120,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp)return ; } -object_property_set_bool (OBJECT (&s->nvm), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->nvm), &err);if (err) {error_propagate (errp, err);return ;
@@ -136,7 +136,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp)memory_region_add_subregion_overlap (&s->container,NRF51_FLASH_BASE , mr,0 );/* GPIO */ -object_property_set_bool (OBJECT (&s->gpio), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->gpio), &err);if (err) {error_propagate (errp, err);return ;
@@ -155,7 +155,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp)error_propagate (errp, err);return ; } -object_property_set_bool (OBJECT (&s->timer[i]), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->timer[i]), &err);if (err) {error_propagate (errp, err);return ;
@@ -189,27 +189,23 @@ static void nrf51_soc_init(Object *obj)memory_region_init (&s->container, obj,"nrf51-container" ,UINT64_MAX ); -sysbus_init_child_obj (OBJECT (s),"armv6m" , &s->cpu,sizeof (s->cpu), -TYPE_ARMV7M ); +object_initialize_child (OBJECT (s),"armv6m" , &s->cpu,TYPE_ARMV7M );qdev_prop_set_string (DEVICE (&s->cpu),"cpu-type" ,ARM_CPU_TYPE_NAME ("cortex-m0" ));qdev_prop_set_uint32 (DEVICE (&s->cpu),"num-irq" ,32 ); -sysbus_init_child_obj (obj,"uart" , &s->uart,sizeof (s->uart), -TYPE_NRF51_UART ); +object_initialize_child (obj,"uart" , &s->uart,TYPE_NRF51_UART );object_property_add_alias (obj,"serial0" ,OBJECT (&s->uart),"chardev" ); -sysbus_init_child_obj (obj,"rng" , &s->rng,sizeof (s->rng), -TYPE_NRF51_RNG ); +object_initialize_child (obj,"rng" , &s->rng,TYPE_NRF51_RNG ); -sysbus_init_child_obj (obj,"nvm" , &s->nvm,sizeof (s->nvm),TYPE_NRF51_NVM ); +object_initialize_child (obj,"nvm" , &s->nvm,TYPE_NRF51_NVM ); -sysbus_init_child_obj (obj,"gpio" , &s->gpio,sizeof (s->gpio), -TYPE_NRF51_GPIO ); +object_initialize_child (obj,"gpio" , &s->gpio,TYPE_NRF51_GPIO );for (i =0 ; i <NRF51_NUM_TIMERS ; i++) { -sysbus_init_child_obj (obj,"timer[*]" , &s->timer[i], -sizeof (s->timer[i]),TYPE_NRF51_TIMER ); +object_initialize_child (obj,"timer[*]" , &s->timer[i], +TYPE_NRF51_TIMER ); } }
hw/arm/stm32f205_soc.c +14 -18
@@ -51,32 +51,28 @@ static void stm32f205_soc_initfn(Object *obj)STM32F205State *s =STM32F205_SOC (obj);int i; -sysbus_init_child_obj (obj,"armv7m" , &s->armv7m,sizeof (s->armv7m), -TYPE_ARMV7M ); +object_initialize_child (obj,"armv7m" , &s->armv7m,TYPE_ARMV7M ); -sysbus_init_child_obj (obj,"syscfg" , &s->syscfg,sizeof (s->syscfg), -TYPE_STM32F2XX_SYSCFG ); +object_initialize_child (obj,"syscfg" , &s->syscfg,TYPE_STM32F2XX_SYSCFG );for (i =0 ; i <STM_NUM_USARTS ; i++) { -sysbus_init_child_obj (obj,"usart[*]" , &s->usart[i], -sizeof (s->usart[i]),TYPE_STM32F2XX_USART ); +object_initialize_child (obj,"usart[*]" , &s->usart[i], +TYPE_STM32F2XX_USART ); }for (i =0 ; i <STM_NUM_TIMERS ; i++) { -sysbus_init_child_obj (obj,"timer[*]" , &s->timer[i], -sizeof (s->timer[i]),TYPE_STM32F2XX_TIMER ); +object_initialize_child (obj,"timer[*]" , &s->timer[i], +TYPE_STM32F2XX_TIMER ); } s->adc_irqs =OR_IRQ (object_new (TYPE_OR_IRQ ));for (i =0 ; i <STM_NUM_ADCS ; i++) { -sysbus_init_child_obj (obj,"adc[*]" , &s->adc[i],sizeof (s->adc[i]), -TYPE_STM32F2XX_ADC ); +object_initialize_child (obj,"adc[*]" , &s->adc[i],TYPE_STM32F2XX_ADC ); }for (i =0 ; i <STM_NUM_SPIS ; i++) { -sysbus_init_child_obj (obj,"spi[*]" , &s->spi[i],sizeof (s->spi[i]), -TYPE_STM32F2XX_SPI ); +object_initialize_child (obj,"spi[*]" , &s->spi[i],TYPE_STM32F2XX_SPI ); } }
@@ -111,7 +107,7 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp)qdev_prop_set_bit (armv7m,"enable-bitband" , true);object_property_set_link (OBJECT (&s->armv7m),OBJECT (get_system_memory ()),"memory" , &error_abort); -object_property_set_bool (OBJECT (&s->armv7m), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->armv7m), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -119,7 +115,7 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp)/* System configuration controller */ dev =DEVICE (&s->syscfg); -object_property_set_bool (OBJECT (&s->syscfg), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->syscfg), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -132,7 +128,7 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp)for (i =0 ; i <STM_NUM_USARTS ; i++) { dev =DEVICE (&(s->usart[i]));qdev_prop_set_chr (dev,"chardev" ,serial_hd (i)); -object_property_set_bool (OBJECT (&s->usart[i]), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->usart[i]), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -146,7 +142,7 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp)for (i =0 ; i <STM_NUM_TIMERS ; i++) { dev =DEVICE (&(s->timer[i]));qdev_prop_set_uint64 (dev,"clock-frequency" ,1000000000 ); -object_property_set_bool (OBJECT (&s->timer[i]), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->timer[i]), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -169,7 +165,7 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp)for (i =0 ; i <STM_NUM_ADCS ; i++) { dev =DEVICE (&(s->adc[i])); -object_property_set_bool (OBJECT (&s->adc[i]), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->adc[i]), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -183,7 +179,7 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp)/* SPI 1 and 2 */ for (i =0 ; i <STM_NUM_SPIS ; i++) { dev =DEVICE (&(s->spi[i])); -object_property_set_bool (OBJECT (&s->spi[i]), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->spi[i]), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
hw/arm/stm32f405_soc.c +16 -21
@@ -57,34 +57,29 @@ static void stm32f405_soc_initfn(Object *obj)STM32F405State *s =STM32F405_SOC (obj);int i; -sysbus_init_child_obj (obj,"armv7m" , &s->armv7m,sizeof (s->armv7m), -TYPE_ARMV7M ); +object_initialize_child (obj,"armv7m" , &s->armv7m,TYPE_ARMV7M ); -sysbus_init_child_obj (obj,"syscfg" , &s->syscfg,sizeof (s->syscfg), -TYPE_STM32F4XX_SYSCFG ); +object_initialize_child (obj,"syscfg" , &s->syscfg,TYPE_STM32F4XX_SYSCFG );for (i =0 ; i <STM_NUM_USARTS ; i++) { -sysbus_init_child_obj (obj,"usart[*]" , &s->usart[i], -sizeof (s->usart[i]),TYPE_STM32F2XX_USART ); +object_initialize_child (obj,"usart[*]" , &s->usart[i], +TYPE_STM32F2XX_USART ); }for (i =0 ; i <STM_NUM_TIMERS ; i++) { -sysbus_init_child_obj (obj,"timer[*]" , &s->timer[i], -sizeof (s->timer[i]),TYPE_STM32F2XX_TIMER ); +object_initialize_child (obj,"timer[*]" , &s->timer[i], +TYPE_STM32F2XX_TIMER ); }for (i =0 ; i <STM_NUM_ADCS ; i++) { -sysbus_init_child_obj (obj,"adc[*]" , &s->adc[i],sizeof (s->adc[i]), -TYPE_STM32F2XX_ADC ); +object_initialize_child (obj,"adc[*]" , &s->adc[i],TYPE_STM32F2XX_ADC ); }for (i =0 ; i <STM_NUM_SPIS ; i++) { -sysbus_init_child_obj (obj,"spi[*]" , &s->spi[i],sizeof (s->spi[i]), -TYPE_STM32F2XX_SPI ); +object_initialize_child (obj,"spi[*]" , &s->spi[i],TYPE_STM32F2XX_SPI ); } -sysbus_init_child_obj (obj,"exti" , &s->exti,sizeof (s->exti), -TYPE_STM32F4XX_EXTI ); +object_initialize_child (obj,"exti" , &s->exti,TYPE_STM32F4XX_EXTI ); }static void stm32f405_soc_realize (DeviceState *dev_soc,Error **errp)
@@ -123,7 +118,7 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp)qdev_prop_set_bit (armv7m,"enable-bitband" , true);object_property_set_link (OBJECT (&s->armv7m),OBJECT (system_memory),"memory" , &error_abort); -object_property_set_bool (OBJECT (&s->armv7m), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->armv7m), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -131,7 +126,7 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp)/* System configuration controller */ dev =DEVICE (&s->syscfg); -object_property_set_bool (OBJECT (&s->syscfg), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->syscfg), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -144,7 +139,7 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp)for (i =0 ; i <STM_NUM_USARTS ; i++) { dev =DEVICE (&(s->usart[i]));qdev_prop_set_chr (dev,"chardev" ,serial_hd (i)); -object_property_set_bool (OBJECT (&s->usart[i]), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->usart[i]), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -158,7 +153,7 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp)for (i =0 ; i <STM_NUM_TIMERS ; i++) { dev =DEVICE (&(s->timer[i]));qdev_prop_set_uint64 (dev,"clock-frequency" ,1000000000 ); -object_property_set_bool (OBJECT (&s->timer[i]), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->timer[i]), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -188,7 +183,7 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp)for (i =0 ; i <STM_NUM_ADCS ; i++) { dev =DEVICE (&(s->adc[i])); -object_property_set_bool (OBJECT (&s->adc[i]), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->adc[i]), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -202,7 +197,7 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp)/* SPI devices */ for (i =0 ; i <STM_NUM_SPIS ; i++) { dev =DEVICE (&(s->spi[i])); -object_property_set_bool (OBJECT (&s->spi[i]), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->spi[i]), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -214,7 +209,7 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp)/* EXTI device */ dev =DEVICE (&s->exti); -object_property_set_bool (OBJECT (&s->exti), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->exti), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
hw/arm/xlnx-zynqmp.c +25 -35
162 lines not on this page · raw message
hw/cpu/a15mpcore.c +2 -3
@@ -42,8 +42,7 @@ static void a15mp_priv_initfn(Object *obj)memory_region_init (&s->container, obj,"a15mp-priv-container" ,0x8000 );sysbus_init_mmio (sbd, &s->container); -sysbus_init_child_obj (obj,"gic" , &s->gic,sizeof (s->gic), -gic_class_name ()); +object_initialize_child (obj,"gic" , &s->gic,gic_class_name ());qdev_prop_set_uint32 (DEVICE (&s->gic),"revision" ,2 ); }
@@ -77,7 +76,7 @@ static void a15mp_priv_realize(DeviceState *dev, Error **errp)qdev_prop_set_bit (gicdev,"has-virtualization-extensions" , has_el2); } -object_property_set_bool (OBJECT (&s->gic), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->gic), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
hw/cpu/a9mpcore.c +10 -13
@@ -32,18 +32,15 @@ static void a9mp_priv_initfn(Object *obj)memory_region_init (&s->container, obj,"a9mp-priv-container" ,0x2000 );sysbus_init_mmio (SYS_BUS_DEVICE (obj), &s->container); -sysbus_init_child_obj (obj,"scu" , &s->scu,sizeof (s->scu),TYPE_A9_SCU ); +object_initialize_child (obj,"scu" , &s->scu,TYPE_A9_SCU ); -sysbus_init_child_obj (obj,"gic" , &s->gic,sizeof (s->gic),TYPE_ARM_GIC ); +object_initialize_child (obj,"gic" , &s->gic,TYPE_ARM_GIC ); -sysbus_init_child_obj (obj,"gtimer" , &s->gtimer,sizeof (s->gtimer), -TYPE_A9_GTIMER ); +object_initialize_child (obj,"gtimer" , &s->gtimer,TYPE_A9_GTIMER ); -sysbus_init_child_obj (obj,"mptimer" , &s->mptimer,sizeof (s->mptimer), -TYPE_ARM_MPTIMER ); +object_initialize_child (obj,"mptimer" , &s->mptimer,TYPE_ARM_MPTIMER ); -sysbus_init_child_obj (obj,"wdt" , &s->wdt,sizeof (s->wdt), -TYPE_ARM_MPTIMER ); +object_initialize_child (obj,"wdt" , &s->wdt,TYPE_ARM_MPTIMER ); }static void a9mp_priv_realize (DeviceState *dev,Error **errp)
@@ -60,7 +57,7 @@ static void a9mp_priv_realize(DeviceState *dev, Error **errp) scudev =DEVICE (&s->scu);qdev_prop_set_uint32 (scudev,"num-cpu" , s->num_cpu); -object_property_set_bool (OBJECT (&s->scu), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->scu), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -81,7 +78,7 @@ static void a9mp_priv_realize(DeviceState *dev, Error **errp)object_property_get_bool (cpuobj,"has_el3" , &error_abort);qdev_prop_set_bit (gicdev,"has-security-extensions" , has_el3); -object_property_set_bool (OBJECT (&s->gic), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->gic), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -96,7 +93,7 @@ static void a9mp_priv_realize(DeviceState *dev, Error **errp) gtimerdev =DEVICE (&s->gtimer);qdev_prop_set_uint32 (gtimerdev,"num-cpu" , s->num_cpu); -object_property_set_bool (OBJECT (&s->gtimer), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->gtimer), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -105,7 +102,7 @@ static void a9mp_priv_realize(DeviceState *dev, Error **errp) mptimerdev =DEVICE (&s->mptimer);qdev_prop_set_uint32 (mptimerdev,"num-cpu" , s->num_cpu); -object_property_set_bool (OBJECT (&s->mptimer), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->mptimer), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -114,7 +111,7 @@ static void a9mp_priv_realize(DeviceState *dev, Error **errp) wdtdev =DEVICE (&s->wdt);qdev_prop_set_uint32 (wdtdev,"num-cpu" , s->num_cpu); -object_property_set_bool (OBJECT (&s->wdt), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->wdt), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
hw/cpu/arm11mpcore.c +8 -10
@@ -79,7 +79,7 @@ static void mpcore_priv_realize(DeviceState *dev, Error **errp)Error *err =NULL ;qdev_prop_set_uint32 (scudev,"num-cpu" , s->num_cpu); -object_property_set_bool (OBJECT (&s->scu), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->scu), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -91,7 +91,7 @@ static void mpcore_priv_realize(DeviceState *dev, Error **errp) ARM11MPCORE_NUM_GIC_PRIORITY_BITS); -object_property_set_bool (OBJECT (&s->gic), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->gic), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -104,14 +104,14 @@ static void mpcore_priv_realize(DeviceState *dev, Error **errp)qdev_init_gpio_in (dev, mpcore_priv_set_irq, s->num_irq -32 );qdev_prop_set_uint32 (mptimerdev,"num-cpu" , s->num_cpu); -object_property_set_bool (OBJECT (&s->mptimer), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->mptimer), &err);if (err !=NULL ) {error_propagate (errp, err);return ; }qdev_prop_set_uint32 (wdtimerdev,"num-cpu" , s->num_cpu); -object_property_set_bool (OBJECT (&s->wdtimer), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->wdtimer), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -129,17 +129,15 @@ static void mpcore_priv_initfn(Object *obj) "mpcore-priv-container", 0x2000);sysbus_init_mmio (sbd, &s->container); -sysbus_init_child_obj (obj,"scu" , &s->scu,sizeof (s->scu),TYPE_ARM11_SCU ); +object_initialize_child (obj,"scu" , &s->scu,TYPE_ARM11_SCU ); -sysbus_init_child_obj (obj,"gic" , &s->gic,sizeof (s->gic),TYPE_ARM_GIC ); +object_initialize_child (obj,"gic" , &s->gic,TYPE_ARM_GIC );/* Request the legacy 11MPCore GIC behaviour: */ qdev_prop_set_uint32 (DEVICE (&s->gic),"revision" ,0 ); -sysbus_init_child_obj (obj,"mptimer" , &s->mptimer,sizeof (s->mptimer), -TYPE_ARM_MPTIMER ); +object_initialize_child (obj,"mptimer" , &s->mptimer,TYPE_ARM_MPTIMER ); -sysbus_init_child_obj (obj,"wdtimer" , &s->wdtimer,sizeof (s->wdtimer), -TYPE_ARM_MPTIMER ); +object_initialize_child (obj,"wdtimer" , &s->wdtimer,TYPE_ARM_MPTIMER ); }static Property mpcore_priv_properties[] = {
hw/cpu/realview_mpcore.c +2 -3
@@ -70,7 +70,7 @@ static void realview_mpcore_realize(DeviceState *dev, Error **errp)int i;qdev_prop_set_uint32 (priv,"num-cpu" , s->num_cpu); -object_property_set_bool (OBJECT (&s->priv), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->priv), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -104,8 +104,7 @@ static void mpcore_rirq_init(Object *obj)SysBusDevice *privbusdev;int i; -sysbus_init_child_obj (obj,"a11priv" , &s->priv,sizeof (s->priv), -TYPE_ARM11MPCORE_PRIV ); +object_initialize_child (obj,"a11priv" , &s->priv,TYPE_ARM11MPCORE_PRIV ); privbusdev =SYS_BUS_DEVICE (&s->priv);sysbus_init_mmio (sbd,sysbus_mmio_get_region (privbusdev,0 ));
hw/intc/realview_gic.c +2 -2
@@ -34,7 +34,7 @@ static void realview_gic_realize(DeviceState *dev, Error **errp)int numirq =96 ;qdev_prop_set_uint32 (DEVICE (&s->gic),"num-irq" , numirq); -object_property_set_bool (OBJECT (&s->gic), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->gic), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -62,7 +62,7 @@ static void realview_gic_init(Object *obj) "realview-gic-container", 0x2000);sysbus_init_mmio (sbd, &s->container); -sysbus_init_child_obj (obj,"gic" , &s->gic,sizeof (s->gic),TYPE_ARM_GIC ); +object_initialize_child (obj,"gic" , &s->gic,TYPE_ARM_GIC );qdev_prop_set_uint32 (DEVICE (&s->gic),"num-cpu" ,1 ); }
hw/microblaze/xlnx-zynqmp-pmu.c +4 -7
@@ -63,14 +63,12 @@ static void xlnx_zynqmp_pmu_soc_init(Object *obj)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 ); +object_initialize_child (obj,"intc" , &s->intc,TYPE_XLNX_PMU_IO_INTC );/* Create the IPI device */ for (int i =0 ; i <XLNX_ZYNQMP_PMU_NUM_IPIS ; i++) {char *name =g_strdup_printf ("ipi%d" , i); -sysbus_init_child_obj (obj, name, &s->ipi[i],sizeof (s->ipi[i]), -TYPE_XLNX_ZYNQMP_IPI ); +object_initialize_child (obj, name, &s->ipi[i],TYPE_XLNX_ZYNQMP_IPI );g_free (name); } }
@@ -110,7 +108,7 @@ static void xlnx_zynqmp_pmu_soc_realize(DeviceState *dev, Error **errp) &error_abort);object_property_set_uint (OBJECT (&s->intc),0xffff ,"intc-positive" , &error_abort); -object_property_set_bool (OBJECT (&s->intc), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->intc), &err);if (err) {error_propagate (errp, err);return ;
@@ -121,8 +119,7 @@ static void xlnx_zynqmp_pmu_soc_realize(DeviceState *dev, Error **errp)/* Connect the IPI device */ for (int i =0 ; i <XLNX_ZYNQMP_PMU_NUM_IPIS ; i++) { -object_property_set_bool (OBJECT (&s->ipi[i]), true,"realized" , - &error_abort); +sysbus_realize (SYS_BUS_DEVICE (&s->ipi[i]), &error_abort);sysbus_mmio_map (SYS_BUS_DEVICE (&s->ipi[i]),0 , ipi_addr[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->ipi[i]),0 ,qdev_get_gpio_in (DEVICE (&s->intc), ipi_irq[i]));
hw/misc/macio/cuda.c +4 -4
@@ -31,6 +31,7 @@#include "hw/input/adb.h" #include "hw/misc/mos6522.h" #include "hw/misc/macio/cuda.h" +#include "qapi/error.h" #include "qemu/timer.h" #include "sysemu/runstate.h" #include "qapi/error.h"
@@ -527,8 +528,7 @@ static void cuda_realize(DeviceState *dev, Error **errp)SysBusDevice *sbd;struct tm tm; -object_property_set_bool (OBJECT (&s->mos6522_cuda), true,"realized" , - &err); +sysbus_realize (SYS_BUS_DEVICE (&s->mos6522_cuda), &err);if (err) {error_propagate (errp, err);return ;
@@ -554,8 +554,8 @@ static void cuda_init(Object *obj)CUDAState *s =CUDA (obj);SysBusDevice *sbd =SYS_BUS_DEVICE (obj); -sysbus_init_child_obj (obj,"mos6522-cuda" , &s->mos6522_cuda, -sizeof (s->mos6522_cuda),TYPE_MOS6522_CUDA ); +object_initialize_child (obj,"mos6522-cuda" , &s->mos6522_cuda, +TYPE_MOS6522_CUDA );memory_region_init_io (&s->mem, obj, &mos6522_cuda_ops, s,"cuda" ,0x2000 );sysbus_init_mmio (sbd, &s->mem);
hw/misc/macio/pmu.c +4 -4
@@ -38,6 +38,7 @@#include "hw/misc/mos6522.h" #include "hw/misc/macio/gpio.h" #include "hw/misc/macio/pmu.h" +#include "qapi/error.h" #include "qemu/timer.h" #include "sysemu/runstate.h" #include "qapi/error.h"
@@ -744,8 +745,7 @@ static void pmu_realize(DeviceState *dev, Error **errp)SysBusDevice *sbd;struct tm tm; -object_property_set_bool (OBJECT (&s->mos6522_pmu), true,"realized" , - &err); +sysbus_realize (SYS_BUS_DEVICE (&s->mos6522_pmu), &err);if (err) {error_propagate (errp, err);return ;
@@ -780,8 +780,8 @@ static void pmu_init(Object *obj) qdev_prop_allow_set_link_before_realize, 0); -sysbus_init_child_obj (obj,"mos6522-pmu" , &s->mos6522_pmu, -sizeof (s->mos6522_pmu),TYPE_MOS6522_PMU ); +object_initialize_child (obj,"mos6522-pmu" , &s->mos6522_pmu, +TYPE_MOS6522_PMU );memory_region_init_io (&s->mem, obj, &mos6522_pmu_ops, s,"via-pmu" ,0x2000 );
hw/ppc/pnv.c +2 -4
@@ -1309,8 +1309,7 @@ static void pnv_chip_power9_instance_init(Object *obj)PnvChipClass *pcc =PNV_CHIP_GET_CLASS (obj);int i; -sysbus_init_child_obj (obj,"xive" , &chip9->xive,sizeof (chip9->xive), -TYPE_PNV_XIVE ); +object_initialize_child (obj,"xive" , &chip9->xive,TYPE_PNV_XIVE );object_property_add_alias (obj,"xive-fabric" ,OBJECT (&chip9->xive),"xive-fabric" );
@@ -1470,8 +1469,7 @@ static void pnv_chip_power9_realize(DeviceState *dev, Error **errp) "tm-bar", &error_fatal);object_property_set_link (OBJECT (&chip9->xive),OBJECT (chip),"chip" , &error_abort); -object_property_set_bool (OBJECT (&chip9->xive), true,"realized" , - &local_err); +sysbus_realize (SYS_BUS_DEVICE (&chip9->xive), &local_err);if (local_err) {error_propagate (errp, local_err);return ;
hw/riscv/opentitan.c +2 -4
@@ -93,8 +93,7 @@ static void riscv_lowrisc_ibex_soc_init(Object *obj) {LowRISCIbexSoCState *s =RISCV_IBEX_SOC (obj); -sysbus_init_child_obj (obj,"cpus" , &s->cpus, -sizeof (s->cpus),TYPE_RISCV_HART_ARRAY ); +object_initialize_child (obj,"cpus" , &s->cpus,TYPE_RISCV_HART_ARRAY ); }static void riscv_lowrisc_ibex_soc_realize (DeviceState *dev_soc,Error **errp)
@@ -108,8 +107,7 @@ static void riscv_lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp) &error_abort);object_property_set_int (OBJECT (&s->cpus), ms->smp.cpus,"num-harts" , &error_abort); -object_property_set_bool (OBJECT (&s->cpus), true,"realized" , - &error_abort); +sysbus_realize (SYS_BUS_DEVICE (&s->cpus), &error_abort);/* Boot ROM */ memory_region_init_rom(&s->rom, OBJECT(dev_soc), "riscv.lowrisc.ibex.rom",
hw/riscv/sifive_e.c +5 -8
@@ -147,13 +147,11 @@ static void riscv_sifive_e_soc_init(Object *obj)MachineState *ms =MACHINE (qdev_get_machine ());SiFiveESoCState *s =RISCV_E_SOC (obj); -sysbus_init_child_obj (obj,"cpus" , &s->cpus, -sizeof (s->cpus),TYPE_RISCV_HART_ARRAY ); +object_initialize_child (obj,"cpus" , &s->cpus,TYPE_RISCV_HART_ARRAY );object_property_set_int (OBJECT (&s->cpus), ms->smp.cpus,"num-harts" , &error_abort); -sysbus_init_child_obj (obj,"riscv.sifive.e.gpio0" , - &s->gpio,sizeof (s->gpio), -TYPE_SIFIVE_GPIO ); +object_initialize_child (obj,"riscv.sifive.e.gpio0" , &s->gpio, +TYPE_SIFIVE_GPIO ); }static void riscv_sifive_e_soc_realize (DeviceState *dev,Error **errp)
@@ -167,8 +165,7 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev, Error **errp)
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.26.2
Part of the diff is not shown here. View the raw message.
PATCH RESEND v3 49/58 sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 3
In reply to Markus ArmbrusterThese are init/realize pairs produced by the previous commit's Coccinelle script where the argument test doesn't quite match. They need even more careful review.
--- hw/arm/armsse.c | 33 +++++++++++++-------------------- hw/arm/armv7m.c | 6 +++--- hw/arm/microbit.c | 12 ++++++------ hw/arm/xlnx-versal.c | 6 +++--- hw/arm/xlnx-zynqmp.c | 6 +++--- hw/cpu/realview_mpcore.c | 5 ++--- hw/display/sm501.c | 4 ++-- hw/intc/armv7m_nvic.c | 7 +++---- 8 files changed, 35 insertions(+), 44 deletions(-)
hw/arm/armsse.c +13 -20
@@ -256,9 +256,8 @@ static void armsse_init(Object *obj)g_free (name); name =g_strdup_printf ("armv7m%d" , i); -sysbus_init_child_obj (OBJECT (&s->cluster[i]), name, - &s->armv7m[i],sizeof (s->armv7m[i]), -TYPE_ARMV7M ); +object_initialize_child (OBJECT (&s->cluster[i]), name, &s->armv7m[i], +TYPE_ARMV7M );qdev_prop_set_string (DEVICE (&s->armv7m[i]),"cpu-type" ,ARM_CPU_TYPE_NAME ("cortex-m33" ));g_free (name);
@@ -308,31 +307,26 @@ static void armsse_init(Object *obj)object_initialize_child (obj,"armsse-sysinfo" , &s->sysinfo,TYPE_IOTKIT_SYSINFO );if (info->has_mhus) { -sysbus_init_child_obj (obj,"mhu0" , &s->mhu[0 ],sizeof (s->mhu[0 ]), -TYPE_ARMSSE_MHU ); -sysbus_init_child_obj (obj,"mhu1" , &s->mhu[1 ],sizeof (s->mhu[1 ]), -TYPE_ARMSSE_MHU ); +object_initialize_child (obj,"mhu0" , &s->mhu[0 ],TYPE_ARMSSE_MHU ); +object_initialize_child (obj,"mhu1" , &s->mhu[1 ],TYPE_ARMSSE_MHU ); }if (info->has_ppus) {for (i =0 ; i < info->num_cpus; i++) {char *name =g_strdup_printf ("CPU%dCORE_PPU" , i);int ppuidx =CPU0CORE_PPU + i; -sysbus_init_child_obj (obj, name, &s->ppu[ppuidx], -sizeof (s->ppu[ppuidx]), -TYPE_UNIMPLEMENTED_DEVICE ); +object_initialize_child (obj, name, &s->ppu[ppuidx], +TYPE_UNIMPLEMENTED_DEVICE );g_free (name); } -sysbus_init_child_obj (obj,"DBG_PPU" , &s->ppu[DBG_PPU ], -sizeof (s->ppu[DBG_PPU ]), -TYPE_UNIMPLEMENTED_DEVICE ); +object_initialize_child (obj,"DBG_PPU" , &s->ppu[DBG_PPU ], +TYPE_UNIMPLEMENTED_DEVICE );for (i =0 ; i < info->sram_banks; i++) {char *name =g_strdup_printf ("RAM%d_PPU" , i);int ppuidx =RAM0_PPU + i; -sysbus_init_child_obj (obj, name, &s->ppu[ppuidx], -sizeof (s->ppu[ppuidx]), -TYPE_UNIMPLEMENTED_DEVICE ); +object_initialize_child (obj, name, &s->ppu[ppuidx], +TYPE_UNIMPLEMENTED_DEVICE );g_free (name); } }
@@ -428,7 +422,7 @@ static void map_ppu(ARMSSE *s, int ppuidx, const char *name, hwaddr addr)qdev_prop_set_string (dev,"name" , name);qdev_prop_set_uint64 (dev,"size" ,0x1000 ); -qdev_init_nofail (dev); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (&s->ppu[ppuidx]),0 , addr); }
@@ -579,7 +573,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)error_propagate (errp, err);return ; } -object_property_set_bool (cpuobj, true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (cpuobj), &err);if (err) {error_propagate (errp, err);return ;
@@ -815,8 +809,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)int cpunum;SysBusDevice *mhu_sbd =SYS_BUS_DEVICE (&s->mhu[i]); -object_property_set_bool (OBJECT (&s->mhu[i]), true, -"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->mhu[i]), &err);if (err) {error_propagate (errp, err);return ;
hw/arm/armv7m.c +3 -3
@@ -141,8 +141,8 @@ static void armv7m_instance_init(Object *obj) OBJECT(&s->nvic), "num-irq");for (i =0 ; i <ARRAY_SIZE (s->bitband); i++) { -sysbus_init_child_obj (obj,"bitband[*]" , &s->bitband[i], -sizeof (s->bitband[i]),TYPE_BITBAND ); +object_initialize_child (obj,"bitband[*]" , &s->bitband[i], +TYPE_BITBAND ); } }
@@ -257,7 +257,7 @@ static void armv7m_realize(DeviceState *dev, Error **errp) }object_property_set_link (obj,OBJECT (s->board_memory),"source-memory" , &error_abort); -object_property_set_bool (obj, true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (obj), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
hw/arm/microbit.c +6 -6
@@ -39,21 +39,21 @@ static void microbit_init(MachineState *machine)Object *soc =OBJECT (&s->nrf51);Object *i2c =OBJECT (&s->i2c); -sysbus_init_child_obj (OBJECT (machine),"nrf51" , &s->nrf51,sizeof (s->nrf51), -TYPE_NRF51_SOC ); +object_initialize_child (OBJECT (machine),"nrf51" , &s->nrf51, +TYPE_NRF51_SOC );qdev_prop_set_chr (DEVICE (&s->nrf51),"serial0" ,serial_hd (0 ));object_property_set_link (soc,OBJECT (system_memory),"memory" , &error_fatal); -object_property_set_bool (soc, true,"realized" , &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (soc), &error_fatal);/* * Overlap the TWI stub device into the SoC. This is a microbit-specific * hack until we implement the nRF51 TWI controller properly and the * magnetometer/accelerometer devices. */ -sysbus_init_child_obj (OBJECT (machine),"microbit.twi" , &s->i2c, -sizeof (s->i2c),TYPE_MICROBIT_I2C ); -object_property_set_bool (i2c, true,"realized" , &error_fatal); +object_initialize_child (OBJECT (machine),"microbit.twi" , &s->i2c, +TYPE_MICROBIT_I2C ); +sysbus_realize (SYS_BUS_DEVICE (i2c), &error_fatal); mr =sysbus_mmio_get_region (SYS_BUS_DEVICE (i2c),0 );memory_region_add_subregion_overlap (&s->nrf51.container,NRF51_TWI_BASE , mr,-1 );
hw/arm/xlnx-versal.c +3 -3
@@ -238,10 +238,10 @@ static void versal_create_rtc(Versal *s, qemu_irq *pic)SysBusDevice *sbd;MemoryRegion *mr; -sysbus_init_child_obj (OBJECT (s),"rtc" , &s->pmc.rtc,sizeof (s->pmc.rtc), -TYPE_XLNX_ZYNQMP_RTC ); +object_initialize_child (OBJECT (s),"rtc" , &s->pmc.rtc, +TYPE_XLNX_ZYNQMP_RTC ); sbd =SYS_BUS_DEVICE (&s->pmc.rtc); -qdev_init_nofail (DEVICE (sbd)); +sysbus_realize (SYS_BUS_DEVICE (sbd), &error_fatal); mr =sysbus_mmio_get_region (sbd,0 );memory_region_add_subregion (&s->mr_ps,MM_PMC_RTC , mr);
hw/arm/xlnx-zynqmp.c +3 -3
@@ -251,8 +251,8 @@ static void xlnx_zynqmp_init(Object *obj)object_initialize_child (obj,"sata" , &s->sata,TYPE_SYSBUS_AHCI );for (i =0 ; i <XLNX_ZYNQMP_NUM_SDHCI ; i++) { -sysbus_init_child_obj (obj,"sdhci[*]" , &s->sdhci[i], -sizeof (s->sdhci[i]),TYPE_SYSBUS_SDHCI ); +object_initialize_child (obj,"sdhci[*]" , &s->sdhci[i], +TYPE_SYSBUS_SDHCI ); }for (i =0 ; i <XLNX_ZYNQMP_NUM_SPIS ; i++) {
@@ -530,7 +530,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)error_propagate (errp, err);return ; } -object_property_set_bool (sdhci, true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (sdhci), &err);if (err) {error_propagate (errp, err);return ;
hw/cpu/realview_mpcore.c +2 -3
@@ -81,7 +81,7 @@ static void realview_mpcore_realize(DeviceState *dev, Error **errp) }/* ??? IRQ routing is hardcoded to "normal" mode. */ for (n =0 ; n <4 ; n++) { -object_property_set_bool (OBJECT (&s->gic[n]), true,"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->gic[n]), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -109,8 +109,7 @@ static void mpcore_rirq_init(Object *obj)sysbus_init_mmio (sbd,sysbus_mmio_get_region (privbusdev,0 ));for (i =0 ; i <4 ; i++) { -sysbus_init_child_obj (obj,"gic[*]" , &s->gic[i],sizeof (s->gic[i]), -TYPE_REALVIEW_GIC ); +object_initialize_child (obj,"gic[*]" , &s->gic[i],TYPE_REALVIEW_GIC ); } }
hw/display/sm501.c +2 -2
@@ -1977,7 +1977,7 @@ static void sm501_realize_sysbus(DeviceState *dev, Error **errp)sysbus_pass_irq (sbd,SYS_BUS_DEVICE (usb_dev));/* bridge to serial emulation module */ -qdev_init_nofail (DEVICE (&s->serial)); +sysbus_realize (SYS_BUS_DEVICE (&s->serial), &error_fatal); mr =sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->serial),0 );memory_region_add_subregion (&s->state.mmio_region,SM501_UART0 , mr);/* TODO : chain irq to IRL */
@@ -2023,7 +2023,7 @@ static void sm501_sysbus_init(Object *o)SM501SysBusState *sm501 =SYSBUS_SM501 (o);SerialMM *smm = &sm501->serial; -sysbus_init_child_obj (o,"serial" , smm,sizeof (*smm),TYPE_SERIAL_MM ); +object_initialize_child (o,"serial" , smm,TYPE_SERIAL_MM );qdev_set_legacy_instance_id (DEVICE (smm),SM501_UART0 ,2 );qdev_prop_set_uint8 (DEVICE (smm),"regshift" ,2 );qdev_prop_set_uint8 (DEVICE (smm),"endianness" ,DEVICE_LITTLE_ENDIAN );
hw/intc/armv7m_nvic.c +3 -4
@@ -2640,8 +2640,7 @@ static void armv7m_nvic_realize(DeviceState *dev, Error **errp) s->num_prio_bits =arm_feature (&s->cpu->env,ARM_FEATURE_V7 ) ?8 :2 ; -object_property_set_bool (OBJECT (&s->systick[M_REG_NS ]), true, -"realized" , &err); +sysbus_realize (SYS_BUS_DEVICE (&s->systick[M_REG_NS ]), &err);if (err !=NULL ) {error_propagate (errp, err);return ;
@@ -2735,8 +2734,8 @@ static void armv7m_nvic_instance_init(Object *obj)NVICState *nvic =NVIC (obj);SysBusDevice *sbd =SYS_BUS_DEVICE (obj); -sysbus_init_child_obj (obj,"systick-reg-ns" , &nvic->systick[M_REG_NS ], -sizeof (nvic->systick[M_REG_NS ]),TYPE_SYSTICK ); +object_initialize_child (obj,"systick-reg-ns" , &nvic->systick[M_REG_NS ], +TYPE_SYSTICK );/* We can't initialize the secure systick here, as we don't know * yet if we need it. */
Signature · 1 line
2.26.2
PATCH RESEND v3 50/58 sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 4
In reply to Markus ArmbrusterThis is still the same transformation as in the previous commits, but here the sysbus_init_child_obj() and its matching realize in are in separate files. Fortunately, there's just one realize left to convert.
--- hw/arm/aspeed_ast2600.c | 10 ++++------ hw/arm/aspeed_soc.c | 4 ++-- hw/sd/aspeed_sdhci.c | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-)
hw/arm/aspeed_ast2600.c +4 -6
@@ -200,9 +200,8 @@ static void aspeed_soc_ast2600_init(Object *obj)/* Init sd card slot class here so that they're under the correct parent */ for (i =0 ; i <ASPEED_SDHCI_NUM_SLOTS ; ++i) { -sysbus_init_child_obj (obj,"sd-controller.sdhci[*]" , - &s->sdhci.slots[i], -sizeof (s->sdhci.slots[i]),TYPE_SYSBUS_SDHCI ); +object_initialize_child (obj,"sd-controller.sdhci[*]" , + &s->sdhci.slots[i],TYPE_SYSBUS_SDHCI ); } object_initialize_child(obj, "emmc-controller", &s->emmc,
@@ -210,9 +209,8 @@ static void aspeed_soc_ast2600_init(Object *obj)object_property_set_int (OBJECT (&s->emmc),1 ,"num-slots" , &error_abort); -sysbus_init_child_obj (obj,"emmc-controller.sdhci" , - &s->emmc.slots[0 ],sizeof (s->emmc.slots[0 ]), -TYPE_SYSBUS_SDHCI ); +object_initialize_child (obj,"emmc-controller.sdhci" , &s->emmc.slots[0 ], +TYPE_SYSBUS_SDHCI ); }/*
hw/arm/aspeed_soc.c +2 -2
@@ -208,8 +208,8 @@ static void aspeed_soc_init(Object *obj)/* Init sd card slot class here so that they're under the correct parent */ for (i =0 ; i <ASPEED_SDHCI_NUM_SLOTS ; ++i) { -sysbus_init_child_obj (obj,"sdhci[*]" , &s->sdhci.slots[i], -sizeof (s->sdhci.slots[i]),TYPE_SYSBUS_SDHCI ); +object_initialize_child (obj,"sdhci[*]" , &s->sdhci.slots[i], +TYPE_SYSBUS_SDHCI ); } }
hw/sd/aspeed_sdhci.c +1 -1
@@ -145,7 +145,7 @@ static void aspeed_sdhci_realize(DeviceState *dev, Error **errp)return ; } -object_property_set_bool (sdhci_slot, true,"realized" , &err); +sysbus_realize (sbd_slot, &err);if (err) {error_propagate (errp, err);return ;
Signature · 1 line
2.26.2
PATCH RESEND v3 51/58 sysbus: sysbus_init_child_obj() is now unused, drop
In reply to Markus Armbruster--- include/hw/sysbus.h | 17 ----------------- hw/core/sysbus.c | 8 -------- 2 files changed, 25 deletions(-)
include/hw/sysbus.h +0 -17
@@ -93,23 +93,6 @@ MemoryRegion *sysbus_address_space(SysBusDevice *dev);bool sysbus_realize (SysBusDevice *dev,Error **errp);bool sysbus_realize_and_unref (SysBusDevice *dev,Error **errp); -/** -* sysbus_init_child_obj: -* @parent: The parent object -* @childname: Used as name of the "child<>" property in the parent -* @child: A pointer to the memory to be used for the object. -* @childsize: The maximum size available at @child for the object. -* @childtype: The name of the type of the object to instantiate. -* -* This function will initialize an object and attach it to the main system -* bus. The memory for the object should have already been allocated. The -* object will then be added as child to the given parent. The returned object -* has a reference count of 1 (for the "child<...>" property from the parent), -* so the object will be finalized automatically when the parent gets removed. -*/ -void sysbus_init_child_obj (Object *parent,const char *childname,void *child, -size_t childsize,const char *childtype); -/* Call func for every dynamically created sysbus device in the system */ void foreach_dynamic_sysbus_device (FindSysbusDeviceFunc *func,void *opaque);
hw/core/sysbus.c +0 -8
@@ -355,14 +355,6 @@ BusState *sysbus_get_default(void)return main_system_bus; } -void sysbus_init_child_obj (Object *parent,const char *childname,void *child, -size_t childsize,const char *childtype) -{ -object_initialize_child_with_props (parent, childname, child, childsize, - childtype, &error_abort,NULL ); -qdev_set_parent_bus (DEVICE (child),sysbus_get_default ()); -} -static void sysbus_register_types (void ) {type_register_static (&system_bus_info);
Signature · 1 line
2.26.2
PATCH RESEND v3 52/58 microbit: Eliminate two local variables in microbit_init()
In reply to Markus Armbruster--- hw/arm/microbit.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
hw/arm/microbit.c +6 -8
@@ -36,15 +36,13 @@ static void microbit_init(MachineState *machine)MicrobitMachineState *s =MICROBIT_MACHINE (machine);MemoryRegion *system_memory =get_system_memory ();MemoryRegion *mr; -Object *soc =OBJECT (&s->nrf51); -Object *i2c =OBJECT (&s->i2c);object_initialize_child (OBJECT (machine),"nrf51" , &s->nrf51,TYPE_NRF51_SOC );qdev_prop_set_chr (DEVICE (&s->nrf51),"serial0" ,serial_hd (0 )); -object_property_set_link (soc,OBJECT (system_memory),"memory" , - &error_fatal); -sysbus_realize (SYS_BUS_DEVICE (soc), &error_fatal); +object_property_set_link (OBJECT (&s->nrf51),OBJECT (system_memory), +"memory" , &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (&s->nrf51), &error_fatal);/* * Overlap the TWI stub device into the SoC. This is a microbit-specific
@@ -53,13 +51,13 @@ static void microbit_init(MachineState *machine)*/ object_initialize_child (OBJECT (machine),"microbit.twi" , &s->i2c,TYPE_MICROBIT_I2C ); -sysbus_realize (SYS_BUS_DEVICE (i2c), &error_fatal); - mr =sysbus_mmio_get_region (SYS_BUS_DEVICE (i2c),0 ); +sysbus_realize (SYS_BUS_DEVICE (&s->i2c), &error_fatal); + mr =sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->i2c),0 );memory_region_add_subregion_overlap (&s->nrf51.container,NRF51_TWI_BASE , mr,-1 );armv7m_load_kernel (ARM_CPU (first_cpu), machine->kernel_filename, -NRF51_SOC (soc)->flash_size); + s->nrf51.flash_size); }static void microbit_machine_class_init (ObjectClass *oc,void *data)
Signature · 1 line
2.26.2
Re: [PATCH RESEND v3 52/58] microbit: Eliminate two local variables in microbit_init()
Quoted 12 lines · Markus Armbruster
Suggested-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Markus Armbruster <[email protected]>Reviewed-by Paolo Bonzini <[email protected]>--- hw/arm/microbit.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)hw/arm/microbit.c +0
-0
hw/arm/microbit.c static void microbit_init(MachineState *machine) · line 40
Quoted 5 lines
hw/arm/microbit.c +0
-2@@ -36,15 +36,13 @@ static void microbit_init(MachineState *machine)MicrobitMachineState *s =MICROBIT_MACHINE (machine);MemoryRegion *system_memory =get_system_memory ();MemoryRegion *mr; -Object *soc =OBJECT (&s->nrf51); -Object *i2c =OBJECT (&s->i2c);
Thanks for this new patch.
PATCH RESEND v3 53/58 s390x/event-facility: Simplify creation of SCLP event devices
In reply to Markus Armbrusterinit_event_facility() creates the SCLP events bus with two SCLP event devices (sclpquiesce and sclp-cpu-hotplug). It leaves the devices unrealized. A comment explains they will be realized "via the bus".
The bus's realize method sclp_events_bus_realize() indeed realizes all unrealized devices on this bus. It carries a TODO comment claiming this "has to be done in common code". No other bus realize method realizes its devices.
The common code in question is bus_set_realized(), which has a TODO comment asking for recursive realization. It's been asking for years.
The only devices sclp_events_bus_realize() will ever realize are the two init_event_facility() puts there.
Simplify as follows:
* Make the devices members of the event facility instance struct, just like the bus. object_initialize_child() is simpler than object_property_add_child() and object_unref().
* Realize them in the event facility realize method.
This is in line with how such things are done elsewhere.
--- hw/s390x/event-facility.c | 64 ++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 35 deletions(-)
hw/s390x/event-facility.c +29 -35
@@ -39,6 +39,7 @@ typedef struct SCLPEventsBus {struct SCLPEventFacility {SysBusDevice parent_obj;SCLPEventsBus sbus; +SCLPEvent quiesce, cpu_hotplug;/* guest's receive mask */ union {uint32_t receive_mask_pieces[2 ];
@@ -328,34 +329,9 @@ static void write_event_mask(SCLPEventFacility *ef, SCCB *sccb)#define TYPE_SCLP_EVENTS_BUS "s390-sclp-events-bus" -static void sclp_events_bus_realize (BusState *bus,Error **errp) -{ -Error *err =NULL ; -BusChild *kid; - -/* TODO: recursive realization has to be done in common code */ - QTAILQ_FOREACH(kid, &bus->children, sibling) { -DeviceState *dev = kid->child; - -object_property_set_bool (OBJECT (dev), true,"realized" , &err); -if (err) { -error_propagate (errp, err); -return ; - } - } -} - -static void sclp_events_bus_class_init (ObjectClass *klass,void *data) -{ -BusClass *bc =BUS_CLASS (klass); - - bc->realize = sclp_events_bus_realize; -} -static const TypeInfo sclp_events_bus_info = { .name =TYPE_SCLP_EVENTS_BUS , .parent =TYPE_BUS , - .class_init = sclp_events_bus_class_init, };static void command_handler (SCLPEventFacility *ef,SCCB *sccb,uint64_t code)
@@ -443,27 +419,44 @@ static void init_event_facility(Object *obj) {SCLPEventFacility *event_facility =EVENT_FACILITY (obj);DeviceState *sdev =DEVICE (obj); -Object *new; event_facility->mask_length =4 ; event_facility->allow_all_mask_sizes = true;object_property_add_bool (obj,"allow_all_mask_sizes" , sclp_event_get_allow_all_mask_sizes, sclp_event_set_allow_all_mask_sizes); +/* Spawn a new bus for SCLP events */ qbus_create_inplace (&event_facility->sbus,sizeof (event_facility->sbus),TYPE_SCLP_EVENTS_BUS , sdev,NULL ); - new =object_new (TYPE_SCLP_QUIESCE ); -object_property_add_child (obj,TYPE_SCLP_QUIESCE , new); -object_unref (new); -qdev_set_parent_bus (DEVICE (new),BUS (&event_facility->sbus)); +object_initialize_child (obj,TYPE_SCLP_QUIESCE , + &event_facility->quiesce, +TYPE_SCLP_QUIESCE ); - new =object_new (TYPE_SCLP_CPU_HOTPLUG ); -object_property_add_child (obj,TYPE_SCLP_CPU_HOTPLUG , new); -object_unref (new); -qdev_set_parent_bus (DEVICE (new),BUS (&event_facility->sbus)); -/* the facility will automatically realize the devices via the bus */ +object_initialize_child (obj,TYPE_SCLP_CPU_HOTPLUG , + &event_facility->cpu_hotplug, +TYPE_SCLP_CPU_HOTPLUG ); +} + +static void realize_event_facility (DeviceState *dev,Error **errp) +{ +SCLPEventFacility *event_facility =EVENT_FACILITY (dev); +Error *local_err =NULL ; + +qdev_realize (DEVICE (&event_facility->quiesce), +BUS (&event_facility->sbus), &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } +qdev_realize (DEVICE (&event_facility->cpu_hotplug), +BUS (&event_facility->sbus), &local_err); +if (local_err) { +error_propagate (errp, local_err); +qdev_unrealize (DEVICE (&event_facility->quiesce)); +return ; + } }static void reset_event_facility (DeviceState *dev)
@@ -479,6 +472,7 @@ static void init_event_facility_class(ObjectClass *klass, void *data)DeviceClass *dc =DEVICE_CLASS (sbdc);SCLPEventFacilityClass *k =EVENT_FACILITY_CLASS (dc); + dc->realize = realize_event_facility; dc->reset = reset_event_facility; dc->vmsd = &vmstate_event_facility;set_bit (DEVICE_CATEGORY_MISC , dc->categories);
Signature · 1 line
2.26.2
PATCH RESEND v3 54/58 qdev: Make qdev_realize() support bus-less devices
In reply to Markus ArmbrusterSo far, qdev_realize() supports only devices that plug into a bus:
argument @bus cannot be null. Extend it to support bus-less devices, too.
--- hw/core/qdev.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
hw/core/qdev.c +6 -3
@@ -408,7 +408,7 @@ void qdev_init_nofail(DeviceState *dev)/* * Realize @dev. * @dev must not be plugged into a bus. -* Plug @dev into @bus. This takes a reference to @dev. +* If @bus, plug @dev into @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.
@@ -418,9 +418,12 @@ bool qdev_realize(DeviceState *dev, BusState *bus, Error **errp)Error *err =NULL ;assert (!dev->realized && !dev->parent_bus); -assert (bus); -qdev_set_parent_bus (dev, bus); +if (bus) { +qdev_set_parent_bus (dev, bus); + }else { +assert (!DEVICE_GET_CLASS (dev)->bus_type); + }object_property_set_bool (OBJECT (dev), true,"realized" , &err);if (err) {
Signature · 1 line
2.26.2
PATCH RESEND v3 55/58 qdev: Use qdev_realize() in qdev_device_add()
In reply to Markus Armbruster--- qdev-monitor.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
qdev-monitor.c +2 -4
@@ -661,9 +661,7 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp) goto err_del_dev; } -if (bus) { -qdev_set_parent_bus (dev, bus); - }else if (qdev_hotplug && !qdev_get_machine_hotplug_handler (dev)) { +if (!bus && qdev_hotplug && !qdev_get_machine_hotplug_handler (dev)) {/* No bus, no machine hotplug handler --> device is not hotpluggable */ error_setg (&err,"Device '%s' can not be hotplugged on this machine" , driver);
@@ -678,7 +676,7 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp) } dev->opts = opts; -object_property_set_bool (OBJECT (dev), true,"realized" , &err); +qdev_realize (DEVICE (dev), bus, &err);if (err !=NULL ) { dev->opts =NULL ; goto err_del_dev;
Signature · 1 line
2.26.2
PATCH RESEND v3 56/58 qdev: Convert bus-less devices to qdev_realize() with Coccinelle
In reply to Markus ArmbrusterAll remaining conversions to qdev_realize() are for bus-less devices. Coccinelle script:
// only correct for bus-less @dev!
@@
expression errp;
expression dev;
@@
- qdev_init_nofail(dev);
+ qdev_realize(dev, NULL, &error_fatal);
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(dev, true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);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.
--- hw/arm/allwinner-a10.c | 2 +- hw/arm/allwinner-h3.c | 2 +- hw/arm/armsse.c | 20 ++++++--------- hw/arm/armv7m.c | 2 +- hw/arm/aspeed.c | 3 +-- hw/arm/aspeed_ast2600.c | 2 +- hw/arm/aspeed_soc.c | 2 +- hw/arm/bcm2836.c | 3 +-- hw/arm/cubieboard.c | 2 +- hw/arm/digic.c | 2 +- hw/arm/digic_boards.c | 2 +- hw/arm/exynos4210.c | 4 +-- hw/arm/fsl-imx25.c | 2 +- hw/arm/fsl-imx31.c | 2 +- hw/arm/fsl-imx6.c | 2 +- hw/arm/fsl-imx6ul.c | 3 +-- hw/arm/fsl-imx7.c | 2 +- hw/arm/highbank.c | 2 +- hw/arm/imx25_pdk.c | 2 +- hw/arm/integratorcp.c | 2 +- hw/arm/kzm.c | 2 +- hw/arm/mcimx6ul-evk.c | 2 +- hw/arm/mcimx7d-sabre.c | 2 +- hw/arm/mps2-tz.c | 9 +++---- hw/arm/mps2.c | 7 +++--- hw/arm/musca.c | 6 ++--- hw/arm/orangepi.c | 2 +- hw/arm/raspi.c | 2 +- hw/arm/realview.c | 2 +- hw/arm/sabrelite.c | 2 +- hw/arm/sbsa-ref.c | 2 +- hw/arm/stm32f205_soc.c | 2 +- hw/arm/stm32f405_soc.c | 2 +- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 2 +- hw/arm/virt.c | 2 +- hw/arm/xilinx_zynq.c | 2 +- hw/arm/xlnx-versal.c | 2 +- hw/arm/xlnx-zcu102.c | 2 +- hw/arm/xlnx-zynqmp.c | 10 +++----- hw/block/nand.c | 2 +- hw/char/serial-isa.c | 2 +- hw/char/serial-pci-multi.c | 2 +- hw/char/serial-pci.c | 2 +- hw/char/serial.c | 4 +-- hw/core/cpu.c | 2 +- hw/hyperv/hyperv.c | 2 +- hw/i386/x86.c | 2 +- hw/ide/microdrive.c | 3 ++- hw/intc/pnv_xive.c | 4 +-- hw/intc/spapr_xive.c | 4 +-- hw/intc/xics.c | 2 +- hw/intc/xive.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 2 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- hw/microblaze/xlnx-zynqmp-pmu.c | 4 +-- hw/pci-host/pnv_phb3.c | 6 ++--- hw/pci-host/pnv_phb4.c | 2 +- hw/pci-host/pnv_phb4_pec.c | 2 +- hw/pci-host/prep.c | 3 +-- hw/ppc/pnv.c | 32 ++++++++++-------------- hw/ppc/pnv_bmc.c | 2 +- hw/ppc/pnv_core.c | 2 +- hw/ppc/pnv_psi.c | 4 +-- hw/ppc/spapr.c | 5 ++-- hw/ppc/spapr_cpu_core.c | 2 +- hw/ppc/spapr_drc.c | 2 +- hw/ppc/spapr_iommu.c | 2 +- hw/ppc/spapr_irq.c | 2 +- hw/riscv/opentitan.c | 3 +-- hw/riscv/riscv_hart.c | 3 +-- hw/riscv/sifive_e.c | 3 +-- hw/riscv/sifive_u.c | 9 +++---- hw/s390x/s390-skeys.c | 2 +- hw/s390x/s390-stattrib.c | 2 +- hw/s390x/s390-virtio-ccw.c | 4 +-- hw/s390x/sclp.c | 2 +- hw/s390x/tod.c | 2 +- target/i386/cpu.c | 3 +-- tests/test-qdev-global-props.c | 9 ++++--- 80 files changed, 124 insertions(+), 152 deletions(-)
hw/arm/allwinner-a10.c +1 -1
@@ -74,7 +74,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)SysBusDevice *sysbusdev;Error *err =NULL ; -object_property_set_bool (OBJECT (&s->cpu), true,"realized" , &err); +qdev_realize (DEVICE (&s->cpu),NULL , &err);if (err !=NULL ) {error_propagate (errp, err);return ;
hw/arm/allwinner-h3.c +1 -1
@@ -250,7 +250,7 @@ static void allwinner_h3_realize(DeviceState *dev, Error **errp)qdev_prop_set_bit (DEVICE (&s->cpus[i]),"has_el2" , true);/* Mark realized */ -qdev_init_nofail (DEVICE (&s->cpus[i])); +qdev_realize (DEVICE (&s->cpus[i]),NULL , &error_fatal); }/* Generic Interrupt Controller */
hw/arm/armsse.c +8 -12
@@ -584,8 +584,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)* CPU must exist and have been parented into the cluster before * the cluster is realized. */ -object_property_set_bool (OBJECT (&s->cluster[i]), - true,"realized" , &err); +qdev_realize (DEVICE (&s->cluster[i]),NULL , &err);if (err) {error_propagate (errp, err);return ;
@@ -621,7 +620,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)error_propagate (errp, err);return ; } -object_property_set_bool (splitter, true,"realized" , &err); +qdev_realize (DEVICE (splitter),NULL , &err);if (err) {error_propagate (errp, err);return ;
@@ -677,8 +676,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)error_propagate (errp, err);return ; } -object_property_set_bool (OBJECT (&s->sec_resp_splitter), true, -"realized" , &err); +qdev_realize (DEVICE (&s->sec_resp_splitter),NULL , &err);if (err) {error_propagate (errp, err);return ;
@@ -729,8 +727,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)error_propagate (errp, err);return ; } -object_property_set_bool (OBJECT (&s->mpc_irq_orgate), true, -"realized" , &err); +qdev_realize (DEVICE (&s->mpc_irq_orgate),NULL , &err);if (err) {error_propagate (errp, err);return ;
@@ -889,8 +886,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)error_propagate (errp, err);return ; } -object_property_set_bool (OBJECT (&s->ppc_irq_orgate), true, -"realized" , &err); +qdev_realize (DEVICE (&s->ppc_irq_orgate),NULL , &err);if (err) {error_propagate (errp, err);return ;
@@ -1065,7 +1061,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)error_propagate (errp, err);return ; } -object_property_set_bool (OBJECT (&s->nmi_orgate), true,"realized" , &err); +qdev_realize (DEVICE (&s->nmi_orgate),NULL , &err);if (err) {error_propagate (errp, err);return ;
@@ -1113,7 +1109,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)error_propagate (errp, err);return ; } -object_property_set_bool (splitter, true,"realized" , &err); +qdev_realize (DEVICE (splitter),NULL , &err);if (err) {error_propagate (errp, err);return ;
@@ -1160,7 +1156,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)error_propagate (errp, err);return ; } -object_property_set_bool (OBJECT (splitter), true,"realized" , &err); +qdev_realize (DEVICE (splitter),NULL , &err);if (err) {error_propagate (errp, err);return ;
hw/arm/armv7m.c +1 -1
@@ -216,7 +216,7 @@ static void armv7m_realize(DeviceState *dev, Error **errp) s->cpu->env.nvic = &s->nvic; s->nvic.cpu = s->cpu; -object_property_set_bool (OBJECT (s->cpu), true,"realized" , &err); +qdev_realize (DEVICE (s->cpu),NULL , &err);if (err !=NULL ) {error_propagate (errp, err);return ;
hw/arm/aspeed.c +1 -2
@@ -302,8 +302,7 @@ static void aspeed_machine_init(MachineState *machine)object_property_set_int (OBJECT (&bmc->soc),ASPEED_SCU_PROT_KEY ,"hw-prot-key" , &error_abort); } -object_property_set_bool (OBJECT (&bmc->soc), true,"realized" , - &error_abort); +qdev_realize (DEVICE (&bmc->soc),NULL , &error_abort); memory_region_add_subregion(get_system_memory(), sc->memmap[ASPEED_SDRAM],
hw/arm/aspeed_ast2600.c +1 -1
@@ -259,7 +259,7 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)* is needed when using -kernel */ -object_property_set_bool (OBJECT (&s->cpu[i]), true,"realized" , &err); +qdev_realize (DEVICE (&s->cpu[i]),NULL , &err);if (err) {error_propagate (errp, err);return ;
hw/arm/aspeed_soc.c +1 -1
@@ -230,7 +230,7 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)/* CPU */ for (i =0 ; i < sc->num_cpus; i++) { -object_property_set_bool (OBJECT (&s->cpu[i]), true,"realized" , &err); +qdev_realize (DEVICE (&s->cpu[i]),NULL , &err);if (err) {error_propagate (errp, err);return ;
hw/arm/bcm2836.c +1 -2
@@ -133,8 +133,7 @@ static void bcm2836_realize(DeviceState *dev, Error **errp)return ; } -object_property_set_bool (OBJECT (&s->cpu[n].core), true, -"realized" , &err); +qdev_realize (DEVICE (&s->cpu[n].core),NULL , &err);if (err) {error_propagate (errp, err);return ;
hw/arm/cubieboard.c +1 -1
@@ -80,7 +80,7 @@ static void cubieboard_init(MachineState *machine)exit (1 ); } -object_property_set_bool (OBJECT (a10), true,"realized" , &err); +qdev_realize (DEVICE (a10),NULL , &err);if (err !=NULL ) {error_reportf_err (err,"Couldn't realize Allwinner A10: " );exit (1 );
hw/arm/digic.c +1 -1
@@ -62,7 +62,7 @@ static void digic_realize(DeviceState *dev, Error **errp)return ; } -object_property_set_bool (OBJECT (&s->cpu), true,"realized" , &err); +qdev_realize (DEVICE (&s->cpu),NULL , &err);if (err !=NULL ) {error_propagate (errp, err);return ;
hw/arm/digic_boards.c +1 -1
@@ -62,7 +62,7 @@ static void digic4_board_init(MachineState *machine, DigicBoard *board)exit (EXIT_FAILURE ); } -object_property_set_bool (OBJECT (s), true,"realized" , &err); +qdev_realize (DEVICE (s),NULL , &err);if (err !=NULL ) {error_reportf_err (err,"Couldn't realize DIGIC SoC: " );exit (1 );
hw/arm/exynos4210.c +2 -2
@@ -190,7 +190,7 @@ static DeviceState *pl330_create(uint32_t base, qemu_or_irq *orgate,object_property_set_int (OBJECT (orgate), nevents +1 ,"num-lines" , &error_abort); -object_property_set_bool (OBJECT (orgate), true,"realized" , &error_abort); +qdev_realize (DEVICE (orgate),NULL , &error_abort);for (i =0 ; i < nevents +1 ; i++) {sysbus_connect_irq (busdev, i,qdev_get_gpio_in (DEVICE (orgate), i));
@@ -223,7 +223,7 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) "mp-affinity", &error_abort);object_property_set_int (cpuobj,EXYNOS4210_SMP_PRIVATE_BASE_ADDR ,"reset-cbar" , &error_abort); -object_property_set_bool (cpuobj, true,"realized" , &error_fatal); +qdev_realize (DEVICE (cpuobj),NULL , &error_fatal); }/*** IRQs ***/
hw/arm/fsl-imx25.c +1 -1
@@ -85,7 +85,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp)uint8_t i;Error *err =NULL ; -object_property_set_bool (OBJECT (&s->cpu), true,"realized" , &err); +qdev_realize (DEVICE (&s->cpu),NULL , &err);if (err) {error_propagate (errp, err);return ;
hw/arm/fsl-imx31.c +1 -1
@@ -66,7 +66,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp)uint16_t i;Error *err =NULL ; -object_property_set_bool (OBJECT (&s->cpu), true,"realized" , &err); +qdev_realize (DEVICE (&s->cpu),NULL , &err);if (err) {error_propagate (errp, err);return ;
hw/arm/fsl-imx6.c +1 -1
@@ -130,7 +130,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) "start-powered-off", &error_abort); } -object_property_set_bool (OBJECT (&s->cpu[i]), true,"realized" , &err); +qdev_realize (DEVICE (&s->cpu[i]),NULL , &err);if (err) {error_propagate (errp, err);return ;
hw/arm/fsl-imx6ul.c +1 -2
@@ -168,8 +168,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)object_property_set_int (OBJECT (&s->cpu),QEMU_PSCI_CONDUIT_SMC ,"psci-conduit" , &error_abort); -object_property_set_bool (OBJECT (&s->cpu), true, -"realized" , &error_abort); +qdev_realize (DEVICE (&s->cpu),NULL , &error_abort);/* * A7MPCORE
hw/arm/fsl-imx7.c +1 -1
@@ -174,7 +174,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp) "start-powered-off", &error_abort); } -object_property_set_bool (o, true,"realized" , &error_abort); +qdev_realize (DEVICE (o),NULL , &error_abort); }/*
hw/arm/highbank.c +1 -1
@@ -280,7 +280,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)object_property_set_int (cpuobj,MPCORE_PERIPHBASE ,"reset-cbar" , &error_abort); } -object_property_set_bool (cpuobj, true,"realized" , &error_fatal); +qdev_realize (DEVICE (cpuobj),NULL , &error_fatal); cpu_irq[n] =qdev_get_gpio_in (DEVICE (cpu),ARM_CPU_IRQ ); cpu_fiq[n] =qdev_get_gpio_in (DEVICE (cpu),ARM_CPU_FIQ ); cpu_virq[n] =qdev_get_gpio_in (DEVICE (cpu),ARM_CPU_VIRQ );
hw/arm/imx25_pdk.c +1 -1
@@ -75,7 +75,7 @@ static void imx25_pdk_init(MachineState *machine)object_initialize_child (OBJECT (machine),"soc" , &s->soc,TYPE_FSL_IMX25 ); -object_property_set_bool (OBJECT (&s->soc), true,"realized" , &error_fatal); +qdev_realize (DEVICE (&s->soc),NULL , &error_fatal);/* We need to initialize our memory */ if (machine->ram_size > (FSL_IMX25_SDRAM0_SIZE +FSL_IMX25_SDRAM1_SIZE )) {
hw/arm/integratorcp.c +1 -1
@@ -607,7 +607,7 @@ static void integratorcp_init(MachineState *machine)object_property_set_bool (cpuobj, false,"has_el3" , &error_fatal); } -object_property_set_bool (cpuobj, true,"realized" , &error_fatal); +qdev_realize (DEVICE (cpuobj),NULL , &error_fatal); cpu =ARM_CPU (cpuobj);
hw/arm/kzm.c +1 -1
@@ -73,7 +73,7 @@ static void kzm_init(MachineState *machine)object_initialize_child (OBJECT (machine),"soc" , &s->soc,TYPE_FSL_IMX31 ); -object_property_set_bool (OBJECT (&s->soc), true,"realized" , &error_fatal); +qdev_realize (DEVICE (&s->soc),NULL , &error_fatal);/* Check the amount of memory is compatible with the SOC */ if (machine->ram_size > (FSL_IMX31_SDRAM0_SIZE +FSL_IMX31_SDRAM1_SIZE )) {
hw/arm/mcimx6ul-evk.c +1 -1
@@ -40,7 +40,7 @@ static void mcimx6ul_evk_init(MachineState *machine) s =FSL_IMX6UL (object_new (TYPE_FSL_IMX6UL ));object_property_add_child (OBJECT (machine),"soc" ,OBJECT (s)); -object_property_set_bool (OBJECT (s), true,"realized" , &error_fatal); +qdev_realize (DEVICE (s),NULL , &error_fatal);memory_region_add_subregion (get_system_memory (),FSL_IMX6UL_MMDC_ADDR , machine->ram);
hw/arm/mcimx7d-sabre.c +1 -1
@@ -42,7 +42,7 @@ static void mcimx7d_sabre_init(MachineState *machine) s =FSL_IMX7 (object_new (TYPE_FSL_IMX7 ));object_property_add_child (OBJECT (machine),"soc" ,OBJECT (s)); -object_property_set_bool (OBJECT (s), true,"realized" , &error_fatal); +qdev_realize (DEVICE (s),NULL , &error_fatal);memory_region_add_subregion (get_system_memory (),FSL_IMX7_MMDC_ADDR , machine->ram);
hw/arm/mps2-tz.c +3 -6
@@ -414,8 +414,7 @@ static void mps2tz_common_init(MachineState *machine)object_property_set_int (OBJECT (splitter),2 ,"num-lines" , &error_fatal); -object_property_set_bool (OBJECT (splitter), true,"realized" , - &error_fatal); +qdev_realize (DEVICE (splitter),NULL , &error_fatal);qdev_connect_gpio_out (DEVICE (splitter),0 ,qdev_get_gpio_in_named (DEVICE (&mms->iotkit),"EXP_IRQ" , i));
@@ -433,8 +432,7 @@ static void mps2tz_common_init(MachineState *machine)object_property_set_int (OBJECT (&mms->sec_resp_splitter),ARRAY_SIZE (mms->ppc) +ARRAY_SIZE (mms->msc),"num-lines" , &error_fatal); -object_property_set_bool (OBJECT (&mms->sec_resp_splitter), true, -"realized" , &error_fatal); +qdev_realize (DEVICE (&mms->sec_resp_splitter),NULL , &error_fatal); dev_splitter =DEVICE (&mms->sec_resp_splitter);qdev_connect_gpio_out_named (iotkitdev,"sec_resp_cfg" ,0 ,qdev_get_gpio_in (dev_splitter,0 ));
@@ -466,8 +464,7 @@ static void mps2tz_common_init(MachineState *machine) &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, -"realized" , &error_fatal); +qdev_realize (DEVICE (&mms->uart_irq_orgate),NULL , &error_fatal);qdev_connect_gpio_out (DEVICE (&mms->uart_irq_orgate),0 ,get_sse_irq_in (mms,15 ));
hw/arm/mps2.c +3 -4
@@ -229,7 +229,7 @@ static void mps2_common_init(MachineState *machine) orgate =object_new (TYPE_OR_IRQ );object_property_set_int (orgate,6 ,"num-lines" , &error_fatal); -object_property_set_bool (orgate, true,"realized" , &error_fatal); +qdev_realize (DEVICE (orgate),NULL , &error_fatal); orgate_dev =DEVICE (orgate);qdev_connect_gpio_out (orgate_dev,0 ,qdev_get_gpio_in (armv7m,12 ));
@@ -266,7 +266,7 @@ static void mps2_common_init(MachineState *machine) orgate =object_new (TYPE_OR_IRQ );object_property_set_int (orgate,10 ,"num-lines" , &error_fatal); -object_property_set_bool (orgate, true,"realized" , &error_fatal); +qdev_realize (DEVICE (orgate),NULL , &error_fatal); orgate_dev =DEVICE (orgate);qdev_connect_gpio_out (orgate_dev,0 ,qdev_get_gpio_in (armv7m,12 ));
@@ -281,8 +281,7 @@ static void mps2_common_init(MachineState *machine) txrx_orgate =object_new (TYPE_OR_IRQ );object_property_set_int (txrx_orgate,2 ,"num-lines" , &error_fatal); -object_property_set_bool (txrx_orgate, true,"realized" , - &error_fatal); +qdev_realize (DEVICE (txrx_orgate),NULL , &error_fatal); txrx_orgate_dev =DEVICE (txrx_orgate);qdev_connect_gpio_out (txrx_orgate_dev,0 ,qdev_get_gpio_in (armv7m, uart_txrx_irqno[i]));
hw/arm/musca.c +2 -4
@@ -405,8 +405,7 @@ static void musca_init(MachineState *machine)object_property_set_int (OBJECT (splitter),2 ,"num-lines" , &error_fatal); -object_property_set_bool (OBJECT (splitter), true,"realized" , - &error_fatal); +qdev_realize (DEVICE (splitter),NULL , &error_fatal);qdev_connect_gpio_out (DEVICE (splitter),0 ,qdev_get_gpio_in_named (ssedev,"EXP_IRQ" , i)); qdev_connect_gpio_out(DEVICE(splitter), 1,
@@ -425,8 +424,7 @@ static void musca_init(MachineState *machine)object_property_set_int (OBJECT (&mms->sec_resp_splitter),ARRAY_SIZE (mms->ppc),"num-lines" , &error_fatal); -object_property_set_bool (OBJECT (&mms->sec_resp_splitter), true, -"realized" , &error_fatal); +qdev_realize (DEVICE (&mms->sec_resp_splitter),NULL , &error_fatal); dev_splitter =DEVICE (&mms->sec_resp_splitter);qdev_connect_gpio_out_named (ssedev,"sec_resp_cfg" ,0 ,qdev_get_gpio_in (dev_splitter,0 ));
hw/arm/orangepi.c +1 -1
@@ -86,7 +86,7 @@ static void orangepi_init(MachineState *machine) &error_abort);/* Mark H3 object realized */ -object_property_set_bool (OBJECT (h3), true,"realized" , &error_abort); +qdev_realize (DEVICE (h3),NULL , &error_abort);/* Retrieve SD bus */ di =drive_get_next (IF_SD );
hw/arm/raspi.c +1 -1
@@ -287,7 +287,7 @@ static void raspi_machine_init(MachineState *machine)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); -object_property_set_bool (OBJECT (&s->soc), true,"realized" , &error_abort); +qdev_realize (DEVICE (&s->soc),NULL , &error_abort);/* Create and plug in the SD cards */ di =drive_get_next (IF_SD );
hw/arm/realview.c +1 -1
@@ -114,7 +114,7 @@ static void realview_init(MachineState *machine, &error_fatal); } -object_property_set_bool (cpuobj, true,"realized" , &error_fatal); +qdev_realize (DEVICE (cpuobj),NULL , &error_fatal); cpu_irq[n] =qdev_get_gpio_in (DEVICE (cpuobj),ARM_CPU_IRQ ); }
hw/arm/sabrelite.c +1 -1
@@ -51,7 +51,7 @@ static void sabrelite_init(MachineState *machine) s =FSL_IMX6 (object_new (TYPE_FSL_IMX6 ));object_property_add_child (OBJECT (machine),"soc" ,OBJECT (s)); -object_property_set_bool (OBJECT (s), true,"realized" , &error_fatal); +qdev_realize (DEVICE (s),NULL , &error_fatal);memory_region_add_subregion (get_system_memory (),FSL_IMX6_MMDC_ADDR , machine->ram);
hw/arm/sbsa-ref.c +1 -1
@@ -680,7 +680,7 @@ static void sbsa_ref_init(MachineState *machine)object_property_set_link (cpuobj,OBJECT (secure_sysmem),"secure-memory" , &error_abort); -object_property_set_bool (cpuobj, true,"realized" , &error_fatal); +qdev_realize (DEVICE (cpuobj),NULL , &error_fatal);object_unref (cpuobj); }
hw/arm/stm32f205_soc.c +1 -1
@@ -155,7 +155,7 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp)/* ADC 1 to 3 */ object_property_set_int (OBJECT (s->adc_irqs),STM_NUM_ADCS ,"num-lines" , &err); -object_property_set_bool (OBJECT (s->adc_irqs), true,"realized" , &err); +qdev_realize (DEVICE (s->adc_irqs),NULL , &err);if (err !=NULL ) {error_propagate (errp, err);return ;
hw/arm/stm32f405_soc.c +1 -1
@@ -173,7 +173,7 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp) }object_property_set_int (OBJECT (&s->adc_irqs),STM_NUM_ADCS ,"num-lines" , &err); -object_property_set_bool (OBJECT (&s->adc_irqs), true,"realized" , &err); +qdev_realize (DEVICE (&s->adc_irqs),NULL , &err);if (err !=NULL ) {error_propagate (errp, err);return ;
hw/arm/versatilepb.c +1 -1
@@ -215,7 +215,7 @@ static void versatile_init(MachineState *machine, int board_id)object_property_set_bool (cpuobj, false,"has_el3" , &error_fatal); } -object_property_set_bool (cpuobj, true,"realized" , &error_fatal); +qdev_realize (DEVICE (cpuobj),NULL , &error_fatal); cpu =ARM_CPU (cpuobj);
hw/arm/vexpress.c +1 -1
@@ -229,7 +229,7 @@ static void init_cpus(MachineState *ms, const char *cpu_type,object_property_set_int (cpuobj, periphbase,"reset-cbar" , &error_abort); } -object_property_set_bool (cpuobj, true,"realized" , &error_fatal); +qdev_realize (DEVICE (cpuobj),NULL , &error_fatal); }/* Create the private peripheral devices (including the GIC);
hw/arm/virt.c +1 -1
@@ -1819,7 +1819,7 @@ static void machvirt_init(MachineState *machine) "secure-memory", &error_abort); } -object_property_set_bool (cpuobj, true,"realized" , &error_fatal); +qdev_realize (DEVICE (cpuobj),NULL , &error_fatal);object_unref (cpuobj); }fdt_add_timer_nodes (vms);
hw/arm/xilinx_zynq.c +1 -1
@@ -202,7 +202,7 @@ static void zynq_init(MachineState *machine) &error_fatal);object_property_set_int (OBJECT (cpu),MPCORE_PERIPHBASE ,"reset-cbar" , &error_fatal); -object_property_set_bool (OBJECT (cpu), true,"realized" , &error_fatal); +qdev_realize (DEVICE (cpu),NULL , &error_fatal);/* DDR remapped to address zero. */ memory_region_add_subregion (address_space_mem,0 , machine->ram);
hw/arm/xlnx-versal.c +1 -1
@@ -47,7 +47,7 @@ static void versal_create_apu_cpus(Versal *s) "core-count", &error_abort);object_property_set_link (obj,OBJECT (&s->fpd.apu.mr),"memory" , &error_abort); -object_property_set_bool (obj, true,"realized" , &error_fatal); +qdev_realize (DEVICE (obj),NULL , &error_fatal); } }
hw/arm/xlnx-zcu102.c +1 -1
@@ -125,7 +125,7 @@ static void xlnx_zcu102_init(MachineState *machine)object_property_set_bool (OBJECT (&s->soc), s->virt,"virtualization" , &error_fatal); -object_property_set_bool (OBJECT (&s->soc), true,"realized" , &error_fatal); +qdev_realize (DEVICE (&s->soc),NULL , &error_fatal);/* Create and plug in the SD cards */ for (i =0 ; i <XLNX_ZYNQMP_NUM_SDHCI ; i++) {
hw/arm/xlnx-zynqmp.c +4 -6
@@ -209,15 +209,14 @@ static void xlnx_zynqmp_create_rpu(MachineState *ms, XlnxZynqMPState *s,object_property_set_bool (OBJECT (&s->rpu_cpu[i]), true,"reset-hivecs" , &error_abort); -object_property_set_bool (OBJECT (&s->rpu_cpu[i]), true,"realized" , - &err); +qdev_realize (DEVICE (&s->rpu_cpu[i]),NULL , &err);if (err) {error_propagate (errp, err);return ; } } -qdev_init_nofail (DEVICE (&s->rpu_cluster)); +qdev_realize (DEVICE (&s->rpu_cluster),NULL , &error_fatal); }static void xlnx_zynqmp_init (Object *obj)
@@ -341,7 +340,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)qdev_prop_set_bit (DEVICE (&s->gic),"has-virtualization-extensions" , s->virt); -qdev_init_nofail (DEVICE (&s->apu_cluster)); +qdev_realize (DEVICE (&s->apu_cluster),NULL , &error_fatal);/* Realize APUs before realizing the GIC. KVM requires this. */ for (i =0 ; i < num_apus; i++) {
@@ -368,8 +367,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) "reset-cbar", &error_abort);object_property_set_int (OBJECT (&s->apu_cpu[i]), num_apus,"core-count" , &error_abort); -object_property_set_bool (OBJECT (&s->apu_cpu[i]), true,"realized" , - &err); +qdev_realize (DEVICE (&s->apu_cpu[i]),NULL , &err);if (err) {error_propagate (errp, err);return ;
hw/block/nand.c +1 -1
@@ -651,7 +651,7 @@ DeviceState *nand_init(BlockBackend *blk, int manf_id, int chip_id)qdev_prop_set_drive (dev,"drive" , blk, &error_fatal); } -qdev_init_nofail (dev); +qdev_realize (dev,NULL , &error_fatal);return dev; }
hw/char/serial-isa.c +1 -1
@@ -74,7 +74,7 @@ static void serial_isa_realizefn(DeviceState *dev, Error **errp) index++;isa_init_irq (isadev, &s->irq, isa->isairq); -object_property_set_bool (OBJECT (s), true,"realized" , errp); +qdev_realize (DEVICE (s),NULL , errp);qdev_set_legacy_instance_id (dev, isa->iobase,3 );memory_region_init_io (&s->io,OBJECT (isa), &serial_io_ops, s,"serial" ,8 );
hw/char/serial-pci-multi.c +1 -1
@@ -106,7 +106,7 @@ static void multi_serial_pci_realize(PCIDevice *dev, Error **errp)for (i =0 ; i < nports; i++) { s = pci->state + i; -object_property_set_bool (OBJECT (s), true,"realized" , &err); +qdev_realize (DEVICE (s),NULL , &err);if (err !=NULL ) {error_propagate (errp, err);multi_serial_pci_exit (dev);
hw/char/serial-pci.c +1 -1
@@ -49,7 +49,7 @@ static void serial_pci_realize(PCIDevice *dev, Error **errp)SerialState *s = &pci->state;Error *err =NULL ; -object_property_set_bool (OBJECT (s), true,"realized" , &err); +qdev_realize (DEVICE (s),NULL , &err);if (err !=NULL ) {error_propagate (errp, err);return ;
hw/char/serial.c +2 -2
@@ -991,7 +991,7 @@ static void serial_io_realize(DeviceState *dev, Error **errp)SerialState *s = &sio->serial;Error *local_err =NULL ; -object_property_set_bool (OBJECT (s), true,"realized" , &local_err); +qdev_realize (DEVICE (s),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1098,7 +1098,7 @@ static void serial_mm_realize(DeviceState *dev, Error **errp)SerialState *s = &smm->serial;Error *local_err =NULL ; -object_property_set_bool (OBJECT (s), true,"realized" , &local_err); +qdev_realize (DEVICE (s),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
hw/core/cpu.c +1 -1
@@ -59,7 +59,7 @@ CPUState *cpu_create(const char *typename) {Error *err =NULL ;CPUState *cpu =CPU (object_new (typename)); -object_property_set_bool (OBJECT (cpu), true,"realized" , &err); +qdev_realize (DEVICE (cpu),NULL , &err);if (err !=NULL ) {error_report_err (err);object_unref (OBJECT (cpu));
hw/hyperv/hyperv.c +1 -1
@@ -133,7 +133,7 @@ void hyperv_synic_add(CPUState *cs) synic->cs = cs;object_property_add_child (OBJECT (cs),"synic" , obj);object_unref (obj); -object_property_set_bool (obj, true,"realized" , &error_abort); +qdev_realize (DEVICE (obj),NULL , &error_abort); }void hyperv_synic_reset (CPUState *cs)
hw/i386/x86.c +1 -1
@@ -124,7 +124,7 @@ void x86_cpu_new(X86MachineState *x86ms, int64_t apic_id, Error **errp) cpu =object_new (MACHINE (x86ms)->cpu_type);object_property_set_uint (cpu, apic_id,"apic-id" , &local_err); -object_property_set_bool (cpu, true,"realized" , &local_err); +qdev_realize (DEVICE (cpu),NULL , &local_err);object_unref (cpu);error_propagate (errp, local_err);
hw/ide/microdrive.c +2 -1
@@ -26,6 +26,7 @@#include "qemu/osdep.h" #include "hw/pcmcia.h" #include "migration/vmstate.h" +#include "qapi/error.h" #include "qemu/module.h" #include "sysemu/dma.h"
@@ -560,7 +561,7 @@ PCMCIACardState *dscm1xxxx_init(DriveInfo *dinfo)MicroDriveState *md; md =MICRODRIVE (object_new (TYPE_DSCM1XXXX )); -qdev_init_nofail (DEVICE (md)); +qdev_realize (DEVICE (md),NULL , &error_fatal);if (dinfo !=NULL ) {ide_create_drive (&md->bus,0 , dinfo);
hw/intc/pnv_xive.c +2 -2
@@ -1833,7 +1833,7 @@ static void pnv_xive_realize(DeviceState *dev, Error **errp) &error_fatal);object_property_set_link (OBJECT (xsrc),OBJECT (xive),"xive" , &error_abort); -object_property_set_bool (OBJECT (xsrc), true,"realized" , &local_err); +qdev_realize (DEVICE (xsrc),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1843,7 +1843,7 @@ static void pnv_xive_realize(DeviceState *dev, Error **errp) &error_fatal);object_property_set_link (OBJECT (end_xsrc),OBJECT (xive),"xive" , &error_abort); -object_property_set_bool (OBJECT (end_xsrc), true,"realized" , &local_err); +qdev_realize (DEVICE (end_xsrc),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
hw/intc/spapr_xive.c +2 -2
@@ -312,7 +312,7 @@ static void spapr_xive_realize(DeviceState *dev, Error **errp) &error_fatal);object_property_set_link (OBJECT (xsrc),OBJECT (xive),"xive" , &error_abort); -object_property_set_bool (OBJECT (xsrc), true,"realized" , &local_err); +qdev_realize (DEVICE (xsrc),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -326,7 +326,7 @@ static void spapr_xive_realize(DeviceState *dev, Error **errp) &error_fatal);object_property_set_link (OBJECT (end_xsrc),OBJECT (xive),"xive" , &error_abort); -object_property_set_bool (OBJECT (end_xsrc), true,"realized" , &local_err); +qdev_realize (DEVICE (end_xsrc),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
hw/intc/xics.c +1 -1
@@ -384,7 +384,7 @@ Object *icp_create(Object *cpu, const char *type, XICSFabric *xi, Error **errp)object_unref (obj);object_property_set_link (obj,OBJECT (xi),ICP_PROP_XICS , &error_abort);object_property_set_link (obj, cpu,ICP_PROP_CPU , &error_abort); -object_property_set_bool (obj, true,"realized" , &local_err); +qdev_realize (DEVICE (obj),NULL , &local_err);if (local_err) {object_unparent (obj);error_propagate (errp, local_err);
hw/intc/xive.c +1 -1
@@ -765,7 +765,7 @@ Object *xive_tctx_create(Object *cpu, XivePresenter *xptr, Error **errp)object_unref (obj);object_property_set_link (obj, cpu,"cpu" , &error_abort);object_property_set_link (obj,OBJECT (xptr),"presenter" , &error_abort); -object_property_set_bool (obj, true,"realized" , &local_err); +qdev_realize (DEVICE (obj),NULL , &local_err);if (local_err) { goto error; }
hw/microblaze/petalogix_ml605_mmu.c +1 -1
@@ -91,7 +91,7 @@ petalogix_ml605_init(MachineState *machine)object_property_set_bool (OBJECT (cpu), true,"dcache-writeback" , &error_abort);object_property_set_bool (OBJECT (cpu), true,"endianness" , &error_abort); -object_property_set_bool (OBJECT (cpu), true,"realized" , &error_abort); +qdev_realize (DEVICE (cpu),NULL , &error_abort);/* Attach emulated BRAM through the LMB. */ memory_region_init_ram(phys_lmb_bram, NULL, "petalogix_ml605.lmb_bram",
hw/microblaze/petalogix_s3adsp1800_mmu.c +1 -1
@@ -71,7 +71,7 @@ petalogix_s3adsp1800_init(MachineState *machine) cpu =MICROBLAZE_CPU (object_new (TYPE_MICROBLAZE_CPU ));object_property_set_str (OBJECT (cpu),"7.10.d" ,"version" , &error_abort); -object_property_set_bool (OBJECT (cpu), true,"realized" , &error_abort); +qdev_realize (DEVICE (cpu),NULL , &error_abort);/* Attach emulated BRAM through the LMB. */ memory_region_init_ram(phys_lmb_bram, NULL,
hw/microblaze/xlnx-zynqmp-pmu.c +2 -2
@@ -96,7 +96,7 @@ static void xlnx_zynqmp_pmu_soc_realize(DeviceState *dev, Error **errp)object_property_set_str (OBJECT (&s->cpu),"8.40.b" ,"version" , &error_abort);object_property_set_uint (OBJECT (&s->cpu),0 ,"pvr" , &error_abort); -object_property_set_bool (OBJECT (&s->cpu), true,"realized" , &err); +qdev_realize (DEVICE (&s->cpu),NULL , &err);if (err) {error_propagate (errp, err);return ;
@@ -172,7 +172,7 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine)/* Create the PMU device */ object_initialize_child (OBJECT (machine),"pmu" , pmu,TYPE_XLNX_ZYNQMP_PMU_SOC ); -object_property_set_bool (OBJECT (pmu), true,"realized" , &error_fatal); +qdev_realize (DEVICE (pmu),NULL , &error_fatal);/* Load the kernel */ microblaze_load_kernel(&pmu->cpu, XLNX_ZYNQMP_PMU_RAM_ADDR,
hw/pci-host/pnv_phb3.c +3 -3
@@ -1003,7 +1003,7 @@ static void pnv_phb3_realize(DeviceState *dev, Error **errp) &error_abort);object_property_set_int (OBJECT (&phb->lsis),PNV_PHB3_NUM_LSI ,"nr-irqs" , &error_abort); -object_property_set_bool (OBJECT (&phb->lsis), true,"realized" , &local_err); +qdev_realize (DEVICE (&phb->lsis),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1022,7 +1022,7 @@ static void pnv_phb3_realize(DeviceState *dev, Error **errp) &error_abort);object_property_set_int (OBJECT (&phb->msis),PHB3_MAX_MSI ,"nr-irqs" , &error_abort); -object_property_set_bool (OBJECT (&phb->msis), true,"realized" , &local_err); +qdev_realize (DEVICE (&phb->msis),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1031,7 +1031,7 @@ static void pnv_phb3_realize(DeviceState *dev, Error **errp)/* Power Bus Common Queue */ object_property_set_link (OBJECT (&phb->pbcq),OBJECT (phb),"phb" , &error_abort); -object_property_set_bool (OBJECT (&phb->pbcq), true,"realized" , &local_err); +qdev_realize (DEVICE (&phb->pbcq),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
hw/pci-host/pnv_phb4.c +1 -1
@@ -1218,7 +1218,7 @@ static void pnv_phb4_realize(DeviceState *dev, Error **errp) }object_property_set_int (OBJECT (xsrc), nr_irqs,"nr-irqs" , &error_fatal);object_property_set_link (OBJECT (xsrc),OBJECT (phb),"xive" , &error_fatal); -object_property_set_bool (OBJECT (xsrc), true,"realized" , &local_err); +qdev_realize (DEVICE (xsrc),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
hw/pci-host/pnv_phb4_pec.c +1 -1
@@ -390,7 +390,7 @@ static void pnv_pec_realize(DeviceState *dev, Error **errp)object_property_set_int (stk_obj, i,"stack-no" , &error_abort);object_property_set_link (stk_obj,OBJECT (pec),"pec" , &error_abort); -object_property_set_bool (stk_obj, true,"realized" , &local_err); +qdev_realize (DEVICE (stk_obj),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
hw/pci-host/prep.c +1 -2
@@ -238,8 +238,7 @@ static void raven_pcihost_realizefn(DeviceState *d, Error **errp) s->or_irq =OR_IRQ (object_new (TYPE_OR_IRQ ));object_property_set_int (OBJECT (s->or_irq),PCI_NUM_PINS ,"num-lines" , &error_fatal); -object_property_set_bool (OBJECT (s->or_irq), true,"realized" , - &error_fatal); +qdev_realize (DEVICE (s->or_irq),NULL , &error_fatal);sysbus_init_irq (dev, &s->or_irq->out_irq);for (i =0 ; i <PCI_NUM_PINS ; i++) {
hw/ppc/pnv.c +13 -19
@@ -1138,7 +1138,7 @@ static void pnv_chip_power8_realize(DeviceState *dev, Error **errp) "bar", &error_fatal);object_property_set_link (OBJECT (&chip8->psi),OBJECT (chip8->xics),ICS_PROP_XICS , &error_abort); -object_property_set_bool (OBJECT (&chip8->psi), true,"realized" , &local_err); +qdev_realize (DEVICE (&chip8->psi),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1149,8 +1149,7 @@ static void pnv_chip_power8_realize(DeviceState *dev, Error **errp)/* Create LPC controller */ object_property_set_link (OBJECT (&chip8->lpc),OBJECT (&chip8->psi),"psi" , &error_abort); -object_property_set_bool (OBJECT (&chip8->lpc), true,"realized" , - &error_fatal); +qdev_realize (DEVICE (&chip8->lpc),NULL , &error_fatal);pnv_xscom_add_subregion (chip,PNV_XSCOM_LPC_BASE , &chip8->lpc.xscom_regs); chip->dt_isa_nodename = g_strdup_printf("/xscom@%" PRIx64 "/isa@%x",
@@ -1170,7 +1169,7 @@ static void pnv_chip_power8_realize(DeviceState *dev, Error **errp)/* Create the simplified OCC model */ object_property_set_link (OBJECT (&chip8->occ),OBJECT (&chip8->psi),"psi" , &error_abort); -object_property_set_bool (OBJECT (&chip8->occ), true,"realized" , &local_err); +qdev_realize (DEVICE (&chip8->occ),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1184,8 +1183,7 @@ static void pnv_chip_power8_realize(DeviceState *dev, Error **errp)/* HOMER */ object_property_set_link (OBJECT (&chip8->homer),OBJECT (chip),"chip" , &error_abort); -object_property_set_bool (OBJECT (&chip8->homer), true,"realized" , - &local_err); +qdev_realize (DEVICE (&chip8->homer),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1352,7 +1350,7 @@ static void pnv_chip_quad_realize(Pnv9Chip *chip9, Error **errp) &error_fatal, NULL);object_property_set_int (OBJECT (eq), core_id,"id" , &error_fatal); -object_property_set_bool (OBJECT (eq), true,"realized" , &error_fatal); +qdev_realize (DEVICE (eq),NULL , &error_fatal);pnv_xscom_add_subregion (chip,PNV9_XSCOM_EQ_BASE (eq->id), &eq->xscom_regs);
@@ -1384,7 +1382,7 @@ static void pnv_chip_power9_phb_realize(PnvChip *chip, Error **errp) &error_fatal);object_property_set_link (OBJECT (pec),OBJECT (get_system_memory ()),"system-memory" , &error_abort); -object_property_set_bool (OBJECT (pec), true,"realized" , &local_err); +qdev_realize (DEVICE (pec),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1480,7 +1478,7 @@ static void pnv_chip_power9_realize(DeviceState *dev, Error **errp)/* Processor Service Interface (PSI) Host Bridge */ object_property_set_int (OBJECT (&chip9->psi),PNV9_PSIHB_BASE (chip),"bar" , &error_fatal); -object_property_set_bool (OBJECT (&chip9->psi), true,"realized" , &local_err); +qdev_realize (DEVICE (&chip9->psi),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1491,7 +1489,7 @@ static void pnv_chip_power9_realize(DeviceState *dev, Error **errp)/* LPC */ object_property_set_link (OBJECT (&chip9->lpc),OBJECT (&chip9->psi),"psi" , &error_abort); -object_property_set_bool (OBJECT (&chip9->lpc), true,"realized" , &local_err); +qdev_realize (DEVICE (&chip9->lpc),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1505,7 +1503,7 @@ static void pnv_chip_power9_realize(DeviceState *dev, Error **errp)/* Create the simplified OCC model */ object_property_set_link (OBJECT (&chip9->occ),OBJECT (&chip9->psi),"psi" , &error_abort); -object_property_set_bool (OBJECT (&chip9->occ), true,"realized" , &local_err); +qdev_realize (DEVICE (&chip9->occ),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1519,8 +1517,7 @@ static void pnv_chip_power9_realize(DeviceState *dev, Error **errp)/* HOMER */ object_property_set_link (OBJECT (&chip9->homer),OBJECT (chip),"chip" , &error_abort); -object_property_set_bool (OBJECT (&chip9->homer), true,"realized" , - &local_err); +qdev_realize (DEVICE (&chip9->homer),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1602,8 +1599,7 @@ static void pnv_chip_power10_realize(DeviceState *dev, Error **errp)/* Processor Service Interface (PSI) Host Bridge */ object_property_set_int (OBJECT (&chip10->psi),PNV10_PSIHB_BASE (chip),"bar" , &error_fatal); -object_property_set_bool (OBJECT (&chip10->psi), true,"realized" , - &local_err); +qdev_realize (DEVICE (&chip10->psi),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1614,8 +1610,7 @@ static void pnv_chip_power10_realize(DeviceState *dev, Error **errp)/* LPC */ object_property_set_link (OBJECT (&chip10->lpc),OBJECT (&chip10->psi),"psi" , &error_abort); -object_property_set_bool (OBJECT (&chip10->lpc), true,"realized" , - &local_err); +qdev_realize (DEVICE (&chip10->lpc),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1734,8 +1729,7 @@ static void pnv_chip_core_realize(PnvChip *chip, Error **errp) "hrmor", &error_fatal);object_property_set_link (OBJECT (pnv_core),OBJECT (chip),"chip" , &error_abort); -object_property_set_bool (OBJECT (pnv_core), true,"realized" , - &error_fatal); +qdev_realize (DEVICE (pnv_core),NULL , &error_fatal);/* Each core has an XSCOM MMIO region */ xscom_core_base = pcc->xscom_core_base (chip, core_hwid);
hw/ppc/pnv_bmc.c +1 -1
@@ -235,7 +235,7 @@ IPMIBmc *pnv_bmc_create(PnvPnor *pnor) obj =object_new (TYPE_IPMI_BMC_SIMULATOR );object_ref (OBJECT (pnor));object_property_add_const_link (obj,"pnor" ,OBJECT (pnor)); -object_property_set_bool (obj, true,"realized" , &error_fatal); +qdev_realize (DEVICE (obj),NULL , &error_fatal);/* Install the HIOMAP protocol handlers to access the PNOR */ ipmi_sim_register_netfn(IPMI_BMC_SIMULATOR(obj), IPMI_NETFN_OEM,
hw/ppc/pnv_core.c +1 -1
@@ -173,7 +173,7 @@ static void pnv_core_cpu_realize(PnvCore *pc, PowerPCCPU *cpu, Error **errp)Error *local_err =NULL ;PnvChipClass *pcc =PNV_CHIP_GET_CLASS (pc->chip); -object_property_set_bool (OBJECT (cpu), true,"realized" , &local_err); +qdev_realize (DEVICE (cpu),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
hw/ppc/pnv_psi.c +2 -2
@@ -510,7 +510,7 @@ static void pnv_psi_power8_realize(DeviceState *dev, Error **errp)error_propagate (errp, err);return ; } -object_property_set_bool (OBJECT (ics), true,"realized" , &err); +qdev_realize (DEVICE (ics),NULL , &err);if (err) {error_propagate (errp, err);return ;
@@ -851,7 +851,7 @@ static void pnv_psi_power9_realize(DeviceState *dev, Error **errp)object_property_set_int (OBJECT (xsrc),PSIHB9_NUM_IRQS ,"nr-irqs" , &error_fatal);object_property_set_link (OBJECT (xsrc),OBJECT (psi),"xive" , &error_abort); -object_property_set_bool (OBJECT (xsrc), true,"realized" , &local_err); +qdev_realize (DEVICE (xsrc),NULL , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
hw/ppc/spapr.c +2 -3
@@ -1730,8 +1730,7 @@ static void spapr_rtc_create(SpaprMachineState *spapr)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); +qdev_realize (DEVICE (&spapr->rtc),NULL , &error_fatal);object_property_add_alias (OBJECT (spapr),"rtc-time" ,OBJECT (&spapr->rtc),"date" ); }
@@ -2629,7 +2628,7 @@ static void spapr_init_cpus(SpaprMachineState *spapr) &error_fatal);object_property_set_int (core, core_id,CPU_CORE_PROP_CORE_ID , &error_fatal); -object_property_set_bool (core, true,"realized" , &error_fatal); +qdev_realize (DEVICE (core),NULL , &error_fatal);object_unref (core); }
hw/ppc/spapr_cpu_core.c +1 -1
@@ -239,7 +239,7 @@ static void spapr_realize_vcpu(PowerPCCPU *cpu, SpaprMachineState *spapr,CPUState *cs =CPU (cpu);Error *local_err =NULL ; -object_property_set_bool (OBJECT (cpu), true,"realized" , &local_err); +qdev_realize (DEVICE (cpu),NULL , &local_err);if (local_err) { goto error; }
hw/ppc/spapr_drc.c +1 -1
@@ -567,7 +567,7 @@ SpaprDrc *spapr_dr_connector_new(Object *owner, const char *type, spapr_drc_index(drc));object_property_add_child (owner, prop_name,OBJECT (drc));object_unref (OBJECT (drc)); -object_property_set_bool (OBJECT (drc), true,"realized" ,NULL ); +qdev_realize (DEVICE (drc),NULL ,NULL );g_free (prop_name);return drc;
hw/ppc/spapr_iommu.c +1 -1
@@ -369,7 +369,7 @@ SpaprTceTable *spapr_tce_new_table(DeviceState *owner, uint32_t liobn)g_free (tmp);object_unref (OBJECT (tcet)); -object_property_set_bool (OBJECT (tcet), true,"realized" ,NULL ); +qdev_realize (DEVICE (tcet),NULL ,NULL );return tcet; }
hw/ppc/spapr_irq.c +1 -1
@@ -311,7 +311,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)object_property_set_link (obj,OBJECT (spapr),ICS_PROP_XICS , &error_abort);object_property_set_int (obj, smc->nr_xirqs,"nr-irqs" , &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 ;
hw/riscv/opentitan.c +1 -2
@@ -61,8 +61,7 @@ static void riscv_opentitan_init(MachineState *machine)/* Initialize SoC */ object_initialize_child (OBJECT (machine),"soc" , &s->soc,TYPE_RISCV_IBEX_SOC ); -object_property_set_bool (OBJECT (&s->soc), true,"realized" , - &error_abort); +qdev_realize (DEVICE (&s->soc),NULL , &error_abort);memory_region_init_ram (main_mem,NULL ,"riscv.lowrisc.ibex.ram" , memmap[IBEX_RAM ].size, &error_fatal);
hw/riscv/riscv_hart.c +1 -2
@@ -48,8 +48,7 @@ static void riscv_hart_realize(RISCVHartArrayState *s, int idx,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, -"realized" , &err); +qdev_realize (DEVICE (&s->harts[idx]),NULL , &err);if (err) {error_propagate (errp, err);return ;
hw/riscv/sifive_e.c +1 -2
@@ -86,8 +86,7 @@ static void riscv_sifive_e_init(MachineState *machine)/* Initialize SoC */ object_initialize_child (OBJECT (machine),"soc" , &s->soc,TYPE_RISCV_E_SOC ); -object_property_set_bool (OBJECT (&s->soc), true,"realized" , - &error_abort); +qdev_realize (DEVICE (&s->soc),NULL , &error_abort);/* Data Tightly Integrated Memory */ memory_region_init_ram(main_mem, NULL, "riscv.sifive.e.ram",
hw/riscv/sifive_u.c +3 -6
@@ -331,8 +331,7 @@ static void sifive_u_machine_init(MachineState *machine)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" , - &error_abort); +qdev_realize (DEVICE (&s->soc),NULL , &error_abort);/* register RAM */ memory_region_init_ram(main_mem, NULL, "riscv.sifive.u.ram",
@@ -530,10 +529,8 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp)* CPU must exist and have been parented into the cluster before the * cluster is realized. */ -object_property_set_bool (OBJECT (&s->e_cluster), true,"realized" , - &error_abort); -object_property_set_bool (OBJECT (&s->u_cluster), true,"realized" , - &error_abort); +qdev_realize (DEVICE (&s->e_cluster),NULL , &error_abort); +qdev_realize (DEVICE (&s->u_cluster),NULL , &error_abort);/* boot rom */ memory_region_init_rom(mask_rom, OBJECT(dev), "riscv.sifive.u.mrom",
hw/s390x/s390-skeys.c +1 -1
@@ -48,7 +48,7 @@ void s390_skeys_init(void) obj);object_unref (obj); -qdev_init_nofail (DEVICE (obj)); +qdev_realize (DEVICE (obj),NULL , &error_fatal); } static void write_keys(FILE *f, uint8_t *keys, uint64_t startgfn,
hw/s390x/s390-stattrib.c +1 -1
@@ -50,7 +50,7 @@ void s390_stattrib_init(void) obj);object_unref (obj); -qdev_init_nofail (DEVICE (obj)); +qdev_realize (DEVICE (obj),NULL , &error_fatal); }/* Console commands: */
hw/s390x/s390-virtio-ccw.c +2 -2
@@ -75,7 +75,7 @@ static S390CPU *s390x_new_cpu(const char *typename, uint32_t core_id,if (err !=NULL ) { goto out; } -object_property_set_bool (OBJECT (cpu), true,"realized" , &err); +qdev_realize (DEVICE (cpu),NULL , &err); out:object_unref (OBJECT (cpu));
@@ -210,7 +210,7 @@ static void s390_init_ipl_dev(const char *kernel_filename,object_property_add_child (qdev_get_machine (),TYPE_S390_IPL , new);object_unref (new); -qdev_init_nofail (dev); +qdev_realize (dev,NULL , &error_fatal); }static void s390_create_virtio_net (BusState *bus,const char *name)
hw/s390x/sclp.c +1 -1
@@ -322,7 +322,7 @@ void s390_sclp_init(void)object_property_add_child (qdev_get_machine (),TYPE_SCLP , new);object_unref (new); -qdev_init_nofail (DEVICE (new)); +qdev_realize (DEVICE (new),NULL , &error_fatal); }static void sclp_realize (DeviceState *dev,Error **errp)
hw/s390x/tod.c +1 -1
@@ -29,7 +29,7 @@ void s390_init_tod(void)object_property_add_child (qdev_get_machine (),TYPE_S390_TOD , obj);object_unref (obj); -qdev_init_nofail (DEVICE (obj)); +qdev_realize (DEVICE (obj),NULL , &error_fatal); }S390TODState *s390_get_todstate (void )
target/i386/cpu.c +1 -2
@@ -6135,8 +6135,7 @@ static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp)if (cpu->apic_state ==NULL ) {return ; } -object_property_set_bool (OBJECT (cpu->apic_state), true,"realized" , - errp); +qdev_realize (DEVICE (cpu->apic_state),NULL , errp);/* Map APIC MMIO area */ apic =APIC_COMMON (cpu->apic_state);
tests/test-qdev-global-props.c +5 -4
@@ -26,6 +26,7 @@#include "hw/qdev-properties.h" #include "qom/object.h" +#include "qapi/error.h" #include "qapi/visitor.h"
@@ -76,7 +77,7 @@ static void test_static_prop_subprocess(void)MyType *mt; mt =STATIC_TYPE (object_new (TYPE_STATIC_PROPS )); -qdev_init_nofail (DEVICE (mt)); +qdev_realize (DEVICE (mt),NULL , &error_fatal); g_assert_cmpuint(mt->prop1, ==, PROP_DEFAULT); }
@@ -111,7 +112,7 @@ static void test_static_globalprop_subprocess(void)register_global_properties (props); mt =STATIC_TYPE (object_new (TYPE_STATIC_PROPS )); -qdev_init_nofail (DEVICE (mt)); +qdev_realize (DEVICE (mt),NULL , &error_fatal); g_assert_cmpuint(mt->prop1, ==, 200); g_assert_cmpuint(mt->prop2, ==, PROP_DEFAULT);
@@ -229,7 +230,7 @@ static void test_dynamic_globalprop_subprocess(void)register_global_properties (props); mt =DYNAMIC_TYPE (object_new (TYPE_DYNAMIC_PROPS )); -qdev_init_nofail (DEVICE (mt)); +qdev_realize (DEVICE (mt),NULL , &error_fatal); g_assert_cmpuint(mt->prop1, ==, 101); g_assert_cmpuint(mt->prop2, ==, 102);
@@ -272,7 +273,7 @@ static void test_subclass_global_props(void)register_global_properties (props); mt =STATIC_TYPE (object_new (TYPE_SUBCLASS )); -qdev_init_nofail (DEVICE (mt)); +qdev_realize (DEVICE (mt),NULL , &error_fatal); g_assert_cmpuint(mt->prop1, ==, 102); g_assert_cmpuint(mt->prop2, ==, 104);
Signature · 1 line
2.26.2
Re: [PATCH RESEND v3 56/58] qdev: Convert bus-less devices to qdev_realize() with Coccinelle
Hi Markus, Peter.
Quoted 20 lines · Markus Armbruster
All remaining conversions to
qdev_realize()are for bus-less devices. Coccinelle script:// only correct for bus-less @dev! @@ expression errp; expression dev; @@ - qdev_init_nofail(dev); + qdev_realize(dev, NULL, &error_fatal); @ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@ expression errp; expression dev; symbol true; @@ - object_property_set_bool(OBJECT(dev), true, "realized", errp); + qdev_realize(DEVICE(dev), NULL, errp);
Quoted 7 lines
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(dev, true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);Finally. Now my ealier suggestion is easier to explain:
Rename qdev_realize() -> sysbus_realize(), extracting the qdev_realize() part. qdev_realize() doesn't take a Bus argument anymore. Left for later.
Quoted 41 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]>Acked-by Alistair Francis <[email protected]>Reviewed-by Paolo Bonzini <[email protected]>--- hw/arm/allwinner-a10.c | 2 +- hw/arm/allwinner-h3.c | 2 +- hw/arm/armsse.c | 20 ++++++--------- hw/arm/armv7m.c | 2 +- hw/arm/aspeed.c | 3 +-- hw/arm/aspeed_ast2600.c | 2 +- hw/arm/aspeed_soc.c | 2 +- hw/arm/bcm2836.c | 3 +-- hw/arm/cubieboard.c | 2 +- hw/arm/digic.c | 2 +- hw/arm/digic_boards.c | 2 +- hw/arm/exynos4210.c | 4 +-- hw/arm/fsl-imx25.c | 2 +- hw/arm/fsl-imx31.c | 2 +- hw/arm/fsl-imx6.c | 2 +- hw/arm/fsl-imx6ul.c | 3 +-- hw/arm/fsl-imx7.c | 2 +- hw/arm/highbank.c | 2 +- hw/arm/imx25_pdk.c | 2 +- hw/arm/integratorcp.c | 2 +- hw/arm/kzm.c | 2 +- hw/arm/mcimx6ul-evk.c | 2 +- hw/arm/mcimx7d-sabre.c | 2 +- hw/arm/mps2-tz.c | 9 +++---- hw/arm/mps2.c | 7 +++--- hw/arm/musca.c | 6 ++--- hw/arm/orangepi.c | 2 +- hw/arm/raspi.c | 2 +- hw/arm/realview.c | 2 +- hw/arm/sabrelite.c | 2 +- hw/arm/sbsa-ref.c | 2 +- hw/arm/stm32f205_soc.c | 2 +-
Quoted 8 lines
hw/arm/stm32f405_soc.c | 2 +- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 2 +- hw/arm/virt.c | 2 +- hw/arm/xilinx_zynq.c | 2 +- hw/arm/xlnx-versal.c | 2 +- hw/arm/xlnx-zcu102.c | 2 +- hw/arm/xlnx-zynqmp.c | 10 +++-----
Peter you might want to skim at the changes (other ARM devices out of hw/arm/ involved) but to resume basically these types are not SysBusDev:
- cpu
- soc / container
- or-gate / irq-splitter
I reviewed all of them.
Next is for Markus.
Quoted 4 lines
hw/char/serial-isa.c | 2 +- hw/char/serial-pci-multi.c | 2 +- hw/char/serial-pci.c | 2 +- hw/char/serial.c | 4 +--
I need to review again hw/char/serial-isa.c, it is not clear why it is a container and not a SysBusDevice.
Quoted 1 line
hw/ide/microdrive.c | 3 ++-
I never had to look at the PCMCIA devices, they seem an unfinished attempt to plug a the devices on a bus. Maybe it is finished, but the code is not clear (and not documented). I need more time to review.
Quoted 9 lines
hw/intc/pnv_xive.c | 4 +-- hw/intc/spapr_xive.c | 4 +-- hw/intc/xics.c | 2 +- hw/intc/xive.c | 2 +- hw/pci-host/pnv_phb3.c | 6 ++--- hw/pci-host/pnv_phb4.c | 2 +- hw/pci-host/pnv_phb4_pec.c | 2 +- hw/pci-host/prep.c | 3 +-- hw/ppc/pnv.c | 32 ++++++++++--------------
Quoted 8 lines
hw/ppc/pnv_bmc.c | 2 +- hw/ppc/pnv_core.c | 2 +- hw/ppc/pnv_psi.c | 4 +-- hw/ppc/spapr.c | 5 ++-- hw/ppc/spapr_cpu_core.c | 2 +- hw/ppc/spapr_drc.c | 2 +- hw/ppc/spapr_iommu.c | 2 +- hw/ppc/spapr_irq.c | 2 +-
Wow, lot of QOM code for PPC hardware. Not all clear yet, in particular the pci-host devices. Apparently a LPC bus in the middle. Need a bit more time.
Quoted 5 lines
hw/s390x/s390-skeys.c | 2 +- hw/s390x/s390-stattrib.c | 2 +- hw/s390x/s390-virtio-ccw.c | 4 +-- hw/s390x/sclp.c | 2 +- hw/s390x/tod.c | 2 +-
Eh, odd s390x stuff. No clue, I might review it too.
Quoted 1 line
target/i386/cpu.c | 3 +--
What is this APIC stuff doing burried with TCG?...
All the rest that is elided and not commented is reviewed.
When do you plan to send a pullreq?
Regards,
Phil.
Re: [PATCH RESEND v3 56/58] qdev: Convert bus-less devices to qdev_realize() with Coccinelle
Quoted 31 lines · Philippe Mathieu-Daudé
Hi Markus, Peter.
Quoted 20 lines · Markus Armbruster
All remaining conversions to
qdev_realize()are for bus-less devices. Coccinelle script:// only correct for bus-less @dev! @@ expression errp; expression dev; @@ - qdev_init_nofail(dev); + qdev_realize(dev, NULL, &error_fatal); @ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@ expression errp; expression dev; symbol true; @@ - object_property_set_bool(OBJECT(dev), true, "realized", errp); + qdev_realize(DEVICE(dev), NULL, errp);Quoted 7 lines
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@ expression errp; expression dev; symbol true; @@ - object_property_set_bool(dev, true, "realized", errp); + qdev_realize(DEVICE(dev), NULL, errp);
Quoted 4 lines
Finally. Now my ealier suggestion is easier to explain:
Renameqdev_realize()->sysbus_realize(), extracting theqdev_realize()part.qdev_realize()doesn't take a Bus argument anymore. Left for later.
I'm still confused.
Cases:
* Devices that plug into a bus: use qdev_realize() passing that bus.
If there is a bus-specific wrapper, use that, for legibility.
In particular, use sysbus_realize() for sysbus devices plugging into the main system bus.
* Devices that don't plug into a bus: use qdev_realize() passing a null bus.
What would you like me to improve here?
Quoted 63 lines
Quoted 42 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]>Acked-by Alistair Francis <[email protected]>Reviewed-by Paolo Bonzini <[email protected]>--- hw/arm/allwinner-a10.c | 2 +- hw/arm/allwinner-h3.c | 2 +- hw/arm/armsse.c | 20 ++++++--------- hw/arm/armv7m.c | 2 +- hw/arm/aspeed.c | 3 +-- hw/arm/aspeed_ast2600.c | 2 +- hw/arm/aspeed_soc.c | 2 +- hw/arm/bcm2836.c | 3 +-- hw/arm/cubieboard.c | 2 +- hw/arm/digic.c | 2 +- hw/arm/digic_boards.c | 2 +- hw/arm/exynos4210.c | 4 +-- hw/arm/fsl-imx25.c | 2 +- hw/arm/fsl-imx31.c | 2 +- hw/arm/fsl-imx6.c | 2 +- hw/arm/fsl-imx6ul.c | 3 +-- hw/arm/fsl-imx7.c | 2 +- hw/arm/highbank.c | 2 +- hw/arm/imx25_pdk.c | 2 +- hw/arm/integratorcp.c | 2 +- hw/arm/kzm.c | 2 +- hw/arm/mcimx6ul-evk.c | 2 +- hw/arm/mcimx7d-sabre.c | 2 +- hw/arm/mps2-tz.c | 9 +++---- hw/arm/mps2.c | 7 +++--- hw/arm/musca.c | 6 ++--- hw/arm/orangepi.c | 2 +- hw/arm/raspi.c | 2 +- hw/arm/realview.c | 2 +- hw/arm/sabrelite.c | 2 +- hw/arm/sbsa-ref.c | 2 +- hw/arm/stm32f205_soc.c | 2 +-Quoted 8 lines
hw/arm/stm32f405_soc.c | 2 +- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 2 +- hw/arm/virt.c | 2 +- hw/arm/xilinx_zynq.c | 2 +- hw/arm/xlnx-versal.c | 2 +- hw/arm/xlnx-zcu102.c | 2 +- hw/arm/xlnx-zynqmp.c | 10 +++-----Peter you might want to skim at the changes (other ARM devices out of hw/arm/ involved) but to resume basically these types are not SysBusDev:
- cpu
- soc / container
- or-gate / irq-splitterI reviewed all of them.
Next is for Markus.
Quoted 7 lines
Quoted 4 lines
hw/char/serial-isa.c | 2 +- hw/char/serial-pci-multi.c | 2 +- hw/char/serial-pci.c | 2 +- hw/char/serial.c | 4 +--I need to review again
hw/char/serial-isa.c, it is not clear why it is a container and not a SysBusDevice.
TYPE_SERIAL is a bus-less TYPE_DEVICE.
TYPE_ISA_SERIAL is its adapter for the ISA bus. It contains one TYPE_SERIAL child.
TYPE_SERIAL_MM is its adapter for the sysbus pseudo-bus. It contains one TYPE_SERIAL child.
TYPE_PCI_SERIAL, "pci-serial-2x", "pci-serial-4x" are adapters for the PCI bus. They contain one, two and four TYPE_SERIAL respectively.
Exemplary use of QOM, I think.
Quoted 37 lines
Quoted 1 line
hw/ide/microdrive.c | 3 ++-I never had to look at the PCMCIA devices, they seem an unfinished attempt to plug a the devices on a bus. Maybe it is finished, but the code is not clear (and not documented). I need more time to review.
Quoted 9 lines
hw/intc/pnv_xive.c | 4 +-- hw/intc/spapr_xive.c | 4 +-- hw/intc/xics.c | 2 +- hw/intc/xive.c | 2 +- hw/pci-host/pnv_phb3.c | 6 ++--- hw/pci-host/pnv_phb4.c | 2 +- hw/pci-host/pnv_phb4_pec.c | 2 +- hw/pci-host/prep.c | 3 +-- hw/ppc/pnv.c | 32 ++++++++++--------------Quoted 8 lines
hw/ppc/pnv_bmc.c | 2 +- hw/ppc/pnv_core.c | 2 +- hw/ppc/pnv_psi.c | 4 +-- hw/ppc/spapr.c | 5 ++-- hw/ppc/spapr_cpu_core.c | 2 +- hw/ppc/spapr_drc.c | 2 +- hw/ppc/spapr_iommu.c | 2 +- hw/ppc/spapr_irq.c | 2 +-Wow, lot of QOM code for PPC hardware. Not all clear yet, in particular the pci-host devices. Apparently a LPC bus in the middle. Need a bit more time.
Quoted 5 lines
hw/s390x/s390-skeys.c | 2 +- hw/s390x/s390-stattrib.c | 2 +- hw/s390x/s390-virtio-ccw.c | 4 +-- hw/s390x/sclp.c | 2 +- hw/s390x/tod.c | 2 +-Eh, odd s390x stuff. No clue, I might review it too.
Quoted 7 lines
Quoted 1 line
target/i386/cpu.c | 3 +--What is this APIC stuff doing burried with TCG?...
All the rest that is elided and not commented is reviewed.
When do you plan to send a pullreq?
I want to get this wrapped as quickly as possible; rebasing has been quite a time sink. But not at the price of rushed review.
Quoted 5 lines · Markus Armbruster
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.
PCI bits:
Quoted 446 lines
It is based on my "[PATCH v3 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-03 Preliminary cleanup
PATCH 04 New qdev infrastructure
Commit message explains why the current state is problematic, and how my work improves it.PATCH 05-12 Convert direct users of qdev PATCH 13-17 Convert PCI PATCH 18-21 Convert ISA PATCH 22-25 Convert SSI PATCH 26-29 Convert USB PATCH 30 Garbage collection PATCH 31-34 Convert aux-bus PATCH 35-42 Clean up around child device initialization PATCH 43-52 Convert sysbus PATCH 53 Stop pretending recursive realization is about to becomereal
PATCH 54-56 Convert bus-less devices
PATCH 57 Garbage collection
PATCH 58 MaintainMAINTAINERSEnjoy!
v3:
* Rebased; noteworthy conflicts
- PATCH 36+48+56: commitfe0fe4735e7(new machine opentitan)
- PATCH 47: commit26cd0362dd4(machines spike_v1.9.1 andspike_v1.10 are gone) - PATCH 48: commit 60bf734e64 and 3d46938bbb (new bmc2835 children) - PATCH 48: v3 of "macio: Fix to realize "mos6522-cuda" and "mos6522-pmu" devices"Puh!
* PATCH 08: Coccinelle script in commit message fixed; patch unchanged
* PATCH 19+39+50: Coding stylev2:
* Rebased
* PATCH 02+03:
Old PATCH 02 is actually a revert, replace by propert reverts [Philippe]
* PATCH 04:
- Fix pasto [Alistair]
- Rephrase qdev_realize_and_unref()'s contract [Paolo]
-qdev_realize()passes on realize error unprefixed (because prefixes can pile up)
* PATCH 08:
Drop unwanted code motion [Paolo]
* PATCH 09:
- Make the Coccinelle script safer; output unchanged [Paolo]
- Delete a Coccinelle rule that due to rebase applies just once; move its code changes (hw/char/serial.c,hw/display/ati.c, half ofhw/display/sm501.c) to the next patch
- Move changes tohw/arm/highbank.cto next patch, where they belong
* PATCH 31:
New [Philippe]
* PATCH 32:
Renameaux_realize_bus()toaux_bus_realize()[Philippe]
* PATCH 47:
&dev->parent_objdoesn't work after rebase, useSYS_BUS_DEVICE(dev)instead
* PATCH 52:
New [Philippe]
* PATCH 53:
Clean up on realize error [David]
* PATCH 54:
Don't restrictqdev_realize_and_unref()to non-null bus [Paolo][1]
Subject: Re: Infinite loop inbus_unparent(), qdev bug or qdev misuse?
Date: Mon, 4 May 2020 16:58:54 +0200
Message-ID: <[email protected]>[2]
Subject: Re: Infinite loop inbus_unparent(), qdev bug or qdev misuse?
Date: Tue, 5 May 2020 18:26:57 +0200
Message-ID: <[email protected]>Based-on: <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: Daniel P. Berrange <[email protected]>
Cc: Eduardo Habkost <[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 (58):
qdev: Renameqbus_realize()toqbus_init()
Revert "hw/prep: realize the PCI root bus as part of the prep init" Revert "hw/versatile: realize the PCI root bus as part of the
versatile init"
qdev: Newqdev_new(),qdev_realize(), etc.
qdev: Putqdev_new()to use with Coccinelle
qdev: Convert toqbus_realize(),qbus_unrealize()
qdev: Convert toqdev_unrealize()with Coccinelle
qdev: Convert toqdev_unrealize()manually
qdev: Convert uses ofqdev_create()with Coccinelle
qdev: Convert uses ofqdev_create()manually
qdev: Convert uses ofqdev_set_parent_bus()with Coccinelle
qdev: Convert uses ofqdev_set_parent_bus()manually
pci: Newpci_new(),pci_realize_and_unref()etc.
hw/ppc: Eliminate two superfluous QOM casts
pci: Convert uses ofpci_create()etc. with Coccinelle
pci: Convert uses ofpci_create()etc. manually
pci:pci_create(),pci_create_multifunction()are now unused, drop
isa: Newisa_new(),isa_realize_and_unref()etc.
isa: Convert uses ofisa_create()with Coccinelle
isa: Convert uses ofisa_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 ofssi_create_slave_no_init()with Coccinelle
ssi: Convert last use ofssi_create_slave_no_init()manually
ssi:ssi_create_slave_no_init()is now unused, drop
usb: Newusb_new(),usb_realize_and_unref()
usb: Convert uses ofusb_create()
usb:usb_create()is now unused, drop
usb: Eliminateusb_try_create_simple()
qdev:qdev_create(),qdev_try_create()are now unused, drop
auxbus: Renameaux_init_bus()toaux_bus_init()
auxbus: Newaux_bus_realize(), pairing withaux_bus_init()
auxbus: Convert a use ofqdev_set_parent_bus()
auxbus: Eliminateaux_create_slave()
qom: Tidy up a fewobject_initialize_child()calls
qom: Less verboseobject_initialize_child()
macio: Convert use ofqdev_set_parent_bus()
macio: Eliminatemacio_init_child_obj()
sysbus: Drop uselessOBJECT()insysbus_init_child_obj()calls
microbit: Tidy upsysbus_init_child_obj()@child argument
sysbus: Tidy up sysbus_init_child_obj()'s @childsize arg, part 1 hw/arm/armsse: Pass correct child size tosysbus_init_child_obj()
sysbus: Tidy up sysbus_init_child_obj()'s @childsize arg, part 2
sysbus: Newsysbus_realize(),sysbus_realize_and_unref()
sysbus: Convert tosysbus_realize()etc. with Coccinelle
qdev: Dropqdev_realize()support for null bus
sysbus: Convertqdev_set_parent_bus()use with Coccinelle, part 1
sysbus: Convertqdev_set_parent_bus()use with Coccinelle, part 2
sysbus: Convertqdev_set_parent_bus()use with Coccinelle, part 3
sysbus: Convertqdev_set_parent_bus()use with Coccinelle, part 4
sysbus:sysbus_init_child_obj()is now unused, drop
microbit: Eliminate two local variables inmicrobit_init()s390x/event-facility: Simplify creation of SCLP event devices
qdev: Makeqdev_realize()support bus-less devices
qdev: Useqdev_realize()inqdev_device_add()
qdev: Convert bus-less devices toqdev_realize()with Coccinelle
qdev:qdev_init_nofail()is now unused, drop
MAINTAINERS: Make section QOM coverhw/core/*bus.cas wellhw/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 | 18 +-- 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 | 81 +++++------ 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 | 64 ++++----- hw/arm/fsl-imx31.c | 43 +++--- 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 | 22 ++- 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 | 128 ++++++++--------- 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 | 5 +- hw/display/milkymist-tmu2.c | 4 +- hw/display/sm501.c | 13 +- hw/display/virtio-gpu-pci.c | 3 +- hw/display/virtio-vga.c | 3 +- hw/display/xlnx_dp.c | 13 +- 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 | 14 +- hw/mips/cps.c | 20 ++- hw/mips/fuloong2e.c | 6 +- hw/mips/gt64xxx_pci.c | 5 +- hw/mips/jazz.c | 16 +-- hw/mips/malta.c | 10 +- hw/mips/mipssim.c | 8 +- hw/misc/auxbus.c | 20 +-- hw/misc/mac_via.c | 14 +- hw/misc/macio/cuda.c | 8 +- hw/misc/macio/macio.c | 56 +++----- hw/misc/macio/pmu.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/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/opentitan.c | 12 +- 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 | 7 +- 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 | 64 ++++----- 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 | 9 +- MAINTAINERS | 2 + 288 files changed, 1958 insertions(+), 2378 deletions(-)Signature · 1 line
2.26.2
PATCH RESEND v3 57/58 qdev: qdev_init_nofail() is now unused, drop
In reply to Markus Armbruster--- include/hw/qdev-core.h | 3 +-- hw/core/qdev.c | 29 ----------------------------- 2 files changed, 1 insertion(+), 31 deletions(-)
include/hw/qdev-core.h +1 -2
@@ -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_realize() or qdev_init_nofail(). +* set with qdev_realize(). * 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,6 @@ compat_props_add(GPtrArray *arr,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);
hw/core/qdev.c +0 -29
@@ -376,35 +376,6 @@ void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev,qdev_unrealize (dev); } -/* -* Realize @dev. -* Device properties should be set before calling this function. IRQs -* and MMIO regions should be connected/mapped after calling this -* function. -* On failure, report an error with error_report() and terminate the -* program. This is okay during machine creation. Don't use for -* hotplug, because there callers need to recover from failure. -* Exception: if you know the device's init() callback can't fail, -* then qdev_init_nofail() can't fail either, and is therefore usable -* even then. But relying on the device implementation that way is -* somewhat unclean, and best avoided. -*/ -void qdev_init_nofail (DeviceState *dev) -{ -Error *err =NULL ; - -assert (!dev->realized); - -object_ref (OBJECT (dev)); -object_property_set_bool (OBJECT (dev), true,"realized" , &err); -if (err) { -error_reportf_err (err,"Initialization of device %s failed: " , -object_get_typename (OBJECT (dev))); -exit (1 ); - } -object_unref (OBJECT (dev)); -} -/* * Realize @dev. * @dev must not be plugged into a bus.
Signature · 1 line
2.26.2
PATCH RESEND v3 58/58 MAINTAINERS: Make section QOM cover hw/core/*bus.c as well
In reply to Markus Armbruster--- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+)
MAINTAINERS +2 -0
@@ -2289,6 +2289,8 @@ R: Eduardo Habkost <[email protected]> S: Supported F: docs/qdev-device-use.txt F: hw/core/qdev* +F: hw/core/bus.c +F: hw/core/sysbus.c F: include/hw/qdev* F: include/monitor/qdev.h F: include/qom/
Signature · 1 line
2.26.2