qom: Make composition-tree parenting mandatory
Subsystems (11)
RFC PATCH 23/134 hw/pci-host: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/pci-host to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/pci-host/articia.c:188 | OBJECT(dev) | "host-func" | articia_realize(): PCI-facing host function is composite child of the ArticiaS host bridge hw/pci-host/articia.c:191 | OBJECT(dev) | "pci-bridge" | articia_realize(): on-chip PCI bridge is composite child of the ArticiaS host bridge hw/pci-host/astro.c:524 | OBJECT(s) | "elroy[*]" | elroy_init() static helper called from astro_realize(); Elroy PCI host is composite child of the Astro chip; thread Object *parent from caller hw/pci-host/bonito.c:744 | OBJECT(machine) | "pci-host" | bonito_init() public helper called from board init (fuloong2e); thread Object *parent from caller hw/pci-host/bonito.c:750 | OBJECT(pcihost) | "pci" | PCI-facing Bonito function is composite child of the Bonito host-bridge SysBus device hw/pci-host/grackle.c:63 | OBJECT(dev) | "pci" | grackle_realize(): PCI-facing grackle function is composite child of the host bridge hw/pci-host/gt64120.c:1207 | OBJECT(dev) | "pci" | gt64120_realize(): PCI-facing GT-64120 function is composite child of the host bridge hw/pci-host/i440fx.c:285 | OBJECT(dev) | "pci" | i440fx_pcihost_realize(): i440FX PCI function is composite child of the host bridge hw/pci-host/mv64361.c:97 | OBJECT(dev) | "pci" | mv64361_pcihost_realize(): PCI-facing MV64361 bridge function is composite child of the host bridge hw/pci-host/pnv_phb.c:170 | OBJECT(dev) | "root-port" | pnv_phb_realize(): built-in PHB root port is composite child of the PnvPHB proxy device hw/pci-host/pnv_phb4_pec.c:183 | OBJECT(pec) | "phb[*]" | pnv_pec_default_phb_realize() called from pnv_pec_realize(); already parented via object_property_add_child(pec,"phb[*]",...); fold into qdev_new() hw/pci-host/ppc4xx_pci.c:335 | OBJECT(dev) | "pci" | ppc4xx_pcihost_realize(): PCI-facing 4xx host bridge function is composite child of the host bridge hw/pci-host/ppce500.c:476 | OBJECT(dev) | "pci" | e500_pcihost_realize(): PCI-facing e500 bridge function is composite child of the host bridge hw/pci-host/raven.c:284 | OBJECT(d) | "pci" | raven_pcihost_realizefn(DeviceState *d,...): PCI-facing Raven function is composite child of the host bridge hw/pci-host/sabre.c:386 | OBJECT(dev) | "pci" | sabre_realize(): PCI-facing Sabre function is composite child of the host bridge hw/pci-host/sabre.c:394 | OBJECT(dev) | "bridge-b" | sabre_realize(): on-board Simba PCI bridge B is composite child of the Sabre host bridge hw/pci-host/sabre.c:399 | OBJECT(dev) | "bridge-a" | sabre_realize(): on-board Simba PCI bridge A is composite child of the Sabre host bridge hw/pci-host/sh_pci.c:145 | OBJECT(dev) | "pci" | sh_pcic_host_realize(): PCI-facing SH host function is composite child of the host bridge hw/pci-host/uninorth.c:129 | OBJECT(dev) | "pci" | pci_unin_main_realize(): PCI-facing UniNorth function is composite child of the host bridge hw/pci-host/uninorth.c:179 | OBJECT(dev) | "pci" | pci_u3_agp_realize(): PCI-facing U3-AGP function is composite child of the host bridge hw/pci-host/uninorth.c:223 | OBJECT(dev) | "pci" | pci_unin_agp_realize(): PCI-facing UniNorth-AGP function is composite child of the host bridge hw/pci-host/uninorth.c:256 | OBJECT(dev) | "pci" | pci_unin_internal_realize(): PCI-facing internal-UniNorth function is composite child of the host bridge
--- hw/mips/fuloong2e.c | 2 +- hw/pci-host/articia.c | 6 ++++-- hw/pci-host/astro.c | 8 ++++---- hw/pci-host/bonito.c | 10 +++++----- hw/pci-host/grackle.c | 2 +- hw/pci-host/gt64120.c | 3 ++- hw/pci-host/i440fx.c | 2 +- hw/pci-host/mv64361.c | 2 +- hw/pci-host/pnv_phb.c | 5 +++-- hw/pci-host/pnv_phb4_pec.c | 3 +-- hw/pci-host/ppc4xx_pci.c | 2 +- hw/pci-host/ppce500.c | 2 +- hw/pci-host/raven.c | 3 ++- hw/pci-host/sabre.c | 12 +++++++----- hw/pci-host/sh_pci.c | 3 ++- hw/pci-host/uninorth.c | 11 +++++++---- include/hw/mips/mips.h | 2 +- 17 files changed, 44 insertions(+), 34 deletions(-)
hw/mips/fuloong2e.c +1 -1
@@ -283,7 +283,7 @@ static void mips_fuloong2e_init(MachineState *machine)cpu_mips_clock_init (cpu);/* North bridge, Bonito --> IP2 */ - pci_bus =bonito_init ((qemu_irq *)&(env->irq[2 ])); + pci_bus =bonito_init (OBJECT (machine), (qemu_irq *)&(env->irq[2 ]));/* South bridge -> IP5 */ pci_dev = pci_new_multifunction_orphan(PCI_DEVFN(FULOONG2E_VIA_SLOT, 0),
hw/pci-host/articia.c +4 -2
@@ -185,10 +185,12 @@ static void articia_realize(DeviceState *dev, Error **errp) h->bus =pci_register_root_bus (dev,NULL , articia_pcihost_set_irq, amigaone_pcihost_bus0_map_irq, dev, &s->mem, &s->io,PCI_DEVFN (8 ,0 ),4 ,TYPE_PCI_BUS ); - pdev =pci_create_simple_multifunction_orphan (h->bus,PCI_DEVFN (0 ,0 ), + pdev =pci_create_simple_multifunction (OBJECT (dev),"host-func" , h->bus, +PCI_DEVFN (0 ,0 ),TYPE_ARTICIA_PCI_HOST );ARTICIA_PCI_HOST (pdev)->as = s; -pci_create_simple_orphan (h->bus,PCI_DEVFN (0 ,1 ),TYPE_ARTICIA_PCI_BRIDGE ); +pci_create_simple (OBJECT (dev),"pci-bridge" , h->bus,PCI_DEVFN (0 ,1 ), +TYPE_ARTICIA_PCI_BRIDGE );sysbus_init_mmio (SYS_BUS_DEVICE (dev), &s->reg);sysbus_init_mmio (SYS_BUS_DEVICE (dev), &s->mem);
hw/pci-host/astro.c +4 -4
@@ -517,13 +517,13 @@ static void elroy_register_types(void)type_init (elroy_register_types) -static ElroyState *elroy_init(int num) +static ElroyState *elroy_init(Object *parent, int num) {DeviceState *dev; - dev =qdev_new_orphan (TYPE_ELROY_PCI_HOST_BRIDGE ); + dev =qdev_new (parent,"elroy[*]" ,TYPE_ELROY_PCI_HOST_BRIDGE ); dev->id =g_strdup_printf ("elroy%d" , num); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);return ELROY_PCI_HOST_BRIDGE (dev); }
@@ -1015,7 +1015,7 @@ static void astro_realize(DeviceState *obj, Error **errp) addr_offset = elroy_hpa_offsets[i]; rope = elroy_rope_nr[i]; - elroy =elroy_init (i); + elroy =elroy_init (OBJECT (s), i); s->elroy[i] = elroy; elroy->hpa =ASTRO_HPA + addr_offset; elroy->pci_bus_num = i;
hw/pci-host/bonito.c +5 -5
@@ -733,7 +733,7 @@ static void bonito_pci_realize(PCIDevice *dev, Error **errp)pci_set_byte (dev->config +PCI_MAX_LAT ,0x00 ); } -PCIBus *bonito_init (qemu_irq *pic) +PCIBus *bonito_init (Object *parent,qemu_irq *pic) {DeviceState *dev;BonitoState *pcihost;
@@ -741,17 +741,17 @@ PCIBus *bonito_init(qemu_irq *pic)PCIBonitoState *s;PCIDevice *d; - dev =qdev_new_orphan (TYPE_BONITO_PCI_HOST_BRIDGE ); + dev =qdev_new (parent,"pci-host" ,TYPE_BONITO_PCI_HOST_BRIDGE ); phb =PCI_HOST_BRIDGE (dev); pcihost =BONITO_PCI_HOST_BRIDGE (dev); pcihost->pic = pic; -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); - d =pci_new_orphan (PCI_DEVFN (0 ,0 ),TYPE_PCI_BONITO ); + d =pci_new (OBJECT (pcihost),"pci-host" ,PCI_DEVFN (0 ,0 ),TYPE_PCI_BONITO ); s =PCI_BONITO (d); s->pcihost = pcihost; pcihost->pci_dev = s; -pci_realize_and_unref (d, phb->bus, &error_fatal); +qdev_realize (DEVICE (d),BUS (phb->bus), &error_fatal);return phb->bus; }
hw/pci-host/grackle.c +1 -1
@@ -60,7 +60,7 @@ static void grackle_realize(DeviceState *dev, Error **errp) &s->pci_io, 0, 4, TYPE_PCI_BUS); -pci_create_simple_orphan (phb->bus,0 ,"grackle" ); +pci_create_simple (OBJECT (dev),"pci-host" , phb->bus,0 ,"grackle" ); }static void grackle_init (Object *obj)
hw/pci-host/gt64120.c +2 -1
@@ -1204,7 +1204,8 @@ static void gt64120_realize(DeviceState *dev, Error **errp)get_system_io (), PCI_DEVFN(18, 0), TYPE_PCI_BUS); -pci_create_simple_orphan (phb->bus,PCI_DEVFN (0 ,0 ),"gt64120_pci" ); +pci_create_simple (OBJECT (dev),"pci-host" , phb->bus,PCI_DEVFN (0 ,0 ), +"gt64120_pci" );memory_region_init_io (&phb->conf_mem,OBJECT (phb), &pci_host_conf_le_ops, s,"pci-conf-idx" ,4 );
hw/pci-host/i440fx.c +1 -1
@@ -282,7 +282,7 @@ static void i440fx_pcihost_realize(DeviceState *dev, Error **errp) s->io_memory, 0, TYPE_PCI_BUS); phb->bus = b; - d =pci_create_simple_orphan (b,0 , s->pci_type); + d =pci_create_simple (OBJECT (dev),"pci-host" , b,0 , s->pci_type); f =I440FX_PCI_DEVICE (d); range_set_bounds(&s->pci_hole, s->below_4g_mem_size,
hw/pci-host/mv64361.c +1 -1
@@ -94,7 +94,7 @@ static void mv64361_pcihost_realize(DeviceState *dev, Error **errp) pci_swizzle_map_irq_fn, dev, &s->mem, &s->io, 0, 4, TYPE_PCI_BUS);g_free (name); -pci_create_simple_orphan (h->bus,0 ,TYPE_MV64361_PCI_BRIDGE ); +pci_create_simple (OBJECT (dev),"pci-host" , h->bus,0 ,TYPE_MV64361_PCI_BRIDGE );qdev_init_gpio_out (dev, s->irq,ARRAY_SIZE (s->irq)); }
hw/pci-host/pnv_phb.c +3 -2
@@ -167,9 +167,10 @@ static void pnv_phb_realize(DeviceState *dev, Error **errp) }if (defaults_enabled ()) { -PCIDevice *root =pci_new_orphan (PCI_DEVFN (0 ,0 ),TYPE_PNV_PHB_ROOT_PORT ); +PCIDevice *root =pci_new (OBJECT (dev),"root-port" , +PCI_DEVFN (0 ,0 ),TYPE_PNV_PHB_ROOT_PORT ); -pci_realize_and_unref (root, pci->bus, errp); +qdev_realize (DEVICE (root),BUS (pci->bus), errp); } }
hw/pci-host/pnv_phb4_pec.c +1 -2
@@ -180,10 +180,9 @@ static PnvPHB *pnv_pec_default_phb_realize(PnvPhb4PecState *pec,int stack_no, Error **errp) { - PnvPHB *phb = PNV_PHB(qdev_new_orphan(TYPE_PNV_PHB)); + PnvPHB *phb = PNV_PHB(qdev_new(OBJECT(pec), "phb[*]", TYPE_PNV_PHB));int phb_id =pnv_phb4_pec_get_phb_id (pec, stack_no); -object_property_add_child (OBJECT (pec),"phb[*]" ,OBJECT (phb));object_property_set_link (OBJECT (phb),"pec" ,OBJECT (pec), &error_abort); object_property_set_int(OBJECT(phb), "chip-id", pec->chip_id,
hw/pci-host/ppc4xx_pci.c +1 -1
@@ -332,7 +332,7 @@ static void ppc4xx_pcihost_realize(DeviceState *dev, Error **errp) TYPE_PCI_BUS); h->bus = b; -pci_create_simple_orphan (b,0 , TYPE_PPC4xx_HOST_BRIDGE); +pci_create_simple (OBJECT (dev),"pci-host" , b,0 , TYPE_PPC4xx_HOST_BRIDGE);/* XXX split into 2 memory regions, one for config space, one for regs */ memory_region_init (&s->container,OBJECT (s),"pci-container" ,PCI_ALL_SIZE );
hw/pci-host/ppce500.c +1 -1
@@ -473,7 +473,7 @@ static void e500_pcihost_realize(DeviceState *dev, Error **errp)address_space_init (&s->bm_as, &s->bm,"pci-bm" );pci_setup_iommu (b, &ppce500_iommu_ops, s); -pci_create_simple_orphan (b,0 ,TYPE_PPC_E500_PCI_BRIDGE ); +pci_create_simple (OBJECT (dev),"pci-host" , b,0 ,TYPE_PPC_E500_PCI_BRIDGE );memory_region_init (&s->container,OBJECT (h),"pci-container" ,PCIE500_ALL_SIZE ); memory_region_init_io(&h->conf_mem, OBJECT(h), &pci_host_conf_be_ops, h,
hw/pci-host/raven.c +2 -1
@@ -281,7 +281,8 @@ static void raven_pcihost_realizefn(DeviceState *d, Error **errp) "pci-intack", 1);memory_region_add_subregion (address_space_mem,0xbffffff0 , &s->pci_intack); -pci_create_simple_orphan (h->bus,PCI_DEVFN (0 ,0 ),TYPE_RAVEN_PCI_DEVICE ); +pci_create_simple (OBJECT (d),"pci-host" , h->bus,PCI_DEVFN (0 ,0 ), +TYPE_RAVEN_PCI_DEVICE );address_space_init (&s->bm_as, &s->bm,"raven-bm" );pci_setup_iommu (h->bus, &raven_iommu_ops, s);
hw/pci-host/sabre.c +7 -5
@@ -383,7 +383,7 @@ static void sabre_realize(DeviceState *dev, Error **errp) &s->pci_ioport, 0, 0x40, TYPE_PCI_BUS); -pci_create_simple_orphan (phb->bus,0 ,TYPE_SABRE_PCI_DEVICE ); +pci_create_simple (OBJECT (dev),"pci-host" , phb->bus,0 ,TYPE_SABRE_PCI_DEVICE );/* IOMMU */ memory_region_add_subregion_overlap(&s->sabre_config, 0x200,
@@ -391,15 +391,17 @@ static void sabre_realize(DeviceState *dev, Error **errp)pci_setup_iommu (phb->bus, &sabre_iommu_ops, s->iommu);/* APB secondary busses */ - pci_dev =pci_new_multifunction_orphan (PCI_DEVFN (1 ,0 ),TYPE_SIMBA_PCI_BRIDGE ); + pci_dev =pci_new_multifunction (OBJECT (dev),"bridge-b" , +PCI_DEVFN (1 ,0 ),TYPE_SIMBA_PCI_BRIDGE ); s->bridgeB =PCI_BRIDGE (pci_dev);pci_bridge_map_irq (s->bridgeB,"pciB" , pci_simbaB_map_irq); -pci_realize_and_unref (pci_dev, phb->bus, &error_fatal); +qdev_realize (DEVICE (pci_dev),BUS (phb->bus), &error_fatal); - pci_dev =pci_new_multifunction_orphan (PCI_DEVFN (1 ,1 ),TYPE_SIMBA_PCI_BRIDGE ); + pci_dev =pci_new_multifunction (OBJECT (dev),"bridge-a" , +PCI_DEVFN (1 ,1 ),TYPE_SIMBA_PCI_BRIDGE ); s->bridgeA =PCI_BRIDGE (pci_dev);pci_bridge_map_irq (s->bridgeA,"pciA" , pci_simbaA_map_irq); -pci_realize_and_unref (pci_dev, phb->bus, &error_fatal); +qdev_realize (DEVICE (pci_dev),BUS (phb->bus), &error_fatal); }static void sabre_init (Object *obj)
hw/pci-host/sh_pci.c +2 -1
@@ -142,7 +142,8 @@ static void sh_pcic_host_realize(DeviceState *dev, Error **errp)sysbus_init_mmio (sbd, &s->memconfig_a7);memory_region_add_subregion (get_system_memory (),0xfe240000 , &s->isa); - s->dev =pci_create_simple_orphan (phb->bus,PCI_DEVFN (0 ,0 ),"sh_pci_host" ); + s->dev =pci_create_simple (OBJECT (dev),"pci-host" , phb->bus,PCI_DEVFN (0 ,0 ), +"sh_pci_host" ); }static void sh_pcic_pci_realize (PCIDevice *d,Error **errp)
hw/pci-host/uninorth.c +7 -4
@@ -126,7 +126,8 @@ static void pci_unin_main_realize(DeviceState *dev, Error **errp) &s->pci_io, PCI_DEVFN(11, 0), 4, TYPE_PCI_BUS); -pci_create_simple_orphan (h->bus,PCI_DEVFN (11 ,0 ),"uni-north-pci" ); +pci_create_simple (OBJECT (dev),"pci-host" , h->bus,PCI_DEVFN (11 ,0 ), +"uni-north-pci" );/* * DEC 21154 bridge was unused for many years, this comment is
@@ -176,7 +177,7 @@ static void pci_u3_agp_realize(DeviceState *dev, Error **errp) &s->pci_io, PCI_DEVFN(11, 0), 4, TYPE_PCI_BUS); -pci_create_simple_orphan (h->bus,PCI_DEVFN (11 ,0 ),"u3-agp" ); +pci_create_simple (OBJECT (dev),"pci-host" , h->bus,PCI_DEVFN (11 ,0 ),"u3-agp" ); }static void pci_u3_agp_init (Object *obj)
@@ -220,7 +221,8 @@ static void pci_unin_agp_realize(DeviceState *dev, Error **errp) &s->pci_io, PCI_DEVFN(11, 0), 4, TYPE_PCI_BUS); -pci_create_simple_orphan (h->bus,PCI_DEVFN (11 ,0 ),"uni-north-agp" ); +pci_create_simple (OBJECT (dev),"pci-host" , h->bus,PCI_DEVFN (11 ,0 ), +"uni-north-agp" ); }static void pci_unin_agp_init (Object *obj)
@@ -253,7 +255,8 @@ static void pci_unin_internal_realize(DeviceState *dev, Error **errp) &s->pci_io, PCI_DEVFN(14, 0), 4, TYPE_PCI_BUS); -pci_create_simple_orphan (h->bus,PCI_DEVFN (14 ,0 ),"uni-north-internal-pci" ); +pci_create_simple (OBJECT (dev),"pci-host" , h->bus,PCI_DEVFN (14 ,0 ), +"uni-north-internal-pci" ); }static void pci_unin_internal_init (Object *obj)
include/hw/mips/mips.h +1 -1
@@ -10,7 +10,7 @@#include "system/memory.h" /* bonito.c */ -PCIBus *bonito_init (qemu_irq *pic); +PCIBus *bonito_init (Object *parent,qemu_irq *pic);/* rc4030.c */ typedef struct rc4030DMAState *rc4030_dma ;
Signature · 1 line
2.47.1
RFC PATCH 24/134 hw/core: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/core to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/core/null-machine.c:28 | cpu_create | OBJECT(mch) | "cpu[*]" | Board init; machine owns CPU lifetime
hw/core/qdev.c:167,172 hw/core/sysbus.c:245,254 hw/core/cpu-common.c:71 | (definitions) | ORPHAN-JUSTIFIED | - | These are the *_orphan() implementations themselves
--- hw/core/null-machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/core/null-machine.c +1 -1
@@ -25,7 +25,7 @@ static void machine_none_init(MachineState *mch)/* Initialize CPU (if user asked for it) */ if (mch->cpu_type) { - cpu =cpu_create_orphan (mch->cpu_type); + cpu =cpu_create (OBJECT (mch),"cpu[*]" , mch->cpu_type);if (!cpu) {error_report ("Unable to initialize CPU" );exit (1 );
Signature · 1 line
2.47.1
RFC PATCH 25/134 hw/remote: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/remote to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/remote/machine.c:42 | qdev_new | OBJECT(s) | "remote-pcihost" | Board init; collapses existing object_property_add_child() with same name
--- hw/remote/machine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/remote/machine.c +2 -2
@@ -39,7 +39,8 @@ static void remote_machine_init(MachineState *machine) pci_memory =g_new (MemoryRegion,1 );memory_region_init (pci_memory,NULL ,"pci" ,UINT64_MAX ); - rem_host =REMOTE_PCIHOST (qdev_new_orphan (TYPE_REMOTE_PCIHOST )); + rem_host =REMOTE_PCIHOST (qdev_new (OBJECT (s),"remote-pcihost" , +TYPE_REMOTE_PCIHOST )); rem_host->mr_pci_mem = pci_memory; rem_host->mr_sys_mem = system_memory;
@@ -47,7 +48,6 @@ static void remote_machine_init(MachineState *machine) s->host = rem_host; -object_property_add_child (OBJECT (s),"remote-pcihost" ,OBJECT (rem_host));memory_region_add_subregion_overlap (system_memory,0x0 , pci_memory,-1 );qdev_realize (DEVICE (rem_host),sysbus_get_default (), &error_fatal);
Signature · 1 line
2.47.1
RFC PATCH 26/134 hw/ufs: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/ufs to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/ufs/lu.c:475 | qdev_new | OBJECT(lu) | "ufs-scsi" | ufs-lu realize path; the LU device owns the wrapped scsi-hd (bus is not parent). Re-parent from bus to lu; drop _and_unref
--- hw/ufs/lu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
hw/ufs/lu.c +2 -3
@@ -472,8 +472,7 @@ static void ufs_init_scsi_device(UfsLu *lu, BlockBackend *blk, Error **errp)* The ufs-lu is the device that is wrapping the scsi-hd. It owns a virtual * SCSI bus that serves the scsi-hd. */ - scsi_dev =qdev_new_orphan ("scsi-hd" ); -object_property_add_child (OBJECT (&lu->bus),"ufs-scsi" ,OBJECT (scsi_dev)); + scsi_dev =qdev_new (OBJECT (lu),"ufs-scsi" ,"scsi-hd" );qdev_prop_set_uint32 (scsi_dev,"physical_block_size" ,UFS_BLOCK_SIZE );qdev_prop_set_uint32 (scsi_dev,"logical_block_size" ,UFS_BLOCK_SIZE );
@@ -484,7 +483,7 @@ static void ufs_init_scsi_device(UfsLu *lu, BlockBackend *blk, Error **errp)return ; } -if (!qdev_realize_and_unref (scsi_dev, &lu->bus.qbus, errp)) { +if (!qdev_realize (scsi_dev, &lu->bus.qbus, errp)) {object_unparent (OBJECT (scsi_dev));return ; }
Signature · 1 line
2.47.1
RFC PATCH 27/134 hw/nvme: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/nvme to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/nvme/ctrl.c:9559 | qdev_new | OBJECT(n) | "subsys" | Called from nvme controller realize; the auto-created subsystem is owned by the controller that creates it
--- hw/nvme/ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/nvme/ctrl.c +1 -1
@@ -9556,7 +9556,7 @@ static int nvme_init_subsys(NvmeCtrl *n, Error **errp)int cntlid;if (!n->subsys) { -DeviceState *dev =qdev_new_orphan (TYPE_NVME_SUBSYS ); +DeviceState *dev =qdev_new (OBJECT (n),"subsys" ,TYPE_NVME_SUBSYS );qdev_prop_set_string (dev,"nqn" , n->params.serial);
Signature · 1 line
2.47.1
RFC PATCH 28/134 hw/vfio: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/vfio to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/vfio/igd.c:337 | pci_create_simple | OBJECT(vdev) | "igd-lpc-bridge" | Called from IGD quirk during vfio-pci realize; the LPC stub is created by and lives with the passed-through IGD device
--- hw/vfio/igd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
hw/vfio/igd.c +3 -2
@@ -334,8 +334,9 @@ static int vfio_pci_igd_lpc_init(VFIOPCIDevice *vdev, lpc_bridge =pci_find_device (pci_device_root_bus (pdev),0 ,PCI_DEVFN (0x1f ,0 ));if (!lpc_bridge) { - lpc_bridge =pci_create_simple_orphan (pci_device_root_bus (pdev), -PCI_DEVFN (0x1f ,0 ),"vfio-pci-igd-lpc-bridge" ); + lpc_bridge =pci_create_simple (OBJECT (vdev),"igd-lpc-bridge" , +pci_device_root_bus (pdev), +PCI_DEVFN (0x1f ,0 ),"vfio-pci-igd-lpc-bridge" ); } ret = vfio_pci_igd_copy(vdev, lpc_bridge, info, igd_lpc_bridge_infos,
Signature · 1 line
2.47.1
RFC PATCH 29/134 hw/mem: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/mem to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/mem/sparse-mem.c:111 | qdev_new | parent (new arg) | "sparse-mem" | Public helper; thread Object *parent through. Only caller is generic_fuzz which passes qdev_get_machine()
--- hw/mem/sparse-mem.c | 6 +++--- include/hw/mem/sparse-mem.h | 2 +- tests/qtest/fuzz/generic_fuzz.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
hw/mem/sparse-mem.c +3 -3
@@ -104,14 +104,14 @@ static const Property sparse_mem_properties[] = { DEFINE_PROP_UINT64("maxsize", SparseMemState, maxsize, 10 * MiB), }; -MemoryRegion *sparse_mem_init (uint64_t addr,uint64_t length) +MemoryRegion *sparse_mem_init (Object *parent,uint64_t addr,uint64_t length) {DeviceState *dev; - dev =qdev_new_orphan (TYPE_SPARSE_MEM ); + dev =qdev_new (parent,"sparse-mem" ,TYPE_SPARSE_MEM );qdev_prop_set_uint64 (dev,"baseaddr" , addr);qdev_prop_set_uint64 (dev,"length" , length); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map_overlap (SYS_BUS_DEVICE (dev),0 , addr,-10000 );return &SPARSE_MEM (dev)->mmio; }
include/hw/mem/sparse-mem.h +1 -1
@@ -14,6 +14,6 @@#define SPARSE_MEM_H #define TYPE_SPARSE_MEM "sparse-mem" -MemoryRegion *sparse_mem_init (uint64_t addr,uint64_t length); +MemoryRegion *sparse_mem_init (Object *parent,uint64_t addr,uint64_t length);#endif
tests/qtest/fuzz/generic_fuzz.c +1 -1
@@ -788,7 +788,7 @@ static void generic_pre_fuzz(QTestState *s)* Create a special device that we can use to back DMA buffers at very * high memory addresses */ - sparse_mem_mr =sparse_mem_init (0 ,UINT64_MAX ); + sparse_mem_mr =sparse_mem_init (qdev_get_machine (),0 ,UINT64_MAX ); dma_regions =g_array_new (false, false,sizeof (address_range)); dma_patterns =g_array_new (false, false,sizeof (pattern));
Signature · 1 line
2.47.1
RFC PATCH 30/134 hw/cxl: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/cxl to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/cxl/cxl-host.c:29 | qdev_new | parent (new arg) | "cxl-fmw[*]" | Property setter machine_set_cfmw() has Object *obj = machine; thread it through as parent for each fixed memory window
--- hw/cxl/cxl-host.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
hw/cxl/cxl-host.c +5 -4
@@ -22,11 +22,12 @@#include "hw/pci/pcie_port.h" #include "hw/pci-bridge/pci_expander_bridge.h" -static void cxl_fixed_memory_window_config (CXLFixedMemoryWindowOptions *object, +static void cxl_fixed_memory_window_config (Object *parent, +CXLFixedMemoryWindowOptions *object,int index,Error **errp) {ERRP_GUARD (); -DeviceState *dev =qdev_new_orphan (TYPE_CXL_FMW ); +DeviceState *dev =qdev_new (parent,"cxl-fmw[*]" ,TYPE_CXL_FMW );CXLFixedWindow *fw =CXL_FMW (dev);strList *target;int i;
@@ -67,7 +68,7 @@ static void cxl_fixed_memory_window_config(CXLFixedMemoryWindowOptions *object, fw->targets[i] =g_strdup (target->value); } -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), errp); +sysbus_realize (SYS_BUS_DEVICE (dev), errp); }static int cxl_fmws_link (Object *obj,void *opaque)
@@ -557,7 +558,7 @@ static void machine_set_cfmw(Object *obj, Visitor *v, const char *name, }for (it = cfmw_list, index =0 ; it; it = it->next, index++) { -cxl_fixed_memory_window_config (it->value, index, errp); +cxl_fixed_memory_window_config (obj, it->value, index, errp); } state->cfmw_list = cfmw_list; }
Signature · 1 line
2.47.1
RFC PATCH 31/134 hw/hexagon: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/hexagon to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/hexagon/hexagon_dsp.c:134 | qdev_new | OBJECT(machine) | "global-regs" | board init helper; collapse existing object_property_add_child() hw/hexagon/hexagon_dsp.c:141 | qdev_new | OBJECT(machine) | "tlb" | board init helper; collapse existing object_property_add_child() hw/hexagon/virt.c:132 | qdev_new | OBJECT(vms) | "uart" | board-init helper receives HexagonVirtMachineState*; drop const on vms hw/hexagon/virt.c:271 | qdev_new | OBJECT(ms) | "global-regs" | board init; collapse existing object_property_add_child() hw/hexagon/virt.c:277 | qdev_new | OBJECT(ms) | "tlb" | board init; collapse existing object_property_add_child()
--- hw/hexagon/hexagon_dsp.c | 12 +++++------- hw/hexagon/virt.c | 16 +++++++--------- 2 files changed, 12 insertions(+), 16 deletions(-)
hw/hexagon/hexagon_dsp.c +5 -7
@@ -131,18 +131,16 @@ static void hexagon_common_init(MachineState *machine, Rev_t rev, machine->ram_size, &error_fatal);memory_region_add_subregion (address_space,0x0 , &hms->ram); - glob_regs_dev =qdev_new_orphan (TYPE_HEXAGON_GLOBALREG ); -object_property_add_child (OBJECT (machine),"global-regs" , -OBJECT (glob_regs_dev)); + glob_regs_dev =qdev_new (OBJECT (machine),"global-regs" , +TYPE_HEXAGON_GLOBALREG );qdev_prop_set_uint64 (glob_regs_dev,"config-table-addr" , m_cfg->cfgbase);qdev_prop_set_uint32 (glob_regs_dev,"dsp-rev" , rev); -sysbus_realize_and_unref (SYS_BUS_DEVICE (glob_regs_dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (glob_regs_dev), &error_fatal); - tlb_dev =qdev_new_orphan (TYPE_HEXAGON_TLB ); -object_property_add_child (OBJECT (machine),"tlb" ,OBJECT (tlb_dev)); + tlb_dev =qdev_new (OBJECT (machine),"tlb" ,TYPE_HEXAGON_TLB );qdev_prop_set_uint32 (tlb_dev,"num-entries" , m_cfg->cfgtable.jtlb_size_entries); -sysbus_realize_and_unref (SYS_BUS_DEVICE (tlb_dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (tlb_dev), &error_fatal);for (int i =0 ; i < machine->smp.cpus; i++) {HexagonCPU *cpu =HEXAGON_CPU (object_new (machine->cpu_type));
hw/hexagon/virt.c +7 -9
@@ -116,7 +116,7 @@ static int32_t fdt_add_clocks(const HexagonVirtMachineState *vms)return clk_phandle; } -static void fdt_add_uart (const HexagonVirtMachineState *vms,int uart, +static void fdt_add_uart (HexagonVirtMachineState *vms,int uart,int32_t clk_phandle) {char *nodename;
@@ -129,11 +129,11 @@ static void fdt_add_uart(const HexagonVirtMachineState *vms, int uart,DeviceState *dev;SysBusDevice *s; - dev =qdev_new_orphan (TYPE_PL011 ); + dev =qdev_new (OBJECT (vms),"uart" ,TYPE_PL011 ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" ,serial_hd (0 ));qdev_connect_clock_in (dev,"clk" , vms->apb_clk); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);sysbus_mmio_map (s,0 , base); nodename =g_strdup_printf ("/pl011@%" PRIx64, base);
@@ -268,17 +268,15 @@ static void virt_init(MachineState *ms) &vms->parent_obj.cfgtable_rom);fdt_add_hvx (vms, m_cfg); - gsregs_dev =qdev_new_orphan (TYPE_HEXAGON_GLOBALREG ); -object_property_add_child (OBJECT (ms),"global-regs" ,OBJECT (gsregs_dev)); + gsregs_dev =qdev_new (OBJECT (ms),"global-regs" ,TYPE_HEXAGON_GLOBALREG );qdev_prop_set_uint64 (gsregs_dev,"config-table-addr" , m_cfg->cfgbase);qdev_prop_set_uint32 (gsregs_dev,"dsp-rev" , v68_rev); -sysbus_realize_and_unref (SYS_BUS_DEVICE (gsregs_dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (gsregs_dev), &error_fatal); - tlb_dev =qdev_new_orphan (TYPE_HEXAGON_TLB ); -object_property_add_child (OBJECT (ms),"tlb" ,OBJECT (tlb_dev)); + tlb_dev =qdev_new (OBJECT (ms),"tlb" ,TYPE_HEXAGON_TLB );qdev_prop_set_uint32 (tlb_dev,"num-entries" , m_cfg->cfgtable.jtlb_size_entries); -sysbus_realize_and_unref (SYS_BUS_DEVICE (tlb_dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (tlb_dev), &error_fatal); cpu0 =NULL ;for (int i =0 ; i < ms->smp.cpus; i++) {
Signature · 1 line
2.47.1
RFC PATCH 32/134 hw/xen: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/xen to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/xen/xen-bus.c:1152 | qdev_new | qdev_get_machine() | "xen-bridge" | init helper called from 3 board paths with no parent arg; use qdev_get_machine() (already used in this subsystem) hw/xen/xen-legacy-backend.c:601 | qdev_new | qdev_get_machine() | "xen-sysdev" | init helper with no parent arg; qdev_get_machine() already used just above in xen_set_dynamic_sysbus()
hw/xen/xen-pvh-common.c:176 | sysbus_create_simple | OBJECT(s) | "virtio-mmio[*]" | board-init helper receives XenPVHMachineState *s; loop-created hw/xen/xen-pvh-common.c:196 | qdev_new | OBJECT(s) | "tpm" | board-init helper receives XenPVHMachineState *s
hw/xen/xen_pt_graphics.c:402 | pci_create_simple | OBJECT(s) | "isa-bridge" | called from XenPCIPassthroughState realize; s is the composite passthrough device
--- hw/xen/xen-bus.c | 5 +++-- hw/xen/xen-legacy-backend.c | 5 +++-- hw/xen/xen-pvh-common.c | 7 ++++--- hw/xen/xen_pt_graphics.c | 3 ++- 4 files changed, 12 insertions(+), 8 deletions(-)
hw/xen/xen-bus.c +3 -2
@@ -1149,10 +1149,11 @@ type_init(xen_register_types)void xen_bus_init (void ) { -DeviceState *dev =qdev_new_orphan (TYPE_XEN_BRIDGE ); +DeviceState *dev =qdev_new (qdev_get_machine (),"xen-bridge" , +TYPE_XEN_BRIDGE );BusState *bus =qbus_new (TYPE_XEN_BUS , dev,NULL ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);qbus_set_bus_hotplug_handler (bus); qemu_create_nic_bus_devices(bus, TYPE_XEN_DEVICE, "xen-net-device",
hw/xen/xen-legacy-backend.c +3 -2
@@ -598,8 +598,9 @@ void xen_be_init(void)exit (1 ); } - xen_sysdev =qdev_new_orphan (TYPE_XENSYSDEV ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (xen_sysdev), &error_fatal); + xen_sysdev =qdev_new (qdev_get_machine (),"xen-sysdev" , +TYPE_XENSYSDEV ); +sysbus_realize (SYS_BUS_DEVICE (xen_sysdev), &error_fatal); xen_sysbus =qbus_new (TYPE_XENSYSBUS , xen_sysdev,"xen-sysbus" );qbus_set_bus_hotplug_handler (xen_sysbus);
hw/xen/xen-pvh-common.c +4 -3
@@ -173,7 +173,8 @@ static void xen_create_virtio_mmio_devices(XenPVHMachineState *s)qemu_irq irq =qemu_allocate_irq (xen_set_irq,NULL , s->cfg.virtio_mmio_irq_base + i); -sysbus_create_simple_orphan ("virtio-mmio" , base, irq); +sysbus_create_simple (OBJECT (s),"virtio-mmio[*]" ,"virtio-mmio" , + base, irq); trace_xen_create_virtio_mmio_devices(i, s->cfg.virtio_mmio_irq_base + i,
@@ -193,7 +194,7 @@ static void xen_enable_tpm(XenPVHMachineState *s)error_report ("Couldn't find tmp0 backend" );return ; } - dev =qdev_new_orphan (TYPE_TPM_TIS_SYSBUS ); + dev =qdev_new (OBJECT (s),"tpm" ,TYPE_TPM_TIS_SYSBUS );/* * FIXME This use of &err is is wrong. If both calls fail, the * second will trip error_setv()'s assertion. If just one call
@@ -204,7 +205,7 @@ static void xen_enable_tpm(XenPVHMachineState *s)object_property_set_link (OBJECT (dev),"tpmdev" ,OBJECT (be), &err);object_property_set_str (OBJECT (dev),"tpmdev" , be->id, &err); busdev =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_realize (busdev, &error_fatal);sysbus_mmio_map (busdev,0 , s->cfg.tpm.base);trace_xen_enable_tpm (s->cfg.tpm.base);
hw/xen/xen_pt_graphics.c +2 -1
@@ -399,7 +399,8 @@ void xen_igd_passthrough_isa_bridge_create(XenPCIPassthroughState *s, }/* Currently IGD drivers always need to access PCH by 1f.0. */ - bridge_dev =pci_create_simple_orphan (bus,PCI_DEVFN (0x1f ,0 ), + bridge_dev =pci_create_simple (OBJECT (s),"isa-bridge" , bus, +PCI_DEVFN (0x1f ,0 ),"igd-passthrough-isa-bridge" );/*
Signature · 1 line
2.47.1
RFC PATCH 33/134 hw/display: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/display to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/display/sii9022.c:167 | i2c_slave_create_simple | OBJECT(dev) | "ddc" | DeviceClass.realize(); DDC slave owned by sii9022 device hw/display/sm501.c:1913 | qdev_new | OBJECT(dev) | "ddc" | sm501_init() helper receives realizing DeviceState *dev; drop _and_unref
hw/display/xlnx_dp.c:1349 | qdev_new | obj | "dpcd" | instance_init(Object *obj); collapse existing add_child+unref, keep name hw/display/xlnx_dp.c:1353 | qdev_new | obj | "edid" | instance_init(Object *obj); collapse existing add_child+unref, keep name
--- hw/display/sii9022.c | 2 +- hw/display/sm501.c | 4 ++-- hw/display/xlnx_dp.c | 14 +++----------- 3 files changed, 6 insertions(+), 14 deletions(-)
hw/display/sii9022.c +1 -1
@@ -164,7 +164,7 @@ static void sii9022_realize(DeviceState *dev, Error **errp)I2CBus *bus; bus =I2C_BUS (qdev_get_parent_bus (dev)); -i2c_slave_create_simple_orphan (bus,TYPE_I2CDDC ,0x50 ); +i2c_slave_create_simple (OBJECT (dev),"ddc" , bus,TYPE_I2CDDC ,0x50 ); }static void sii9022_class_init (ObjectClass *klass,const void *data)
hw/display/sm501.c +2 -2
@@ -1910,9 +1910,9 @@ static void sm501_init(SM501State *s, DeviceState *dev,/* i2c */ s->i2c_bus =i2c_init_bus (dev,"sm501.i2c" );/* ddc */ -I2CDDCState *ddc =I2CDDC (qdev_new_orphan (TYPE_I2CDDC )); +I2CDDCState *ddc =I2CDDC (qdev_new (OBJECT (dev),"ddc" ,TYPE_I2CDDC ));i2c_slave_set_address (I2C_SLAVE (ddc),0x50 ); -qdev_realize_and_unref (DEVICE (ddc),BUS (s->i2c_bus), &error_abort); +qdev_realize (DEVICE (ddc),BUS (s->i2c_bus), &error_abort);/* mmio */ memory_region_init (&s->mmio_region,OBJECT (dev),"sm501.mmio" ,MMIO_SIZE );
hw/display/xlnx_dp.c +3 -11
@@ -1341,19 +1341,11 @@ static void xlnx_dp_init(Object *obj)*/ s->aux_bus =aux_bus_init (DEVICE (obj),"aux" ); -/* -* Initialize DPCD and EDID. Once we have added the objects as -* child properties of this device, we can drop the reference we -* hold to them, leaving the child-property as the only reference. -*/ - s->dpcd =DPCD (qdev_new_orphan ("dpcd" )); -object_property_add_child (OBJECT (s),"dpcd" ,OBJECT (s->dpcd)); -object_unref (s->dpcd); +/* Initialize DPCD and EDID. */ + s->dpcd =DPCD (qdev_new (obj,"dpcd" ,"dpcd" )); - s->edid =I2CDDC (qdev_new_orphan ("i2c-ddc" )); + s->edid =I2CDDC (qdev_new (obj,"edid" ,"i2c-ddc" ));i2c_slave_set_address (I2C_SLAVE (s->edid),0x50 ); -object_property_add_child (OBJECT (s),"edid" ,OBJECT (s->edid)); -object_unref (s->edid);fifo8_create (&s->rx_fifo,16 );fifo8_create (&s->tx_fifo,16 );
Signature · 1 line
2.47.1
Re: [RFC PATCH 033/134] hw/display: Give onboard devices a QOM parent
Quoted 16 lines · Alexander Graf
Convert the
*_orphan()device-creation calls in hw/display to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/display/sii9022.c:167|i2c_slave_create_simple| OBJECT(dev) | "ddc" |DeviceClass.realize(); DDC slave owned by sii9022 devicehw/display/sm501.c:1913|qdev_new| OBJECT(dev) | "ddc" |sm501_init()helper receives realizing DeviceState *dev; drop_and_unrefhw/display/xlnx_dp.c:1349 | qdev_new | obj | "dpcd" | instance_init(Object *obj); collapse existing add_child+unref, keep name hw/display/xlnx_dp.c:1353 | qdev_new | obj | "edid" | instance_init(Object *obj); collapse existing add_child+unref, keep name
Quoted 8 lines
Assisted-by KiroSigned-off-by Alexander Graf <[email protected]>--- hw/display/sii9022.c | 2 +- hw/display/sm501.c | 4 ++-- hw/display/xlnx_dp.c | 14 +++----------- 3 files changed, 6 insertions(+), 14 deletions(-)
RFC PATCH 34/134 hw/nvram: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/nvram to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/nvram/eeprom_at24c.c:151 | i2c_slave_new | ORPHAN-JUSTIFIED | - | public helper with ~80 callers in hw/arm board files; parent threading deferred to per-board conversion to keep patch scoped to hw/nvram hw/nvram/fw_cfg.c:1032 | qdev_new | OBJECT(qdev_get_machine()) | TYPE_FW_CFG | collapse existing add_child(machine, TYPE_FW_CFG, dev); drop _and_unref hw/nvram/fw_cfg.c:1064 | qdev_new | OBJECT(qdev_get_machine()) | TYPE_FW_CFG | collapse existing add_child(machine, TYPE_FW_CFG, dev); drop _and_unref
--- hw/nvram/fw_cfg.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
hw/nvram/fw_cfg.c +6 -10
@@ -1029,13 +1029,11 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, AddressSpace *dma_as)assert (dma_as); - dev =qdev_new_orphan (TYPE_FW_CFG_IO ); - -object_property_add_child (OBJECT (qdev_get_machine ()),TYPE_FW_CFG , -OBJECT (dev)); + dev =qdev_new (OBJECT (qdev_get_machine ()),TYPE_FW_CFG , +TYPE_FW_CFG_IO ); sbd =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (sbd, &error_fatal); +sysbus_realize (sbd, &error_fatal); ios =FW_CFG_IO (dev);memory_region_add_subregion (iomem, iobase, &ios->comb_iomem);
@@ -1061,17 +1059,15 @@ static FWCfgState *fw_cfg_init_mem_internal(hwaddr ctl_addr,FWCfgState *s;bool dma_requested = dma_addr && dma_as; - dev =qdev_new_orphan (TYPE_FW_CFG_MEM ); + dev =qdev_new (OBJECT (qdev_get_machine ()),TYPE_FW_CFG , +TYPE_FW_CFG_MEM );qdev_prop_set_uint32 (dev,"data_width" , data_width);if (!dma_requested) {qdev_prop_set_bit (dev,"dma_enabled" , false); } -object_property_add_child (OBJECT (qdev_get_machine ()),TYPE_FW_CFG , -OBJECT (dev)); - sbd =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (sbd, &error_fatal); +sysbus_realize (sbd, &error_fatal);sysbus_mmio_map (sbd,0 , ctl_addr);sysbus_mmio_map (sbd,1 , data_addr);
Signature · 1 line
2.47.1
RFC PATCH 35/134 hw/dma: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/dma to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/dma/i8257.c:654 | isa_new | parent | "dma[*]" | helper already receives Object *parent; collapse existing add_child, keep name; drop _and_unref hw/dma/i8257.c:663 | isa_new | parent | "dma[*]" | helper already receives Object *parent; collapse existing add_child, keep name; drop _and_unref
hw/dma/rc4030.c:750 | qdev_new | parent | "rc4030" | thread Object *parent from single caller mips_jazz_init(machine); update header + caller; drop _and_unref
--- hw/dma/i8257.c | 10 ++++------ hw/dma/rc4030.c | 7 ++++--- hw/mips/jazz.c | 2 +- include/hw/mips/mips.h | 3 ++- 4 files changed, 11 insertions(+), 11 deletions(-)
hw/dma/i8257.c +4 -6
@@ -651,23 +651,21 @@ void i8257_dma_init(Object *parent, ISABus *bus, bool high_page_enable)ISADevice *isa1, *isa2;DeviceState *d; - isa1 =isa_new_orphan (TYPE_I8257 ); -object_property_add_child (parent,"dma[*]" ,OBJECT (isa1)); + isa1 =isa_new (parent,"dma[*]" ,TYPE_I8257 ); d =DEVICE (isa1);qdev_prop_set_int32 (d,"base" ,0x00 );qdev_prop_set_int32 (d,"page-base" ,0x80 );qdev_prop_set_int32 (d,"pageh-base" , high_page_enable ?0x480 :-1 );qdev_prop_set_int32 (d,"dshift" ,0 ); -isa_realize_and_unref (isa1, bus, &error_fatal); +qdev_realize (d,BUS (bus), &error_fatal); - isa2 =isa_new_orphan (TYPE_I8257 ); -object_property_add_child (parent,"dma[*]" ,OBJECT (isa2)); + isa2 =isa_new (parent,"dma[*]" ,TYPE_I8257 ); d =DEVICE (isa2);qdev_prop_set_int32 (d,"base" ,0xc0 );qdev_prop_set_int32 (d,"page-base" ,0x88 );qdev_prop_set_int32 (d,"pageh-base" , high_page_enable ?0x488 :-1 );qdev_prop_set_int32 (d,"dshift" ,1 ); -isa_realize_and_unref (isa2, bus, &error_fatal); +qdev_realize (d,BUS (bus), &error_fatal);isa_bus_dma (bus,ISADMA (isa1),ISADMA (isa2)); }
hw/dma/rc4030.c +4 -3
@@ -743,12 +743,13 @@ static void rc4030_register_types(void)type_init (rc4030_register_types) -DeviceState *rc4030_init(rc4030_dma **dmas, IOMMUMemoryRegion **dma_mr) +DeviceState *rc4030_init(Object *parent, rc4030_dma **dmas, +IOMMUMemoryRegion **dma_mr) {DeviceState *dev; - dev =qdev_new_orphan (TYPE_RC4030 ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); + dev =qdev_new (parent,"rc4030" ,TYPE_RC4030 ); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); *dmas =rc4030_allocate_dmas (dev,4 ); *dma_mr = &RC4030 (dev)->dma_mr;
hw/mips/jazz.c +1 -1
@@ -261,7 +261,7 @@ static void mips_jazz_init(MachineState *machine,cpu_mips_clock_init (cpu);/* Chipset */ - rc4030 =rc4030_init (&dmas, &rc4030_dma_mr); + rc4030 =rc4030_init (OBJECT (machine), &dmas, &rc4030_dma_mr); sysbus =SYS_BUS_DEVICE (rc4030);sysbus_connect_irq (sysbus,0 , env->irq[6 ]);sysbus_connect_irq (sysbus,1 , env->irq[3 ]);
include/hw/mips/mips.h +2 -1
@@ -17,6 +17,7 @@ typedef struct rc4030DMAState *rc4030_dma;void rc4030_dma_read (void *dma,uint8_t *buf,int len);void rc4030_dma_write (void *dma,uint8_t *buf,int len); -DeviceState *rc4030_init (rc4030_dma **dmas,IOMMUMemoryRegion **dma_mr); +DeviceState *rc4030_init (Object *parent,rc4030_dma **dmas, +IOMMUMemoryRegion **dma_mr);#endif
Signature · 1 line
2.47.1
RFC PATCH 36/134 hw/misc: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/misc to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/misc/empty_slot.c:61 | qdev_new | parent | name | thread Object *parent as first arg; use existing name arg as child name; 7 callers updated (m68k next-cube, sparc sun4m, gt64120 realize) hw/misc/led.c:144 | qdev_new | parentobj | name | already receives parentobj; collapse existing object_property_add_child(); compute name before create hw/misc/sifive_e_prci.c:120 | qdev_new | parent | "prci" | thread Object *parent as first arg; single caller in sifive_e_soc_realize passes OBJECT(dev) hw/misc/sifive_test.c:100 | qdev_new | parent | "test" | thread Object *parent as first arg; 2 callers (riscv virt, or1k virt) pass machine-state
--- hw/m68k/next-cube.c | 6 +++--- hw/misc/empty_slot.c | 7 ++++--- hw/misc/led.c | 15 ++++++++------- hw/misc/sifive_e_prci.c | 6 +++--- hw/misc/sifive_test.c | 6 +++--- hw/or1k/virt.c | 2 +- hw/pci-host/gt64120.c | 2 +- hw/riscv/sifive_e.c | 2 +- hw/riscv/virt.c | 2 +- hw/sparc/sun4m.c | 7 ++++--- include/hw/misc/empty_slot.h | 3 ++- include/hw/misc/sifive_e_prci.h | 2 +- include/hw/misc/sifive_test.h | 2 +- 13 files changed, 33 insertions(+), 29 deletions(-)
hw/m68k/next-cube.c +3 -3
@@ -1292,9 +1292,9 @@ static void next_cube_init(MachineState *machine)sysbus_mmio_map (SYS_BUS_DEVICE (pcdev),1 ,0x02106000 );/* unknown: Brightness control register? */ -empty_slot_init ("next.unknown.0" ,0x02110000 ,0x10 ); +empty_slot_init (OBJECT (machine),"next.unknown.0" ,0x02110000 ,0x10 );/* unknown: Magneto-Optical drive controller? */ -empty_slot_init ("next.unknown.1" ,0x02112000 ,0x10 ); +empty_slot_init (OBJECT (machine),"next.unknown.1" ,0x02112000 ,0x10 );/* SCSI */ sysbus_mmio_map (SYS_BUS_DEVICE (pcdev),2 ,0x02114000 );
@@ -1304,7 +1304,7 @@ static void next_cube_init(MachineState *machine)sysbus_mmio_map (SYS_BUS_DEVICE (pcdev),4 ,0x02118000 );/* unknown: Serial clock configuration register? */ -empty_slot_init ("next.unknown.2" ,0x02118004 ,0x10 ); +empty_slot_init (OBJECT (machine),"next.unknown.2" ,0x02118004 ,0x10 );/* Timer */ sysbus_mmio_map (SYS_BUS_DEVICE (pcdev),5 ,0x0211a000 );
hw/misc/empty_slot.c +4 -3
@@ -52,16 +52,17 @@ static const MemoryRegionOps empty_slot_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -void empty_slot_init (const char *name,hwaddr addr,uint64_t slot_size) +void empty_slot_init (Object *parent,const char *name,hwaddr addr, +uint64_t slot_size) {if (slot_size >0 ) {/* Only empty slots larger than 0 byte need handling. */ DeviceState *dev; - dev =qdev_new_orphan (TYPE_EMPTY_SLOT ); + dev =qdev_new (parent, name,TYPE_EMPTY_SLOT );qdev_prop_set_uint64 (dev,"size" , slot_size); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map_overlap (SYS_BUS_DEVICE (dev),0 , addr,-10000 ); }
hw/misc/led.c +8 -7
@@ -141,20 +141,21 @@ LEDState *led_create_simple(Object *parentobj, g_autofree char *name = NULL;DeviceState *dev; - dev =qdev_new_orphan (TYPE_LED ); -qdev_prop_set_bit (dev,"gpio-active-high" , - gpio_polarity ==GPIO_POLARITY_ACTIVE_HIGH ); -qdev_prop_set_string (dev,"color" , led_color_name[color]);if (!description) {static unsigned undescribed_led_id; name =g_strdup_printf ("undescribed-led-#%u" , undescribed_led_id++); }else { -qdev_prop_set_string (dev,"description" , description); name =g_ascii_strdown (description,-1 ); name =g_strdelimit (name," #" ,'-' ); } -object_property_add_child (parentobj, name,OBJECT (dev)); -qdev_realize_and_unref (dev,NULL , &error_fatal); + dev =qdev_new (parentobj, name,TYPE_LED ); +qdev_prop_set_bit (dev,"gpio-active-high" , + gpio_polarity ==GPIO_POLARITY_ACTIVE_HIGH ); +qdev_prop_set_string (dev,"color" , led_color_name[color]); +if (description) { +qdev_prop_set_string (dev,"description" , description); + } +qdev_realize (dev,NULL , &error_fatal);return LED (dev); }
hw/misc/sifive_e_prci.c +3 -3
@@ -115,10 +115,10 @@ type_init(sifive_e_prci_register_types)/* * Create PRCI device. */ -DeviceState *sifive_e_prci_create (hwaddr addr) +DeviceState *sifive_e_prci_create (Object *parent,hwaddr addr) { -DeviceState *dev =qdev_new_orphan (TYPE_SIFIVE_E_PRCI ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +DeviceState *dev =qdev_new (parent,"prci" ,TYPE_SIFIVE_E_PRCI ); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , addr);return dev; }
hw/misc/sifive_test.c +3 -3
@@ -95,10 +95,10 @@ type_init(sifive_test_register_types)/* * Create Test device. */ -DeviceState *sifive_test_create (hwaddr addr) +DeviceState *sifive_test_create (Object *parent,hwaddr addr) { -DeviceState *dev =qdev_new_orphan (TYPE_SIFIVE_TEST ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +DeviceState *dev =qdev_new (parent,"test" ,TYPE_SIFIVE_TEST ); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , addr);return dev; }
hw/or1k/virt.c +1 -1
@@ -264,7 +264,7 @@ static void openrisc_virt_test_init(OR1KVirtState *state, hwaddr base,char *nodename;/* SiFive Test MMIO device */ -sifive_test_create (base); +sifive_test_create (OBJECT (state), base);/* SiFive Test MMIO Reset device FDT */ nodename =g_strdup_printf ("/soc/test@%" HWADDR_PRIx, base);
hw/pci-host/gt64120.c +1 -1
@@ -1224,7 +1224,7 @@ static void gt64120_realize(DeviceState *dev, Error **errp)* exception when accessing invalid memory. Create an empty slot to * emulate this feature. */ -empty_slot_init ("GT64120" ,0 ,0x20000000 ); +empty_slot_init (OBJECT (dev),"GT64120" ,0 ,0x20000000 ); }static void gt64120_pci_realize (PCIDevice *d,Error **errp)
hw/riscv/sifive_e.c +1 -1
@@ -233,7 +233,7 @@ static void sifive_e_soc_realize(DeviceState *dev, Error **errp)RISCV_ACLINT_DEFAULT_MTIMER_SIZE ,0 , ms->smp.cpus,RISCV_ACLINT_DEFAULT_MTIMECMP ,RISCV_ACLINT_DEFAULT_MTIME , SIFIVE_E_LFCLK_DEFAULT_FREQ, false); -sifive_e_prci_create (memmap[SIFIVE_E_DEV_PRCI ].base); +sifive_e_prci_create (OBJECT (dev), memmap[SIFIVE_E_DEV_PRCI ].base);/* AON */
hw/riscv/virt.c +1 -1
@@ -1477,7 +1477,7 @@ static void virt_machine_init(MachineState *machine)rom_set_fw (s->fw_cfg);/* SiFive Test MMIO device */ -sifive_test_create (s->memmap[VIRT_TEST ].base); +sifive_test_create (OBJECT (machine), s->memmap[VIRT_TEST ].base);/* VirtIO MMIO devices */ for (i =0 ; i <VIRTIO_COUNT ; i++) {
hw/sparc/sun4m.c +4 -3
@@ -842,7 +842,7 @@ static void sun4m_hw_init(MachineState *machine)/* models without ECC don't trap when missing ram is accessed */ if (!hwdef->ecc_base) { -empty_slot_init ("ecc" , machine->ram_size, +empty_slot_init (OBJECT (machine),"ecc" , machine->ram_size, hwdef->max_mem - machine->ram_size); }
@@ -875,7 +875,7 @@ static void sun4m_hw_init(MachineState *machine)Software shouldn't use aliased addresses, neither should it crash when does. Using empty_slot instead of aliasing can help with debugging such accesses */ -empty_slot_init ("iommu.alias" , +empty_slot_init (OBJECT (machine),"iommu.alias" , hwdef->iommu_pad_base, hwdef->iommu_pad_len); }
@@ -937,7 +937,8 @@ static void sun4m_hw_init(MachineState *machine)/* vsimm registers probed by OBP */ if (hwdef->vsimm[i].reg_base) {char *name =g_strdup_printf ("vsimm[%d]" , i); -empty_slot_init (name, hwdef->vsimm[i].reg_base,0x2000 ); +empty_slot_init (OBJECT (machine), name, + hwdef->vsimm[i].reg_base,0x2000 );g_free (name); } }
include/hw/misc/empty_slot.h +2 -1
@@ -14,6 +14,7 @@#include "exec/hwaddr.h" -void empty_slot_init (const char *name,hwaddr addr,uint64_t slot_size); +void empty_slot_init (Object *parent,const char *name,hwaddr addr, +uint64_t slot_size);#endif
include/hw/misc/sifive_e_prci.h +1 -1
@@ -69,6 +69,6 @@ struct SiFiveEPRCIState { uint32_t plloutdiv; }; -DeviceState *sifive_e_prci_create (hwaddr addr); +DeviceState *sifive_e_prci_create (Object *parent,hwaddr addr);#endif
include/hw/misc/sifive_test.h +1 -1
@@ -42,6 +42,6 @@ enum {FINISHER_RESET =0x7777 }; -DeviceState *sifive_test_create (hwaddr addr); +DeviceState *sifive_test_create (Object *parent,hwaddr addr);#endif
Signature · 1 line
2.47.1
RFC PATCH 37/134 hw/scsi: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/scsi to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/scsi/lasi_ncr710.c:234 | qdev_new | parent | "scsi" | thread Object *parent as first arg; single caller in hw/hppa/machine.c board init passes OBJECT(machine)
hw/scsi/ncr53c710.c:2379 | qdev_new | parent | "scsi" | thread Object *parent as first arg; no in-tree callers, header updated hw/scsi/ncr53c710.c:2397 | qdev_new | parent | "scsi" | thread Object *parent as first arg; no in-tree callers, header updated
hw/scsi/scsi-bus.c:448 | qdev_new | OBJECT(bus) | name | collapse existing object_property_add_child(OBJECT(bus), name, dev); keep dynamic legacy[%d] name hw/scsi/spapr_vscsi.c:1238 | qdev_new | parent | "vscsi[*]" | thread Object *parent as first arg; single caller in hw/ppc/spapr.c board init loop passes OBJECT(spapr)
--- hw/hppa/machine.c | 2 +- hw/ppc/spapr.c | 2 +- hw/scsi/lasi_ncr710.c | 8 ++++---- hw/scsi/lasi_ncr710.h | 4 ++-- hw/scsi/ncr53c710.c | 15 ++++++++------- hw/scsi/ncr53c710.h | 7 ++++--- hw/scsi/scsi-bus.c | 5 ++--- hw/scsi/spapr_vscsi.c | 6 +++--- include/hw/ppc/spapr_vio.h | 2 +- 9 files changed, 26 insertions(+), 25 deletions(-)
hw/hppa/machine.c +1 -1
@@ -631,7 +631,7 @@ static void machine_HP_715_init(MachineState *machine) 1));/* SCSI disk setup. */ if (drive_get_max_bus (IF_SCSI ) >=0 ) { - dev =lasi_ncr710_init (addr_space, + dev =lasi_ncr710_init (OBJECT (machine), addr_space,translate (NULL ,LASI_HPA_715 +0x6000 ),qdev_get_gpio_in (lasi_dev,LASI_IRQ_SCSI_HPA ));assert (dev);
hw/ppc/spapr.c +1 -1
@@ -3062,7 +3062,7 @@ static void spapr_machine_init(MachineState *machine)pci_init_nic_devices (phb->bus,NULL );for (i =0 ; i <=drive_get_max_bus (IF_SCSI ); i++) { -spapr_vscsi_create (spapr->vio_bus); +spapr_vscsi_create (OBJECT (spapr), spapr->vio_bus); }/* Graphics */
hw/scsi/lasi_ncr710.c +4 -4
@@ -224,18 +224,18 @@ void lasi_ncr710_handle_legacy_cmdline(DeviceState *lasi_dev) } } -DeviceState *lasi_ncr710_init (MemoryRegion *addr_space,hwaddr hpa, -qemu_irq irq) +DeviceState *lasi_ncr710_init (Object *parent,MemoryRegion *addr_space, +hwaddr hpa,qemu_irq irq) {DeviceState *dev;LasiNCR710State *s;SysBusDevice *sbd; - dev =qdev_new_orphan (TYPE_LASI_NCR710 ); + dev =qdev_new (parent,"scsi" ,TYPE_LASI_NCR710 ); s =LASI_NCR710 (dev); sbd =SYS_BUS_DEVICE (dev); s->lasi_irq = irq; -sysbus_realize_and_unref (sbd, &error_fatal); +sysbus_realize (sbd, &error_fatal);memory_region_add_subregion (addr_space, hpa,sysbus_mmio_get_region (sbd,0 ));return dev;
hw/scsi/lasi_ncr710.h +2 -2
@@ -48,8 +48,8 @@ typedef struct LasiNCR710State { NCR710State ncr710; } LasiNCR710State; -DeviceState *lasi_ncr710_init (MemoryRegion *addr_space,hwaddr hpa, -qemu_irq irq); +DeviceState *lasi_ncr710_init (Object *parent,MemoryRegion *addr_space, +hwaddr hpa,qemu_irq irq);void lasi_ncr710_handle_legacy_cmdline (DeviceState *lasi_dev);#endif
hw/scsi/ncr53c710.c +8 -7
@@ -2371,22 +2371,23 @@ static const VMStateDescription vmstate_sysbus_ncr710 = { } }; -DeviceState *ncr710_device_create_sysbus (hwaddr addr,qemu_irq irq) +DeviceState *ncr710_device_create_sysbus (Object *parent,hwaddr addr, +qemu_irq irq) {DeviceState *dev;SysBusDevice *sysbus; - dev =qdev_new_orphan (TYPE_SYSBUS_NCR710_SCSI ); + dev =qdev_new (parent,"scsi" ,TYPE_SYSBUS_NCR710_SCSI ); sysbus =SYS_BUS_DEVICE (dev); -qdev_realize_and_unref (dev,NULL , &error_abort); +qdev_realize (dev,NULL , &error_abort);sysbus_mmio_map (sysbus,0 , addr);sysbus_connect_irq (sysbus,0 , irq);return dev; } -DeviceState *ncr53c710_init (MemoryRegion *address_space,hwaddr addr, -qemu_irq irq) +DeviceState *ncr53c710_init (Object *parent,MemoryRegion *address_space, +hwaddr addr,qemu_irq irq) {DeviceState *dev;SysBusDevice *sysbus;
@@ -2394,10 +2395,10 @@ DeviceState *ncr53c710_init(MemoryRegion *address_space, hwaddr addr,/* trace_ncr710_device_init(addr); */ - dev =qdev_new_orphan (TYPE_SYSBUS_NCR710_SCSI ); + dev =qdev_new (parent,"scsi" ,TYPE_SYSBUS_NCR710_SCSI ); sysbus =SYS_BUS_DEVICE (dev); -qdev_realize_and_unref (dev,NULL , &error_abort); +qdev_realize (dev,NULL , &error_abort);sysbus_mmio_map (sysbus,0 , addr);sysbus_connect_irq (sysbus,0 , irq);
hw/scsi/ncr53c710.h +4 -3
@@ -229,9 +229,10 @@ static inline SysBusNCR710State *sysbus_from_ncr710(NCR710State *s)return container_of (s, SysBusNCR710State, ncr710); } -DeviceState *ncr53c710_init (MemoryRegion *address_space,hwaddr addr, -qemu_irq irq); -DeviceState *ncr710_device_create_sysbus (hwaddr addr,qemu_irq irq); +DeviceState *ncr53c710_init (Object *parent,MemoryRegion *address_space, +hwaddr addr,qemu_irq irq); +DeviceState *ncr710_device_create_sysbus (Object *parent,hwaddr addr, +qemu_irq irq);void ncr710_reg_write (void *opaque,hwaddr addr,uint64_t val,unsigned size);uint64_t ncr710_reg_read (void *opaque,hwaddr addr,unsigned size);void ncr710_soft_reset (NCR710State *s);
hw/scsi/scsi-bus.c +2 -3
@@ -445,9 +445,8 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk, driver ="scsi-hd" ; } } - dev =qdev_new_orphan (driver); name =g_strdup_printf ("legacy[%d]" , unit); -object_property_add_child (OBJECT (bus), name,OBJECT (dev)); + dev =qdev_new (OBJECT (bus), name, driver);g_free (name); s =SCSI_DEVICE (dev);
@@ -473,7 +472,7 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,return NULL ; } -if (!qdev_realize_and_unref (dev, &bus->qbus, errp)) { +if (!qdev_realize (dev, &bus->qbus, errp)) {object_unparent (OBJECT (dev));return NULL ; }
hw/scsi/spapr_vscsi.c +3 -3
@@ -1231,13 +1231,13 @@ static void spapr_vscsi_realize(SpaprVioDevice *dev, Error **errp)qbus_set_hotplug_handler (BUS (&s->bus),NULL ); } -void spapr_vscsi_create (SpaprVioBus *bus) +void spapr_vscsi_create (Object *parent,SpaprVioBus *bus) {DeviceState *dev; - dev =qdev_new_orphan ("spapr-vscsi" ); + dev =qdev_new (parent,"vscsi[*]" ,"spapr-vscsi" ); -qdev_realize_and_unref (dev, &bus->bus, &error_fatal); +qdev_realize (dev, &bus->bus, &error_fatal);scsi_bus_legacy_handle_cmdline (&VIO_SPAPR_VSCSI_DEVICE (dev)->bus); }
include/hw/ppc/spapr_vio.h +1 -1
@@ -139,7 +139,7 @@ SpaprVioDevice *vty_lookup(SpaprMachineState *spapr, target_ulong reg);void vty_putchars (SpaprVioDevice *sdev,uint8_t *buf,int len);void spapr_vty_create (SpaprVioBus *bus,Chardev *chardev);void spapr_vlan_create (SpaprVioBus *bus,NICInfo *nd); -void spapr_vscsi_create (SpaprVioBus *bus); +void spapr_vscsi_create (Object *parent,SpaprVioBus *bus);SpaprVioDevice *spapr_vty_get_default (SpaprVioBus *bus);
Signature · 1 line
2.47.1
RFC PATCH 38/134 hw/net: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/net to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/net/lan9118.c:1342 | qdev_new | parent | "eth" | thread Object *parent as first arg; 5 board-init callers pass OBJECT(machine)hw/net/smc91c111.c:957 | qdev_new | parent | "eth" | thread Object *parent as first arg; 3 board-init callers pass OBJECT(machine)hw/net/spapr_llan.c:374 | qdev_new | parent | "vlan[*]" | thread Object *parent as first arg; single caller in hw/ppc/spapr.c board-init loop passes OBJECT(spapr) hw/net/xen_nic.c:622 | qdev_new | ORPHAN-JUSTIFIED | - | XenBackendOps.create hotplug callback driven by xenstore watch; dynamic device with no board owner (same pattern as xen-block/xen_console)
--- hw/arm/integratorcp.c | 2 +- hw/arm/kzm.c | 2 +- hw/arm/mps2.c | 2 +- hw/arm/mps3r.c | 2 +- hw/arm/realview.c | 4 ++-- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 2 +- hw/net/lan9118.c | 6 +++--- hw/net/smc91c111.c | 6 +++--- hw/net/spapr_llan.c | 6 +++--- hw/ppc/spapr.c | 2 +- include/hw/net/lan9118.h | 2 +- include/hw/net/smc91c111.h | 2 +- include/hw/ppc/spapr_vio.h | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-)
hw/arm/integratorcp.c +1 -1
@@ -670,7 +670,7 @@ static void integratorcp_init(MachineState *machine)sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[25 ]);if (qemu_find_nic_info ("smc91c111" , true,NULL )) { -smc91c111_init (0xc8000000 , pic[27 ]); +smc91c111_init (OBJECT (machine),0xc8000000 , pic[27 ]); } dev =qdev_new_orphan ("pl110" );
hw/arm/kzm.c +1 -1
@@ -115,7 +115,7 @@ static void kzm_init(MachineState *machine) }if (qemu_find_nic_info ("lan9118" , true,NULL )) { -lan9118_init (KZM_LAN9118_ADDR , +lan9118_init (OBJECT (machine),KZM_LAN9118_ADDR ,qdev_get_gpio_in (DEVICE (&s->soc.avic),52 )); }
hw/arm/mps2.c +1 -1
@@ -461,7 +461,7 @@ static void mps2_common_init(MachineState *machine)/* In hardware this is a LAN9220; the LAN9118 is software compatible * except that it doesn't support the checksum-offload feature. */ -lan9118_init (mmc->ethernet_base, +lan9118_init (OBJECT (machine), mmc->ethernet_base,qdev_get_gpio_in (armv7m, mmc->fpga_type ==FPGA_AN511 ?47 :13 ));
hw/arm/mps3r.c +1 -1
@@ -549,7 +549,7 @@ static void mps3r_common_init(MachineState *machine)* In hardware this is a LAN9220; the LAN9118 is software compatible * except that it doesn't support the checksum-offload feature. */ -lan9118_init (0xe0300000 , +lan9118_init (OBJECT (machine),0xe0300000 ,qdev_get_gpio_in (gicdev,18 ));create_unimplemented_device ("usb" ,0xe0301000 ,0x1000 );
hw/arm/realview.c +2 -2
@@ -309,9 +309,9 @@ static void realview_init(MachineState *machine,if (qemu_find_nic_info (is_pb ?"lan9118" :"smc91c111" , true,NULL )) {if (is_pb) { -lan9118_init (0x4e000000 , pic[28 ]); +lan9118_init (OBJECT (machine),0x4e000000 , pic[28 ]); }else { -smc91c111_init (0x4e000000 , pic[28 ]); +smc91c111_init (OBJECT (machine),0x4e000000 , pic[28 ]); } }
hw/arm/versatilepb.c +1 -1
@@ -265,7 +265,7 @@ static void versatile_init(MachineState *machine, int board_id) pci_bus = (PCIBus *)qdev_get_child_bus (dev,"pci" );if (qemu_find_nic_info ("smc91c111" , true,NULL )) { -smc91c111_init (0x10010000 , sic[25 ]); +smc91c111_init (OBJECT (machine),0x10010000 , sic[25 ]); }pci_init_nic_devices (pci_bus,"rtl8139" );
hw/arm/vexpress.c +1 -1
@@ -694,7 +694,7 @@ static void vexpress_common_init(MachineState *machine)/* 0x4e000000 LAN9118 Ethernet */ if (qemu_find_nic_info ("lan9118" , true,NULL )) { -lan9118_init (map[VE_ETHERNET ], pic[15 ]); +lan9118_init (OBJECT (machine), map[VE_ETHERNET ], pic[15 ]); }/* VE_USB: not modelled */
hw/net/lan9118.c +3 -3
@@ -1334,15 +1334,15 @@ static void lan9118_register_types(void)/* Legacy helper function. Should go away when machine config files are implemented. */ -void lan9118_init (uint32_t base,qemu_irq irq) +void lan9118_init (Object *parent,uint32_t base,qemu_irq irq) {DeviceState *dev;SysBusDevice *s; - dev =qdev_new_orphan (TYPE_LAN9118 ); + dev =qdev_new (parent,"eth" ,TYPE_LAN9118 );qemu_configure_nic_device (dev, true,NULL ); s =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);sysbus_mmio_map (s,0 , base);sysbus_connect_irq (s,0 , irq); }
hw/net/smc91c111.c +3 -3
@@ -949,15 +949,15 @@ static void smc91c111_register_types(void)/* Legacy helper function. Should go away when machine config files are implemented. */ -void smc91c111_init (uint32_t base,qemu_irq irq) +void smc91c111_init (Object *parent,uint32_t base,qemu_irq irq) {DeviceState *dev;SysBusDevice *s; - dev =qdev_new_orphan (TYPE_SMC91C111 ); + dev =qdev_new (parent,"eth" ,TYPE_SMC91C111 );qemu_configure_nic_device (dev, true,NULL ); s =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);sysbus_mmio_map (s,0 , base);sysbus_connect_irq (s,0 , irq); }
hw/net/spapr_llan.c +3 -3
@@ -367,15 +367,15 @@ static void spapr_vlan_instance_finalize(Object *obj) } } -void spapr_vlan_create (SpaprVioBus *bus,NICInfo *nd) +void spapr_vlan_create (Object *parent,SpaprVioBus *bus,NICInfo *nd) {DeviceState *dev; - dev =qdev_new_orphan ("spapr-vlan" ); + dev =qdev_new (parent,"vlan[*]" ,"spapr-vlan" );qdev_set_nic_properties (dev, nd); -qdev_realize_and_unref (dev, &bus->bus, &error_fatal); +qdev_realize (dev, &bus->bus, &error_fatal); }static int spapr_vlan_devnode (SpaprVioDevice *dev,void *fdt,int node_off)
hw/ppc/spapr.c +1 -1
@@ -3056,7 +3056,7 @@ static void spapr_machine_init(MachineState *machine) phb =spapr_create_default_phb ();while ((nd =qemu_find_nic_info ("spapr-vlan" , true,"ibmveth" ))) { -spapr_vlan_create (spapr->vio_bus, nd); +spapr_vlan_create (OBJECT (spapr), spapr->vio_bus, nd); }pci_init_nic_devices (phb->bus,NULL );
include/hw/net/lan9118.h +1 -1
@@ -15,6 +15,6 @@#define TYPE_LAN9118 "lan9118" -void lan9118_init (uint32_t ,qemu_irq ); +void lan9118_init (Object *parent,uint32_t ,qemu_irq );#endif
include/hw/net/smc91c111.h +1 -1
@@ -13,6 +13,6 @@#include "net/net.h" -void smc91c111_init (uint32_t ,qemu_irq ); +void smc91c111_init (Object *parent,uint32_t ,qemu_irq );#endif
include/hw/ppc/spapr_vio.h +1 -1
@@ -138,7 +138,7 @@ int spapr_vio_send_crq(SpaprVioDevice *dev, uint8_t *crq);SpaprVioDevice *vty_lookup (SpaprMachineState *spapr,target_ulong reg);void vty_putchars (SpaprVioDevice *sdev,uint8_t *buf,int len);void spapr_vty_create (SpaprVioBus *bus,Chardev *chardev); -void spapr_vlan_create (SpaprVioBus *bus,NICInfo *nd); +void spapr_vlan_create (Object *parent,SpaprVioBus *bus,NICInfo *nd);void spapr_vscsi_create (Object *parent,SpaprVioBus *bus);SpaprVioDevice *spapr_vty_get_default (SpaprVioBus *bus);
Signature · 1 line
2.47.1
RFC PATCH 39/134 hw/ide: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/ide to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/ide/ide-bus.c:78 | qdev_new | OBJECT(bus->qbus.parent) | "drive[*]" | drive is child of the IDE controller device that owns the bus; helper called from many controllers so use bus->qbus.parent hw/ide/isa.c:87 | isa_new | parent | "ide[*]" | helper called from isapc board init loop; thread Object *parent through isa_ide_init()
--- hw/i386/isapc.c | 3 ++- hw/ide/ide-bus.c | 5 +++-- hw/ide/isa.c | 7 ++++--- include/hw/ide/isa.h | 3 ++- 4 files changed, 11 insertions(+), 7 deletions(-)
hw/i386/isapc.c +2 -1
@@ -142,7 +142,8 @@ static void pc_init_isa(MachineState *machine)for (i =0 ; i <MAX_IDE_BUS ; i++) {ISADevice *dev;char busname[] ="ide.0" ; - dev =isa_ide_init (isa_bus, ide_iobase[i], ide_iobase2[i], + dev =isa_ide_init (OBJECT (machine), isa_bus, + ide_iobase[i], ide_iobase2[i], ide_irq[i], hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i +1 ]);/*
hw/ide/ide-bus.c +3 -2
@@ -75,11 +75,12 @@ IDEDevice *ide_bus_create_drive(IDEBus *bus, int unit, DriveInfo *drive) {DeviceState *dev; - dev =qdev_new_orphan (drive->media_cd ?"ide-cd" :"ide-hd" ); + dev =qdev_new (OBJECT (bus->qbus.parent),"drive[*]" , + drive->media_cd ?"ide-cd" :"ide-hd" );qdev_prop_set_uint32 (dev,"unit" , unit);qdev_prop_set_drive_err (dev,"drive" ,blk_by_legacy_dinfo (drive), &error_fatal); -qdev_realize_and_unref (dev, &bus->qbus, &error_fatal); +qdev_realize (dev, &bus->qbus, &error_fatal);return DO_UPCAST (IDEDevice, qdev, dev); }
hw/ide/isa.c +4 -3
@@ -77,19 +77,20 @@ static void isa_ide_realizefn(DeviceState *dev, Error **errp)ide_bus_register_restart_cb (&s->bus); } -ISADevice *isa_ide_init (ISABus *bus,int iobase,int iobase2,int irqnum, +ISADevice *isa_ide_init (Object *parent,ISABus *bus, +int iobase,int iobase2,int irqnum,DriveInfo *hd0,DriveInfo *hd1) {DeviceState *dev;ISADevice *isadev;ISAIDEState *s; - isadev =isa_new_orphan (TYPE_ISA_IDE ); + isadev =isa_new (parent,"ide[*]" ,TYPE_ISA_IDE ); dev =DEVICE (isadev);qdev_prop_set_uint32 (dev,"iobase" , iobase);qdev_prop_set_uint32 (dev,"iobase2" , iobase2);qdev_prop_set_uint32 (dev,"irq" , irqnum); -isa_realize_and_unref (isadev, bus, &error_fatal); +qdev_realize (dev,BUS (bus), &error_fatal); s =ISA_IDE (dev);if (hd0) {
include/hw/ide/isa.h +2 -1
@@ -14,7 +14,8 @@#define TYPE_ISA_IDE "isa-ide" OBJECT_DECLARE_SIMPLE_TYPE(ISAIDEState, ISA_IDE) -ISADevice *isa_ide_init (ISABus *bus,int iobase,int iobase2,int irqnum, +ISADevice *isa_ide_init (Object *parent,ISABus *bus, +int iobase,int iobase2,int irqnum,DriveInfo *hd0,DriveInfo *hd1);#endif
Signature · 1 line
2.47.1
RFC PATCH 40/134 hw/i3c: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/i3c to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/i3c/core.c:550 | qdev_new | parent | id | public helper; thread Object *parent + const char *id through i3c_target_new() and its caller i3c_target_create_simple() hw/i3c/core.c:626 | i2c_slave_new | parent | id | public helper; thread Object *parent + const char *id through legacy_i2c_device_create_simple()
--- hw/i3c/core.c | 19 +++++++++++-------- include/hw/i3c/i3c.h | 9 ++++++--- 2 files changed, 17 insertions(+), 11 deletions(-)
hw/i3c/core.c +11 -8
@@ -542,12 +542,13 @@ static bool i3c_addr_is_rsvd(uint8_t addr)return is_rsvd[addr]; } -I3CTarget *i3c_target_new (const char *name,uint8_t addr,uint8_t dcr, +I3CTarget *i3c_target_new (Object *parent,const char *id, +const char *name,uint8_t addr,uint8_t dcr,uint8_t bcr,uint64_t pid) {DeviceState *dev; - dev =qdev_new_orphan (name); + dev =qdev_new (parent, id, name);qdev_prop_set_uint8 (dev,"static-address" , addr);qdev_prop_set_uint8 (dev,"dcr" , dcr);qdev_prop_set_uint8 (dev,"bcr" , bcr);
@@ -566,12 +567,13 @@ bool i3c_target_realize_and_unref(I3CTarget *dev, I3CBus *bus, Error **errp)return qdev_realize_and_unref (&dev->parent_obj, &bus->parent_obj, errp); } -I3CTarget *i3c_target_create_simple (I3CBus *bus,const char *name,uint8_t addr, +I3CTarget *i3c_target_create_simple (Object *parent,const char *id, +I3CBus *bus,const char *name,uint8_t addr,uint8_t dcr,uint8_t bcr,uint64_t pid) { -I3CTarget *dev =i3c_target_new (name, addr, dcr, bcr, pid); +I3CTarget *dev =i3c_target_new (parent, id, name, addr, dcr, bcr, pid); dev->address =0 ; -i3c_target_realize_and_unref (dev, bus, &error_abort); +qdev_realize (DEVICE (dev),BUS (bus), &error_abort);return dev; }
@@ -620,12 +622,13 @@ void legacy_i2c_end_transfer(I3CBus *bus)i2c_end_transfer (bus->i2c_bus); } -I2CSlave *legacy_i2c_device_create_simple (I3CBus *bus,const char *name, +I2CSlave *legacy_i2c_device_create_simple (Object *parent,const char *id, +I3CBus *bus,const char *name,uint8_t addr) { -I2CSlave *dev =i2c_slave_new_orphan (name, addr); +I2CSlave *dev =i2c_slave_new (parent, id, name, addr); -i2c_slave_realize_and_unref (dev, bus->i2c_bus, &error_abort); +qdev_realize (DEVICE (dev),BUS (bus->i2c_bus), &error_abort);return dev; }
include/hw/i3c/i3c.h +6 -3
@@ -257,7 +257,8 @@ int legacy_i2c_start_transfer(I3CBus *bus, uint8_t address, bool is_recv);int legacy_i2c_start_recv (I3CBus *bus,uint8_t address);int legacy_i2c_start_send (I3CBus *bus,uint8_t address);void legacy_i2c_end_transfer (I3CBus *bus); -I2CSlave *legacy_i2c_device_create_simple (I3CBus *bus,const char *name, +I2CSlave *legacy_i2c_device_create_simple (Object *parent,const char *id, +I3CBus *bus,const char *name,uint8_t addr);/**
@@ -265,7 +266,8 @@ I2CSlave *legacy_i2c_device_create_simple(I3CBus *bus, const char *name,* * The target returned from this function still needs to be realized. */ -I3CTarget *i3c_target_new (const char *name,uint8_t addr,uint8_t dcr, +I3CTarget *i3c_target_new (Object *parent,const char *id, +const char *name,uint8_t addr,uint8_t dcr,uint8_t bcr,uint64_t pid);/**
@@ -274,7 +276,8 @@ I3CTarget *i3c_target_new(const char *name, uint8_t addr, uint8_t dcr,* Create the target, initialize it, put it on the specified I3C bus, and * realize it. */ -I3CTarget *i3c_target_create_simple (I3CBus *bus,const char *name, +I3CTarget *i3c_target_create_simple (Object *parent,const char *id, +I3CBus *bus,const char *name,uint8_t addr,uint8_t dcr,uint8_t bcr,uint64_t pid);
Signature · 1 line
2.47.1
RFC PATCH 41/134 hw/pci-bridge: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/pci-bridge to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/pci-bridge/pci_expander_bridge.c:362 | qdev_new | OBJECT(dev) | "pxb-host" | pxb_dev_realize_common() is DeviceClass.realize of PXB PCIDevice; child host bridge owned by PXB device hw/pci-bridge/pci_expander_bridge.c:371 | qdev_new | OBJECT(dev) | "pci-bridge" | same realize(); internal pci-bridge owned by PXB device; error path unref->unparent
--- hw/pci-bridge/pci_expander_bridge.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
hw/pci-bridge/pci_expander_bridge.c +7 -6
@@ -359,7 +359,8 @@ static bool pxb_dev_realize_common(PCIDevice *dev, enum BusType type, dev_name = dev->qdev.id; } - ds =qdev_new_orphan (type ==CXL ?TYPE_PXB_CXL_HOST :TYPE_PXB_HOST ); + ds =qdev_new (OBJECT (dev),"pxb-host" , + type ==CXL ?TYPE_PXB_CXL_HOST :TYPE_PXB_HOST );if (type ==PCIE ) { bus =pci_root_bus_new (ds, dev_name,NULL ,NULL ,0 ,TYPE_PXB_PCIE_BUS ); }else if (type ==CXL ) {
@@ -368,7 +369,7 @@ static bool pxb_dev_realize_common(PCIDevice *dev, enum BusType type,PXB_CXL_DEV (dev)->cxl_host_bridge =PXB_CXL_HOST (ds); }else { bus =pci_root_bus_new (ds,"pxb-internal" ,NULL ,NULL ,0 ,TYPE_PXB_BUS ); - bds =qdev_new_orphan ("pci-bridge" ); + bds =qdev_new (OBJECT (dev),"pci-bridge" ,"pci-bridge" ); bds->id =g_strdup (dev_name);qdev_prop_set_uint8 (bds,PCI_BRIDGE_DEV_PROP_CHASSIS_NR , pxb->bus_nr);qdev_prop_set_bit (bds,PCI_BRIDGE_DEV_PROP_SHPC , false);
@@ -388,9 +389,9 @@ static bool pxb_dev_realize_common(PCIDevice *dev, enum BusType type, goto err_register_bus; } -sysbus_realize_and_unref (SYS_BUS_DEVICE (ds), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (ds), &error_fatal);if (bds) { -qdev_realize_and_unref (bds, &bus->qbus, &error_fatal); +qdev_realize (bds, &bus->qbus, &error_fatal); } pci_word_test_and_set_mask(dev->config + PCI_STATUS,
@@ -401,9 +402,9 @@ static bool pxb_dev_realize_common(PCIDevice *dev, enum BusType type,return true; err_register_bus: -object_unref (OBJECT (bds)); +object_unparent (OBJECT (bds));object_unparent (OBJECT (bus)); -object_unref (OBJECT (ds)); +object_unparent (OBJECT (ds));return false; }
Signature · 1 line
2.47.1
RFC PATCH 42/134 hw/sparc64: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/sparc64 to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/sparc64/sun4u.c:332 | isa_create_simple | OBJECT(s) | "i8042" | ebus_realize(): child of EBus device hw/sparc64/sun4u.c:338 | isa_new | OBJECT(s) | "fdc" | ebus_realize(): child of EBus device; drop _and_unref hw/sparc64/sun4u.c:345 | qdev_new | OBJECT(s) | "power" | ebus_realize(): child of EBus device; drop _and_unref hw/sparc64/sun4u.c:426 | qdev_new | parent | "prom" | prom_init() helper: thread Object *parent from board init hw/sparc64/sun4u.c:510 | qdev_new | parent | "ram" | ram_init() helper: thread Object *parent from board init hw/sparc64/sun4u.c:562 | qdev_new | OBJECT(machine) | "iommu" | sun4uv_init() board init hw/sparc64/sun4u.c:571 | qdev_new | OBJECT(machine) | "sabre" | sun4uv_init() board init; PCI host bridge hw/sparc64/sun4u.c:602 | pci_new_multifunction | OBJECT(machine) | "ebus" | sun4uv_init() board init; drop _and_unref hw/sparc64/sun4u.c:621 | pci_create_simple | OBJECT(machine) | "vga" | sun4uv_init() board init hw/sparc64/sun4u.c:635 | pci_new_multifunction | OBJECT(machine) | "nic" | sun4uv_init() board init; onboard NIC; drop _and_unref hw/sparc64/sun4u.c:651 | pci_new | OBJECT(machine) | "ide" | sun4uv_init() board init; drop _and_unref hw/sparc64/sun4u.c:657 | qdev_new | OBJECT(machine) | "nvram" | sun4uv_init() board init; drop _and_unref hw/sparc64/sun4u.c:692 | qdev_new | OBJECT(ebus) | TYPE_FW_CFG | collapse existing object_property_add_child(); keep name; drop _and_unref
--- hw/sparc64/sun4u.c | 60 ++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 29 deletions(-)
hw/sparc64/sun4u.c +31 -29
@@ -329,22 +329,22 @@ static void ebus_realize(PCIDevice *pci_dev, Error **errp)parallel_hds_isa_init (s->isa_bus,MAX_PARALLEL_PORTS );/* Keyboard */ -isa_create_simple_orphan (s->isa_bus,TYPE_I8042 ); +isa_create_simple (OBJECT (s),"i8042" , s->isa_bus,TYPE_I8042 );/* Floppy */ for (i =0 ; i <MAX_FD ; i++) { fd[i] =drive_get (IF_FLOPPY ,0 , i); } - isa_dev =isa_new_orphan (TYPE_ISA_FDC ); + isa_dev =isa_new (OBJECT (s),"fdc" ,TYPE_ISA_FDC ); dev =DEVICE (isa_dev);qdev_prop_set_uint32 (dev,"dma" ,-1 ); -isa_realize_and_unref (isa_dev, s->isa_bus, &error_fatal); +qdev_realize (dev,BUS (s->isa_bus), &error_fatal);isa_fdc_init_drives (isa_dev, fd);/* Power */ - dev =qdev_new_orphan (TYPE_SUN4U_POWER ); + dev =qdev_new (OBJECT (s),"power" ,TYPE_SUN4U_POWER ); sbd =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (sbd, &error_fatal); +sysbus_realize (sbd, &error_fatal);memory_region_add_subregion (pci_address_space_io (pci_dev),0x7240 ,sysbus_mmio_get_region (sbd,0 ));
@@ -416,16 +416,16 @@ static uint64_t translate_prom_address(void *opaque, uint64_t addr) }/* Boot PROM (OpenBIOS) */ -static void prom_init (hwaddr addr,const char *bios_name) +static void prom_init (Object *parent,hwaddr addr,const char *bios_name) {DeviceState *dev;SysBusDevice *s;char *filename;int ret; - dev =qdev_new_orphan (TYPE_OPENPROM ); + dev =qdev_new (parent,"prom" ,TYPE_OPENPROM ); s =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);sysbus_mmio_map (s,0 , addr);
@@ -500,19 +500,19 @@ static void ram_realize(DeviceState *dev, Error **errp)sysbus_init_mmio (sbd, &d->ram); } -static void ram_init (hwaddr addr,ram_addr_t RAM_size) +static void ram_init (Object *parent,hwaddr addr,ram_addr_t RAM_size) {DeviceState *dev;SysBusDevice *s;RamDevice *d;/* allocate RAM */ - dev =qdev_new_orphan (TYPE_SUN4U_MEMORY ); + dev =qdev_new (parent,"ram" ,TYPE_SUN4U_MEMORY ); s =SYS_BUS_DEVICE (dev); d =SUN4U_RAM (dev); d->size = RAM_size; -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);sysbus_mmio_map (s,0 , addr); }
@@ -559,21 +559,21 @@ static void sun4uv_init(MemoryRegion *address_space_mem, cpu =sparc64_cpu_devinit (machine->cpu_type, hwdef->prom_addr);/* IOMMU */ - iommu =qdev_new_orphan (TYPE_SUN4U_IOMMU ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (iommu), &error_fatal); + iommu =qdev_new (OBJECT (machine),"iommu" ,TYPE_SUN4U_IOMMU ); +sysbus_realize (SYS_BUS_DEVICE (iommu), &error_fatal);/* set up devices */ -ram_init (0 , machine->ram_size); +ram_init (OBJECT (machine),0 , machine->ram_size); -prom_init (hwdef->prom_addr, machine->firmware); +prom_init (OBJECT (machine), hwdef->prom_addr, machine->firmware);/* Init sabre (PCI host bridge) */ - sabre =SABRE (qdev_new_orphan (TYPE_SABRE )); + sabre =SABRE (qdev_new (OBJECT (machine),"sabre" ,TYPE_SABRE ));qdev_prop_set_uint64 (DEVICE (sabre),"special-base" ,PBM_SPECIAL_BASE );qdev_prop_set_uint64 (DEVICE (sabre),"mem-base" ,PBM_MEM_BASE );object_property_set_link (OBJECT (sabre),"iommu" ,OBJECT (iommu), &error_abort); -sysbus_realize_and_unref (SYS_BUS_DEVICE (sabre), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (sabre), &error_fatal);/* sabre_config */ sysbus_mmio_map (SYS_BUS_DEVICE (sabre),0 ,PBM_SPECIAL_BASE );
@@ -599,10 +599,11 @@ static void sun4uv_init(MemoryRegion *address_space_mem,pci_bus_set_slot_reserved_mask (pci_busA,0xfffffff1 );pci_bus_set_slot_reserved_mask (pci_busB,0xfffffff0 ); - ebus =pci_new_multifunction_orphan (PCI_DEVFN (1 ,0 ),TYPE_EBUS ); + ebus =pci_new_multifunction (OBJECT (machine),"ebus" ,PCI_DEVFN (1 ,0 ), +TYPE_EBUS );qdev_prop_set_uint64 (DEVICE (ebus),"console-serial-base" , hwdef->console_serial_base); -pci_realize_and_unref (ebus, pci_busA, &error_fatal); +qdev_realize (DEVICE (ebus),BUS (pci_busA), &error_fatal);/* Wire up "well-known" ISA IRQs to PBM legacy obio IRQs */ qdev_connect_gpio_out_named(DEVICE(ebus), "isa-irq", 7,
@@ -618,7 +619,8 @@ static void sun4uv_init(MemoryRegion *address_space_mem,switch (vga_interface_type) {case VGA_STD : -pci_create_simple_orphan (pci_busA,PCI_DEVFN (2 ,0 ),"VGA" ); +pci_create_simple (OBJECT (machine),"vga" , pci_busA,PCI_DEVFN (2 ,0 ), +"VGA" ); vga_interface_created = true;break ;case VGA_NONE :
@@ -632,10 +634,11 @@ static void sun4uv_init(MemoryRegion *address_space_mem, nd =qemu_find_nic_info (mc->default_nic, true,NULL );if (nd) { - pci_dev =pci_new_multifunction_orphan (PCI_DEVFN (1 ,1 ), mc->default_nic); + pci_dev =pci_new_multifunction (OBJECT (machine),"nic" , +PCI_DEVFN (1 ,1 ), mc->default_nic); dev = &pci_dev->qdev;qdev_set_nic_properties (dev, nd); -pci_realize_and_unref (pci_dev, pci_busA, &error_fatal); +qdev_realize (dev,BUS (pci_busA), &error_fatal);memcpy (&macaddr, &nd->macaddr.a,sizeof (MACAddr)); onboard_nic = true;
@@ -648,16 +651,16 @@ static void sun4uv_init(MemoryRegion *address_space_mem,qemu_macaddr_default_if_unset (&macaddr); } - pci_dev =pci_new_orphan (PCI_DEVFN (3 ,0 ),"cmd646-ide" ); + pci_dev =pci_new (OBJECT (machine),"ide" ,PCI_DEVFN (3 ,0 ),"cmd646-ide" );qdev_prop_set_uint32 (&pci_dev->qdev,"secondary" ,1 ); -pci_realize_and_unref (pci_dev, pci_busA, &error_fatal); +qdev_realize (DEVICE (pci_dev),BUS (pci_busA), &error_fatal);pci_ide_create_devs (pci_dev);/* Map NVRAM into I/O (ebus) space */ - dev =qdev_new_orphan ("sysbus-m48t59" ); + dev =qdev_new (OBJECT (machine),"nvram" ,"sysbus-m48t59" );qdev_prop_set_int32 (dev,"base-year" ,1968 ); s =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);memory_region_add_subregion (pci_address_space_io (ebus),0x2000 ,sysbus_mmio_get_region (s,0 )); nvram =NVRAM (dev);
@@ -689,10 +692,9 @@ static void sun4uv_init(MemoryRegion *address_space_mem, graphic_width, graphic_height, graphic_depth, (uint8_t *)&macaddr); - dev =qdev_new_orphan (TYPE_FW_CFG_IO ); + dev =qdev_new (OBJECT (ebus),TYPE_FW_CFG ,TYPE_FW_CFG_IO );qdev_prop_set_bit (dev,"dma_enabled" , false); -object_property_add_child (OBJECT (ebus),TYPE_FW_CFG ,OBJECT (dev)); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);memory_region_add_subregion (pci_address_space_io (ebus),BIOS_CFG_IOPORT , &FW_CFG_IO (dev)->comb_iomem);
Signature · 1 line
2.47.1
RFC PATCH 43/134 hw/sparc: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/sparc to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/sparc/leon3.c:295 | qdev_new | OBJECT(machine) | "ahb-pnp" | leon3_generic_hw_init() board init hw/sparc/leon3.c:302 | qdev_new | OBJECT(machine) | "apb-pnp" | leon3_generic_hw_init() board init hw/sparc/leon3.c:310 | qdev_new | OBJECT(machine) | "irqmp" | leon3_generic_hw_init() board init hw/sparc/leon3.c:409 | qdev_new | OBJECT(machine) | "gptimer" | leon3_generic_hw_init() board init hw/sparc/leon3.c:426 | qdev_new | OBJECT(machine) | "uart" | leon3_generic_hw_init() board init hw/sparc/sun4m.c:283 | qdev_new | parent | "iommu" | iommu_init() helper: thread Object *parent from board init hw/sparc/sun4m.c:305 | qdev_new | parent | "dma" | sparc32_dma_init() helper: thread Object *parent from board init hw/sparc/sun4m.c:350 | qdev_new | parent | "intctl" | slavio_intctl_init() helper: thread Object *parent from board init hw/sparc/sun4m.c:379 | qdev_new | parent | "timer" | slavio_timer_init_all() helper: thread Object *parent from board init hw/sparc/sun4m.c:417 | qdev_new | parent | "misc" | slavio_misc_init() helper: thread Object *parent from board init hw/sparc/sun4m.c:454 | qdev_new | parent | "ecc" | ecc_init() helper: thread Object *parent from board init hw/sparc/sun4m.c:470 | qdev_new | parent | "apc" | apc_init() helper: thread Object *parent from board init hw/sparc/sun4m.c:484 | qdev_new | parent | "tcx" | tcx_init() helper: thread Object *parent from board init hw/sparc/sun4m.c:536 | qdev_new | parent | "cgthree" | cg3_init() helper: thread Object *parent from board init hw/sparc/sun4m.c:565 | qdev_new | parent | "idreg" | idreg_init() helper: thread Object *parent from board init hw/sparc/sun4m.c:624 | qdev_new | parent | "afx" | afx_init() helper: thread Object *parent from board init hw/sparc/sun4m.c:681 | qdev_new | parent | "prom" | prom_init() helper: thread Object *parent from board init hw/sparc/sun4m.c:838 | qdev_new | OBJECT(machine) | "ram" | sun4m_hw_init() board init hw/sparc/sun4m.c:950 | qdev_new | OBJECT(machine) | "nvram" | sun4m_hw_init() board init hw/sparc/sun4m.c:962 | qdev_new | OBJECT(machine) | "escc-kbd" | sun4m_hw_init() board init; keyboard/mouse ESCC hw/sparc/sun4m.c:975 | qdev_new | OBJECT(machine) | "ms-kb-orgate" | sun4m_hw_init() board init; drop _and_unref hw/sparc/sun4m.c:982 | qdev_new | OBJECT(machine) | "escc-serial" | sun4m_hw_init() board init; serial ESCC hw/sparc/sun4m.c:996 | qdev_new | OBJECT(machine) | "serial-orgate" | sun4m_hw_init() board init; drop _and_unref
hw/sparc/sun4m.c:1022 | sysbus_create_simple | OBJECT(machine) | "cs4231" | sun4m_hw_init() board init hw/sparc/sun4m.c:1055 | qdev_new | OBJECT(machine) | TYPE_FW_CFG | collapse existing object_property_add_child(); keep name; drop _and_unref
--- hw/sparc/leon3.c | 22 ++++---- hw/sparc/sun4m.c | 142 ++++++++++++++++++++++++----------------------- 2 files changed, 85 insertions(+), 79 deletions(-)
hw/sparc/leon3.c +12 -10
@@ -292,25 +292,27 @@ static void leon3_generic_hw_init(MachineState *machine)qemu_register_reset (leon3_cpu_reset, &reset_info->info[i]); } - ahb_pnp =GRLIB_AHB_PNP (qdev_new_orphan (TYPE_GRLIB_AHB_PNP )); -sysbus_realize_and_unref (SYS_BUS_DEVICE (ahb_pnp), &error_fatal); + ahb_pnp =GRLIB_AHB_PNP (qdev_new (OBJECT (machine),"ahb-pnp" , +TYPE_GRLIB_AHB_PNP )); +sysbus_realize (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_orphan (TYPE_GRLIB_APB_PNP )); -sysbus_realize_and_unref (SYS_BUS_DEVICE (apb_pnp), &error_fatal); + apb_pnp =GRLIB_APB_PNP (qdev_new (OBJECT (machine),"apb-pnp" , +TYPE_GRLIB_APB_PNP )); +sysbus_realize (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 ,GRLIB_AHB_SLAVE ,GRLIB_AHBMEM_AREA );/* Allocate IRQ manager */ - irqmpdev =qdev_new_orphan (TYPE_GRLIB_IRQMP ); + irqmpdev =qdev_new (OBJECT (machine),"irqmp" ,TYPE_GRLIB_IRQMP );object_property_set_int (OBJECT (irqmpdev),"ncpus" , machine->smp.cpus, &error_fatal); -sysbus_realize_and_unref (SYS_BUS_DEVICE (irqmpdev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (irqmpdev), &error_fatal);for (i =0 ; i < machine->smp.cpus; i++) { cpu = reset_info->info[i].cpu;
@@ -406,11 +408,11 @@ static void leon3_generic_hw_init(MachineState *machine) }/* Allocate timers */ - dev =qdev_new_orphan (TYPE_GRLIB_GPTIMER ); + dev =qdev_new (OBJECT (machine),"gptimer" ,TYPE_GRLIB_GPTIMER );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 ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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++) {
@@ -423,9 +425,9 @@ static void leon3_generic_hw_init(MachineState *machine) 0, LEON3_TIMER_IRQ, GRLIB_APBIO_AREA);/* Allocate uart */ - dev =qdev_new_orphan (TYPE_GRLIB_APB_UART ); + dev =qdev_new (OBJECT (machine),"uart" ,TYPE_GRLIB_APB_UART );qdev_prop_set_chr (dev,"chrdev" ,serial_hd (0 )); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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 ,qdev_get_gpio_in (irqmpdev,LEON3_UART_IRQ ));
hw/sparc/sun4m.c +73 -69
408 lines not on this page · raw message
Signature · 1 line
2.47.1
RFC PATCH 44/134 hw/m68k: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/m68k to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/m68k/an5206.c:28 | qdev_new | parent | "mbar" | mcf5206_init() helper: thread Object *parent from board init hw/m68k/an5206.c:49 | cpu_create | OBJECT(machine) | "cpu" | an5206_init() board init hw/m68k/mcf5208.c:291 | cpu_create | OBJECT(machine) | "cpu" | mcf5208evb_init() board init hw/m68k/mcf_intc.c:214 | qdev_new | parent | "intc" | mcf_intc_init() global helper: add Object *parent, update header + caller
hw/m68k/next-cube.c:1263 | cpu_create | OBJECT(machine) | "cpu" | next_cube_init() board init hw/m68k/next-cube.c:1275 | qdev_new | OBJECT(machine) | "pc" | next_cube_init() board init; peripheral controller hw/m68k/next-cube.c:1283 | sysbus_create_simple | OBJECT(machine) | "fb" | next_cube_init() board init; framebuffer hw/m68k/next-cube.c:1322 | sysbus_create_simple | OBJECT(machine) | "kbd" | next_cube_init() board init hw/m68k/q800.c:358 | qdev_new | OBJECT(machine) | "adb-keyboard" | q800_machine_init() board init; drop _and_unref hw/m68k/q800.c:360 | qdev_new | OBJECT(machine) | "adb-mouse" | q800_machine_init() board init; drop _and_unref hw/m68k/virt.c:148 | cpu_create | OBJECT(machine) | "cpu" | virt_init() board init hw/m68k/virt.c:158 | qdev_new | OBJECT(machine) | "irqc" | virt_init() board init hw/m68k/virt.c:172 | qdev_new | OBJECT(machine) | "pic[*]" | virt_init() board init; loop hw/m68k/virt.c:186 | qdev_new | OBJECT(machine) | "rtc[*]" | virt_init() board init; loop hw/m68k/virt.c:197 | qdev_new | OBJECT(machine) | "tty" | virt_init() board init hw/m68k/virt.c:205 | sysbus_create_simple | OBJECT(machine) | "virt-ctrl" | virt_init() board init hw/m68k/virt.c:211 | qdev_new | OBJECT(machine) | "virtio-mmio[*]" | virt_init() board init; loop
--- hw/m68k/an5206.c | 11 ++++++----- hw/m68k/mcf5208.c | 4 ++-- hw/m68k/mcf_intc.c | 7 ++++--- hw/m68k/next-cube.c | 10 +++++----- hw/m68k/q800.c | 8 ++++---- hw/m68k/virt.c | 25 +++++++++++++------------ include/hw/m68k/mcf.h | 2 +- 7 files changed, 35 insertions(+), 32 deletions(-)
hw/m68k/an5206.c +6 -5
@@ -20,16 +20,17 @@#define AN5206_MBAR_ADDR 0x10000000#define AN5206_RAMBAR_ADDR 0x20000000 -static void mcf5206_init (M68kCPU *cpu,MemoryRegion *sysmem,uint32_t base) +static void mcf5206_init (Object *parent,M68kCPU *cpu,MemoryRegion *sysmem, +uint32_t base) {DeviceState *dev;SysBusDevice *s; - dev =qdev_new_orphan (TYPE_MCF5206_MBAR ); + dev =qdev_new (parent,"mbar" ,TYPE_MCF5206_MBAR );object_property_set_link (OBJECT (dev),"m68k-cpu" ,OBJECT (cpu), &error_abort); s =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);memory_region_add_subregion (sysmem, base,sysbus_mmio_get_region (s,0 )); }
@@ -46,7 +47,7 @@ static void an5206_init(MachineState *machine)MemoryRegion *address_space_mem =get_system_memory ();MemoryRegion *sram =g_new (MemoryRegion,1 ); - cpu =M68K_CPU (cpu_create_orphan (machine->cpu_type)); + cpu =M68K_CPU (cpu_create (OBJECT (machine),"cpu" , machine->cpu_type)); env = &cpu->env;/* Initialize CPU registers. */
@@ -62,7 +63,7 @@ static void an5206_init(MachineState *machine)memory_region_init_ram (sram,NULL ,"an5206.sram" ,512 , &error_fatal);memory_region_add_subregion (address_space_mem,AN5206_RAMBAR_ADDR , sram); -mcf5206_init (cpu, address_space_mem,AN5206_MBAR_ADDR ); +mcf5206_init (OBJECT (machine), cpu, address_space_mem,AN5206_MBAR_ADDR );/* Load kernel. */ if (!kernel_filename) {
hw/m68k/mcf5208.c +2 -2
@@ -288,7 +288,7 @@ static void mcf5208evb_init(MachineState *machine)MemoryRegion *sram =g_new (MemoryRegion,1 );DeviceState *intc; - cpu =M68K_CPU (cpu_create_orphan (machine->cpu_type)); + cpu =M68K_CPU (cpu_create (OBJECT (machine),"cpu" , machine->cpu_type)); env = &cpu->env;/* Initialize CPU registers. */
@@ -307,7 +307,7 @@ static void mcf5208evb_init(MachineState *machine)memory_region_add_subregion (address_space_mem,0x80000000 , sram);/* Internal peripherals. */ - intc =mcf_intc_init (address_space_mem,0xfc048000 , cpu); + intc =mcf_intc_init (OBJECT (machine), address_space_mem,0xfc048000 , cpu);mcf_uart_create_mmap (0xfc060000 ,qdev_get_gpio_in (intc,26 ),serial_hd (0 ));mcf_uart_create_mmap (0xfc064000 ,qdev_get_gpio_in (intc,27 ),serial_hd (1 ));
hw/m68k/mcf_intc.c +4 -3
@@ -207,14 +207,15 @@ static void mcf_intc_register_types(void)type_init (mcf_intc_register_types) -DeviceState *mcf_intc_init(MemoryRegion *sysmem, hwaddr base, M68kCPU *cpu) +DeviceState *mcf_intc_init(Object *parent, MemoryRegion *sysmem, hwaddr base, +M68kCPU *cpu) {DeviceState *dev; - dev =qdev_new_orphan (TYPE_MCF_INTC ); + dev =qdev_new (parent,"intc" ,TYPE_MCF_INTC );object_property_set_link (OBJECT (dev),"m68k-cpu" ,OBJECT (cpu), &error_abort); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);memory_region_add_subregion (sysmem, base,sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 ));return dev;
hw/m68k/next-cube.c +5 -5
@@ -1260,7 +1260,7 @@ static void next_cube_init(MachineState *machine)DeviceState *pcdev;/* Initialize the cpu core */ - cpu =M68K_CPU (cpu_create_orphan (machine->cpu_type)); + cpu =M68K_CPU (cpu_create (OBJECT (machine),"cpu" , machine->cpu_type));if (!cpu) {error_report ("Unable to find m68k CPU definition" );exit (1 );
@@ -1272,15 +1272,15 @@ static void next_cube_init(MachineState *machine) env->sr =0x2700 ;/* Peripheral Controller */ - pcdev =qdev_new_orphan (TYPE_NEXT_PC ); + pcdev =qdev_new (OBJECT (machine),"pc" ,TYPE_NEXT_PC );object_property_set_link (OBJECT (pcdev),"cpu" ,OBJECT (cpu), &error_abort); -sysbus_realize_and_unref (SYS_BUS_DEVICE (pcdev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (pcdev), &error_fatal);/* 64MB RAM starting at 0x04000000 */ memory_region_add_subregion (sysmem,0x04000000 , machine->ram);/* Framebuffer */ -sysbus_create_simple_orphan (TYPE_NEXTFB ,0x0B000000 ,NULL ); +sysbus_create_simple (OBJECT (machine),"fb" ,TYPE_NEXTFB ,0x0B000000 ,NULL );/* MMIO */ sysbus_mmio_map (SYS_BUS_DEVICE (pcdev),0 ,0x02005000 );
@@ -1319,7 +1319,7 @@ static void next_cube_init(MachineState *machine)memory_region_add_subregion (sysmem,0x820c0000 , &m->bmapm2);/* KBD */ -sysbus_create_simple_orphan (TYPE_NEXTKBD ,0x0200e000 ,NULL ); +sysbus_create_simple (OBJECT (machine),"kbd" ,TYPE_NEXTKBD ,0x0200e000 ,NULL );/* Load ROM here */ memory_region_init_rom (&m->rom,NULL ,"next.rom" ,0x20000 , &error_fatal);
hw/m68k/q800.c +4 -4
@@ -355,10 +355,10 @@ static void q800_machine_init(MachineState *machine) "auxmode", 0)); adb_bus =qdev_get_child_bus (DEVICE (&m->via1),"adb.0" ); - dev =qdev_new_orphan (TYPE_ADB_KEYBOARD ); -qdev_realize_and_unref (dev, adb_bus, &error_fatal); - dev =qdev_new_orphan (TYPE_ADB_MOUSE ); -qdev_realize_and_unref (dev, adb_bus, &error_fatal); + dev =qdev_new (OBJECT (machine),"adb-keyboard" ,TYPE_ADB_KEYBOARD ); +qdev_realize (dev, adb_bus, &error_fatal); + dev =qdev_new (OBJECT (machine),"adb-mouse" ,TYPE_ADB_MOUSE ); +qdev_realize (dev, adb_bus, &error_fatal);/* VIA 2 */ object_initialize_child(OBJECT(machine), "via2", &m->via2,
hw/m68k/virt.c +13 -12
@@ -145,7 +145,7 @@ static void virt_init(MachineState *machine) reset_info =g_new0 (ResetInfo,1 );/* init CPUs */ - cpu =M68K_CPU (cpu_create_orphan (machine->cpu_type)); + cpu =M68K_CPU (cpu_create (OBJECT (machine),"cpu" , machine->cpu_type)); reset_info->cpu = cpu;qemu_register_reset (main_cpu_reset, reset_info);
@@ -155,10 +155,10 @@ static void virt_init(MachineState *machine)/* IRQ Controller */ - irqc_dev =qdev_new_orphan (TYPE_M68K_IRQC ); + irqc_dev =qdev_new (OBJECT (machine),"irqc" ,TYPE_M68K_IRQC );object_property_set_link (OBJECT (irqc_dev),"m68k-cpu" ,OBJECT (cpu), &error_abort); -sysbus_realize_and_unref (SYS_BUS_DEVICE (irqc_dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (irqc_dev), &error_fatal);/* * 6 goldfish-pic
@@ -169,10 +169,10 @@ static void virt_init(MachineState *machine)*/ io_base =VIRT_GF_PIC_MMIO_BASE ;for (i =0 ; i <VIRT_GF_PIC_NB ; i++) { - pic_dev[i] =qdev_new_orphan (TYPE_GOLDFISH_PIC ); + pic_dev[i] =qdev_new (OBJECT (machine),"pic[*]" ,TYPE_GOLDFISH_PIC ); sysbus =SYS_BUS_DEVICE (pic_dev[i]);qdev_prop_set_uint8 (pic_dev[i],"index" , i); -sysbus_realize_and_unref (sysbus, &error_fatal); +sysbus_realize (sysbus, &error_fatal);sysbus_mmio_map (sysbus,0 , io_base);sysbus_connect_irq (sysbus,0 ,qdev_get_gpio_in (irqc_dev, i));
@@ -183,10 +183,10 @@ static void virt_init(MachineState *machine)/* goldfish-rtc */ io_base =VIRT_GF_RTC_MMIO_BASE ;for (i =0 ; i <VIRT_GF_RTC_NB ; i++) { - dev =qdev_new_orphan (TYPE_GOLDFISH_RTC ); + dev =qdev_new (OBJECT (machine),"rtc[*]" ,TYPE_GOLDFISH_RTC );qdev_prop_set_bit (dev,"big-endian" , true); sysbus =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (sysbus, &error_fatal); +sysbus_realize (sysbus, &error_fatal);sysbus_mmio_map (sysbus,0 , io_base);sysbus_connect_irq (sysbus,0 ,PIC_GPIO (VIRT_GF_RTC_IRQ_BASE + i));
@@ -194,24 +194,25 @@ static void virt_init(MachineState *machine) }/* goldfish-tty */ - dev =qdev_new_orphan (TYPE_GOLDFISH_TTY ); + dev =qdev_new (OBJECT (machine),"tty" ,TYPE_GOLDFISH_TTY ); sysbus =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" ,serial_hd (0 )); -sysbus_realize_and_unref (sysbus, &error_fatal); +sysbus_realize (sysbus, &error_fatal);sysbus_mmio_map (sysbus,0 ,VIRT_GF_TTY_MMIO_BASE );sysbus_connect_irq (sysbus,0 ,PIC_GPIO (VIRT_GF_TTY_IRQ_BASE ));/* virt controller */ - dev =sysbus_create_simple_orphan (TYPE_VIRT_CTRL ,VIRT_CTRL_MMIO_BASE , + dev =sysbus_create_simple (OBJECT (machine),"virt-ctrl" ,TYPE_VIRT_CTRL , +VIRT_CTRL_MMIO_BASE ,PIC_GPIO (VIRT_CTRL_IRQ_BASE ));/* virtio-mmio */ io_base =VIRT_VIRTIO_MMIO_BASE ;for (i =0 ; i <128 ; i++) { - dev =qdev_new_orphan (TYPE_VIRTIO_MMIO ); + dev =qdev_new (OBJECT (machine),"virtio-mmio[*]" ,TYPE_VIRTIO_MMIO );qdev_prop_set_bit (dev,"force-legacy" , false); sysbus =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (sysbus, &error_fatal); +sysbus_realize (sysbus, &error_fatal);sysbus_connect_irq (sysbus,0 ,PIC_GPIO (VIRT_VIRTIO_IRQ_BASE + i));sysbus_mmio_map (sysbus,0 , io_base); io_base +=0x200 ;
include/hw/m68k/mcf.h +1 -1
@@ -14,7 +14,7 @@ DeviceState *mcf_uart_create(qemu_irq irq, Chardev *chr);DeviceState *mcf_uart_create_mmap (hwaddr base,qemu_irq irq,Chardev *chr);/* mcf_intc.c */ -DeviceState *mcf_intc_init (struct MemoryRegion *sysmem, +DeviceState *mcf_intc_init (Object *parent,struct MemoryRegion *sysmem,hwaddr base,M68kCPU *cpu);/* mcf5206.c */
Signature · 1 line
2.47.1
RFC PATCH 45/134 hw/rtc: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/rtc to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/rtc/mc146818rtc.c:933 | isa_new | parent | "rtc" | helper called from board init; thread Object *parent through mc146818_rtc_init() and its 4 callers (microvm, pnv, jazz, dp264) hw/rtc/sun4v-rtc.c:60 | qdev_new | parent | "rtc" | helper called from niagara board init; thread Object *parent through sun4v_rtc_init()
--- hw/alpha/dp264.c | 2 +- hw/i386/microvm.c | 3 ++- hw/mips/jazz.c | 2 +- hw/ppc/pnv.c | 2 +- hw/rtc/mc146818rtc.c | 6 +++--- hw/rtc/sun4v-rtc.c | 6 +++--- hw/sparc64/niagara.c | 2 +- include/hw/rtc/mc146818rtc.h | 2 +- include/hw/rtc/sun4v-rtc.h | 2 +- 9 files changed, 14 insertions(+), 13 deletions(-)
hw/alpha/dp264.c +1 -1
@@ -119,7 +119,7 @@ static void clipper_init(MachineState *machine)qdev_connect_gpio_out (i82378_dev,0 , isa_irq);/* Since we have an SRM-compatible PALcode, use the SRM epoch. */ -mc146818_rtc_init (isa_bus,1900 , rtc_irq); +mc146818_rtc_init (mo, isa_bus,1900 , rtc_irq);/* VGA setup. Don't bother loading the bios. */ pci_vga_init (pci_bus);
hw/i386/microvm.c +2 -1
@@ -268,7 +268,8 @@ static void microvm_devices_init(MicrovmMachineState *mms)if (mms->rtc ==ON_OFF_AUTO_ON || (mms->rtc ==ON_OFF_AUTO_AUTO && !kvm_enabled ())) { -microvm_set_rtc (mms,mc146818_rtc_init (isa_bus,2000 ,NULL )); +microvm_set_rtc (mms,mc146818_rtc_init (OBJECT (mms), isa_bus, +2000 ,NULL )); }if (mms->isa_serial) {
hw/mips/jazz.c +1 -1
@@ -354,7 +354,7 @@ static void mips_jazz_init(MachineState *machine,fdctrl_init_sysbus (qdev_get_gpio_in (rc4030,1 ),0x80003000 , fds);/* Real time clock */ -mc146818_rtc_init (isa_bus,1980 ,NULL ); +mc146818_rtc_init (OBJECT (machine), isa_bus,1980 ,NULL );memory_region_init_io (rtc,NULL , &rtc_ops,NULL ,"rtc" ,0x1000 );memory_region_add_subregion (address_space,0x80004000 , rtc);
hw/ppc/pnv.c +1 -1
@@ -1314,7 +1314,7 @@ static void pnv_init(MachineState *machine)serial_hds_isa_init (pnv->isa_bus,0 ,MAX_ISA_SERIAL_PORTS );/* Create an RTC ISA device too */ -mc146818_rtc_init (pnv->isa_bus,2000 ,NULL ); +mc146818_rtc_init (OBJECT (machine), pnv->isa_bus,2000 ,NULL );/* * Create the machine BMC simulator and the IPMI BT device for
hw/rtc/mc146818rtc.c +3 -3
@@ -923,18 +923,18 @@ static void rtc_realizefn(DeviceState *dev, Error **errp)qdev_init_gpio_out (dev, &s->irq,1 ); } -MC146818RtcState *mc146818_rtc_init (ISABus *bus,int base_year, +MC146818RtcState *mc146818_rtc_init (Object *parent,ISABus *bus,int base_year,qemu_irq intercept_irq) {DeviceState *dev;ISADevice *isadev;MC146818RtcState *s; - isadev =isa_new_orphan (TYPE_MC146818_RTC ); + isadev =isa_new (parent,"rtc[*]" ,TYPE_MC146818_RTC ); dev =DEVICE (isadev); s =MC146818_RTC (isadev);qdev_prop_set_int32 (dev,"base_year" , base_year); -isa_realize_and_unref (isadev, bus, &error_fatal); +qdev_realize (dev,BUS (bus), &error_fatal);if (intercept_irq) {qdev_connect_gpio_out (dev,0 , intercept_irq); }else {
hw/rtc/sun4v-rtc.c +3 -3
@@ -52,15 +52,15 @@ static const MemoryRegionOps sun4v_rtc_ops = { .endianness = DEVICE_BIG_ENDIAN, }; -void sun4v_rtc_init (hwaddr addr) +void sun4v_rtc_init (Object *parent,hwaddr addr) {DeviceState *dev;SysBusDevice *s; - dev =qdev_new_orphan (TYPE_SUN4V_RTC ); + dev =qdev_new (parent,"rtc" ,TYPE_SUN4V_RTC ); s =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);sysbus_mmio_map (s,0 , addr); }
hw/sparc64/niagara.c +1 -1
@@ -154,7 +154,7 @@ static void niagara_init(MachineState *machine)serial_mm_init (sysmem,NIAGARA_UART_BASE ,0 ,NULL ,115200 ,serial_hd (0 ),DEVICE_BIG_ENDIAN );create_unimplemented_device ("sun4v-iob" ,NIAGARA_IOBBASE ,NIAGARA_IOBSIZE ); -sun4v_rtc_init (NIAGARA_RTC_BASE ); +sun4v_rtc_init (OBJECT (machine),NIAGARA_RTC_BASE ); }static void niagara_class_init (ObjectClass *oc,const void *data)
include/hw/rtc/mc146818rtc.h +1 -1
@@ -51,7 +51,7 @@ struct MC146818RtcState {#define RTC_ISA_IRQ 8 -MC146818RtcState *mc146818_rtc_init (ISABus *bus,int base_year, +MC146818RtcState *mc146818_rtc_init (Object *parent,ISABus *bus,int base_year,qemu_irq intercept_irq);void mc146818rtc_set_cmos_data (MC146818RtcState *s,int addr,int val);int mc146818rtc_get_cmos_data (MC146818RtcState *s,int addr);
include/hw/rtc/sun4v-rtc.h +1 -1
@@ -14,6 +14,6 @@#include "exec/hwaddr.h" -void sun4v_rtc_init (hwaddr addr); +void sun4v_rtc_init (Object *parent,hwaddr addr);#endif
Signature · 1 line
2.47.1
RFC PATCH 46/134 hw/i2c: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/i2c to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/i2c/aspeed_i2c.c:1521 | i2c_slave_create_simple | OBJECT(s) | "slave" | inside AspeedI2CBus DeviceClass.realize(); slave belongs to the bus device
hw/i2c/core.c:367 | - | ORPHAN-JUSTIFIED | - | i2c_slave_new_orphan() is the orphan-API implementation itself; parented sibling already exists at :376 hw/i2c/core.c:371 | - | ORPHAN-JUSTIFIED | - | body of i2c_slave_new_orphan(); intentional orphan wrapper hw/i2c/core.c:401 | - | ORPHAN-JUSTIFIED | - | i2c_slave_create_simple_orphan() is the orphan-API implementation itself; parented sibling already exists at :386 hw/i2c/core.c:403 | - | ORPHAN-JUSTIFIED | - | body of i2c_slave_create_simple_orphan(); intentional orphan wrapper
hw/i2c/smbus_eeprom.c:167 | qdev_new | parent | "eeprom[*]" | helper called from many board inits; thread Object *parent through smbus_eeprom_init_one() and smbus_eeprom_init() and update all 17 callers
--- hw/arm/aspeed_ast1040_evb.c | 3 ++- hw/arm/aspeed_ast10x0_evb.c | 3 ++- hw/arm/aspeed_ast2400_palmetto.c | 2 +- hw/arm/aspeed_ast2400_supermicrox11.c | 2 +- hw/arm/aspeed_ast2500_evb.c | 2 +- hw/arm/aspeed_ast2500_g220a.c | 2 +- hw/arm/aspeed_ast2500_supermicro-x11spi.c | 2 +- hw/arm/aspeed_ast2500_witherspoon.c | 2 +- hw/arm/aspeed_ast2600_evb.c | 2 +- hw/i2c/aspeed_i2c.c | 4 ++-- hw/i2c/smbus_eeprom.c | 11 ++++++----- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- hw/mips/fuloong2e.c | 2 +- hw/mips/malta.c | 2 +- hw/ppc/amigaone.c | 4 ++-- hw/ppc/pegasos.c | 2 +- hw/ppc/sam460ex.c | 2 +- include/hw/i2c/smbus_eeprom.h | 5 +++-- 19 files changed, 30 insertions(+), 26 deletions(-)
hw/arm/aspeed_ast1040_evb.c +2 -1
@@ -54,7 +54,8 @@ static void ast1040_evb_i2c_init(AspeedMachineState *bmc)AspeedSoCState *soc = bmc->soc;uint8_t *eeprom_buf =g_malloc0 (256 ); -smbus_eeprom_init_one (aspeed_i2c_get_bus (&soc->i2c,0 ),0x50 , eeprom_buf); +smbus_eeprom_init_one (OBJECT (bmc),aspeed_i2c_get_bus (&soc->i2c,0 ),0x50 , + eeprom_buf);i2c_slave_create_simple_orphan (aspeed_i2c_get_bus (&soc->i2c,1 ),"tmp105" ,0x4d ); }
hw/arm/aspeed_ast10x0_evb.c +2 -1
@@ -70,7 +70,8 @@ static void ast1030_evb_i2c_init(AspeedMachineState *bmc)/* U10 24C08 connects to SDA/SCL Group 1 by default */ uint8_t *eeprom_buf =g_malloc0 (32 *1024 ); -smbus_eeprom_init_one (aspeed_i2c_get_bus (&soc->i2c,0 ),0x50 , eeprom_buf); +smbus_eeprom_init_one (OBJECT (bmc),aspeed_i2c_get_bus (&soc->i2c,0 ),0x50 , + eeprom_buf);/* U11 LM75 connects to SDA/SCL Group 2 by default */ i2c_slave_create_simple_orphan (aspeed_i2c_get_bus (&soc->i2c,1 ),"tmp105" ,0x4d );
hw/arm/aspeed_ast2400_palmetto.c +1 -1
@@ -39,7 +39,7 @@ static void palmetto_bmc_i2c_init(AspeedMachineState *bmc)*/ i2c_slave_create_simple_orphan (aspeed_i2c_get_bus (&soc->i2c,0 ),"ds1338" ,0x68 ); -smbus_eeprom_init_one (aspeed_i2c_get_bus (&soc->i2c,0 ),0x50 , +smbus_eeprom_init_one (OBJECT (bmc),aspeed_i2c_get_bus (&soc->i2c,0 ),0x50 , eeprom_buf);/* add a TMP423 temperature sensor */
hw/arm/aspeed_ast2400_supermicrox11.c +1 -1
@@ -39,7 +39,7 @@ static void supermicrox11_bmc_i2c_init(AspeedMachineState *bmc)*/ i2c_slave_create_simple_orphan (aspeed_i2c_get_bus (&soc->i2c,0 ),"ds1338" ,0x68 ); -smbus_eeprom_init_one (aspeed_i2c_get_bus (&soc->i2c,0 ),0x50 , +smbus_eeprom_init_one (OBJECT (bmc),aspeed_i2c_get_bus (&soc->i2c,0 ),0x50 , eeprom_buf);/* add a TMP423 temperature sensor */
hw/arm/aspeed_ast2500_evb.c +1 -1
@@ -30,7 +30,7 @@ static void ast2500_evb_i2c_init(AspeedMachineState *bmc)AspeedSoCState *soc = bmc->soc;uint8_t *eeprom_buf =g_malloc0 (8 *1024 ); -smbus_eeprom_init_one (aspeed_i2c_get_bus (&soc->i2c,3 ),0x50 , +smbus_eeprom_init_one (OBJECT (bmc),aspeed_i2c_get_bus (&soc->i2c,3 ),0x50 , eeprom_buf);/* The AST2500 EVB expects a LM75 but a TMP105 is compatible */
hw/arm/aspeed_ast2500_g220a.c +1 -1
@@ -59,7 +59,7 @@ static void g220a_bmc_i2c_init(AspeedMachineState *bmc)0x46 ,0x46 ,0xc4 ,0x48 ,0x48 ,0x47 ,0x47 ,0xc1 , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa7, }; -smbus_eeprom_init_one (aspeed_i2c_get_bus (&soc->i2c,4 ),0x57 , +smbus_eeprom_init_one (OBJECT (bmc),aspeed_i2c_get_bus (&soc->i2c,4 ),0x57 , eeprom_buf); }
hw/arm/aspeed_ast2500_supermicro-x11spi.c +1 -1
@@ -35,7 +35,7 @@ static void supermicro_x11spi_bmc_i2c_init(AspeedMachineState *bmc)*/ i2c_slave_create_simple_orphan (aspeed_i2c_get_bus (&soc->i2c,0 ),"ds1338" ,0x68 ); -smbus_eeprom_init_one (aspeed_i2c_get_bus (&soc->i2c,0 ),0x50 , +smbus_eeprom_init_one (OBJECT (bmc),aspeed_i2c_get_bus (&soc->i2c,0 ),0x50 , eeprom_buf);/* add a TMP423 temperature sensor */
hw/arm/aspeed_ast2500_witherspoon.c +1 -1
@@ -73,7 +73,7 @@ static void witherspoon_bmc_i2c_init(AspeedMachineState *bmc)*/ i2c_slave_create_simple_orphan (aspeed_i2c_get_bus (&soc->i2c,11 ),"ds1338" ,0x32 ); -smbus_eeprom_init_one (aspeed_i2c_get_bus (&soc->i2c,11 ),0x51 , +smbus_eeprom_init_one (OBJECT (bmc),aspeed_i2c_get_bus (&soc->i2c,11 ),0x51 , eeprom_buf); dev =DEVICE (i2c_slave_new_orphan (TYPE_PCA9552 ,0x60 ));qdev_prop_set_string (dev,"description" ,"pca0" );
hw/arm/aspeed_ast2600_evb.c +1 -1
@@ -23,7 +23,7 @@ static void ast2600_evb_i2c_init(AspeedMachineState *bmc)AspeedSoCState *soc = bmc->soc;uint8_t *eeprom_buf =g_malloc0 (8 *1024 ); -smbus_eeprom_init_one (aspeed_i2c_get_bus (&soc->i2c,7 ),0x50 , +smbus_eeprom_init_one (OBJECT (bmc),aspeed_i2c_get_bus (&soc->i2c,7 ),0x50 , eeprom_buf);/* LM75 is compatible with TMP105 driver */
hw/i2c/aspeed_i2c.c +2 -2
@@ -1518,8 +1518,8 @@ static void aspeed_i2c_bus_realize(DeviceState *dev, Error **errp)sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->irq); s->bus =i2c_init_bus (dev, s->name); - s->slave =i2c_slave_create_simple_orphan (s->bus,TYPE_ASPEED_I2C_BUS_SLAVE , -0xff ); + s->slave =i2c_slave_create_simple (OBJECT (s),"slave" , s->bus, +TYPE_ASPEED_I2C_BUS_SLAVE ,0xff );memory_region_init_io (&s->mr,OBJECT (s), &aspeed_i2c_bus_ops, s, s->name, aic->reg_size);
hw/i2c/smbus_eeprom.c +6 -5
@@ -160,18 +160,19 @@ static const TypeInfo smbus_eeprom_types[] = {DEFINE_TYPES (smbus_eeprom_types) -void smbus_eeprom_init_one(I2CBus *smbus, uint8_t address, uint8_t *eeprom_buf) +void smbus_eeprom_init_one(Object *parent, I2CBus *smbus, uint8_t address, +uint8_t *eeprom_buf) {DeviceState *dev; - dev =qdev_new_orphan (TYPE_SMBUS_EEPROM ); + dev =qdev_new (parent,"eeprom[*]" ,TYPE_SMBUS_EEPROM );qdev_prop_set_uint8 (dev,"address" , address);/* FIXME: use an array of byte or block backend property? */ SMBUS_EEPROM (dev)->init_data = eeprom_buf; -qdev_realize_and_unref (dev, (BusState *)smbus, &error_fatal); +qdev_realize (dev, (BusState *)smbus, &error_fatal); } -void smbus_eeprom_init (I2CBus *smbus,int nb_eeprom, +void smbus_eeprom_init (Object *parent,I2CBus *smbus,int nb_eeprom,const uint8_t *eeprom_spd,int eeprom_spd_size) {int i;
@@ -184,7 +185,7 @@ void smbus_eeprom_init(I2CBus *smbus, int nb_eeprom, }for (i =0 ; i < nb_eeprom; i++) { -smbus_eeprom_init_one (smbus,0x50 + i, +smbus_eeprom_init_one (parent, smbus,0x50 + i, eeprom_buf + (i *SMBUS_EEPROM_SIZE )); } }
hw/i386/pc_piix.c +1 -1
@@ -304,7 +304,7 @@ static void pc_init1(MachineState *machine, const char *pci_type)qdev_connect_gpio_out_named (DEVICE (piix4_pm),"smi-irq" ,0 , smi_irq); pcms->smbus =I2C_BUS (qdev_get_child_bus (DEVICE (piix4_pm),"i2c" ));/* TODO: Populate SPD eeprom data. */ -smbus_eeprom_init (pcms->smbus,8 ,NULL ,0 ); +smbus_eeprom_init (OBJECT (machine), pcms->smbus,8 ,NULL ,0 ); object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP, TYPE_HOTPLUG_HANDLER,
hw/i386/pc_q35.c +1 -1
@@ -317,7 +317,7 @@ static void pc_q35_init(MachineState *machine) TYPE_ICH9_SMB_DEVICE); pcms->smbus =I2C_BUS (qdev_get_child_bus (DEVICE (smb),"i2c" )); -smbus_eeprom_init (pcms->smbus,8 ,NULL ,0 ); +smbus_eeprom_init (OBJECT (machine), pcms->smbus,8 ,NULL ,0 ); }/* the rest devices to which pci devfn is automatically assigned */
hw/mips/fuloong2e.c +1 -1
@@ -322,7 +322,7 @@ static void mips_fuloong2e_init(MachineState *machine)/* Populate SPD eeprom data */ spd_data =spd_data_generate (DDR , machine->ram_size); -smbus_eeprom_init_one (smbus,0x50 , spd_data); +smbus_eeprom_init_one (OBJECT (machine), smbus,0x50 , spd_data);/* Network card: RTL8139D */ network_init (pci_bus);
hw/mips/malta.c +1 -1
@@ -1249,7 +1249,7 @@ void mips_malta_init(MachineState *machine) smbus =I2C_BUS (qdev_get_child_bus (dev,"i2c" ));generate_eeprom_spd (&smbus_eeprom_buf[0 *256 ], ram_size);generate_eeprom_serial (&smbus_eeprom_buf[6 *256 ]); -smbus_eeprom_init (smbus,8 , smbus_eeprom_buf, smbus_eeprom_size); +smbus_eeprom_init (OBJECT (machine), smbus,8 , smbus_eeprom_buf, smbus_eeprom_size);g_free (smbus_eeprom_buf);/* Super I/O: SMS FDC37M817 */
hw/ppc/amigaone.c +2 -2
@@ -338,9 +338,9 @@ static void amigaone_init(MachineState *machine) spd_data =spd_data_generate (SDR , machine->ram_size); }fix_spd_data (spd_data); -smbus_eeprom_init_one (i2c_bus,0x51 , spd_data); +smbus_eeprom_init_one (OBJECT (machine), i2c_bus,0x51 , spd_data);if (machine->ram_size >512 * MiB) { -smbus_eeprom_init_one (i2c_bus,0x52 , spd_data); +smbus_eeprom_init_one (OBJECT (machine), i2c_bus,0x52 , spd_data); } pci_mem =sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),1 );
hw/ppc/pegasos.c +1 -1
@@ -261,7 +261,7 @@ static void pegasos_init(MachineState *machine) dev =PCI_DEVICE (object_resolve_path_component (via,"pm" )); i2c_bus =I2C_BUS (qdev_get_child_bus (DEVICE (dev),"i2c" )); spd_data =spd_data_generate (DDR , machine->ram_size); -smbus_eeprom_init_one (i2c_bus,0x57 , spd_data); +smbus_eeprom_init_one (OBJECT (machine), i2c_bus,0x57 , spd_data);/* other PC hardware */ pci_vga_init (pci_bus);
hw/ppc/sam460ex.c +1 -1
@@ -343,7 +343,7 @@ static void sam460ex_init(MachineState *machine) spd_data =spd_data_generate (machine->ram_size <128 * MiB ?DDR :DDR2 , machine->ram_size); spd_data[20 ] =4 ;/* SO-DIMM module */ -smbus_eeprom_init_one (i2c,0x50 , spd_data); +smbus_eeprom_init_one (OBJECT (machine), i2c,0x50 , spd_data);/* RTC */ i2c_slave_create_simple_orphan (i2c,"m41t80" ,0x68 );
include/hw/i2c/smbus_eeprom.h +3 -2
@@ -26,8 +26,9 @@#include "system/ram_addr.h" #include "hw/i2c/i2c.h" -void smbus_eeprom_init_one (I2CBus *bus,uint8_t address,uint8_t *eeprom_buf); -void smbus_eeprom_init (I2CBus *bus,int nb_eeprom, +void smbus_eeprom_init_one (Object *parent,I2CBus *bus,uint8_t address, +uint8_t *eeprom_buf); +void smbus_eeprom_init (Object *parent,I2CBus *bus,int nb_eeprom,const uint8_t *eeprom_spd,int size);enum sdram_type {SDR =0x4 ,DDR =0x7 ,DDR2 =0x8 };
Signature · 1 line
2.47.1
RFC PATCH 47/134 hw/block: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/block to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/block/fdc-sysbus.c:105 | qdev_new | parent | "fdc" | helper called from mips_jazz board init; thread Object *parent through fdctrl_init_sysbus() hw/block/fdc-sysbus.c:121 | qdev_new | parent | "fdc" | helper called from sun4m board init; thread Object *parent through sun4m_fdctrl_init()
hw/block/fdc.c:2332 | qdev_new | OBJECT(bus->bus.parent) | "floppy[*]" | drive is child of the FDC device that owns the FloppyBushw/block/pflash_cfi01.c:961 | qdev_new | parent | name | helper already receives QOM name; thread Object *parent through pflash_cfi01_register() and its 9 board callers hw/block/pflash_cfi02.c:1008 | qdev_new | parent | name | helper already receives QOM name; thread Object *parent through pflash_cfi02_register() and its 4 board callers hw/block/xen-block.c:1077 | qdev_new_orphan | ORPHAN-JUSTIFIED | - | XenBackend .create() callback; hotplugged device analogous to qdev_device_add() path, parented later on realize into xenbus
--- hw/arm/collie.c | 2 +- hw/arm/digic_boards.c | 2 +- hw/arm/musicpal.c | 3 ++- hw/arm/omap_sx1.c | 4 ++-- hw/arm/versatilepb.c | 2 +- hw/arm/xilinx_zynq.c | 2 +- hw/block/fdc-sysbus.c | 13 +++++++------ hw/block/fdc.c | 4 ++-- hw/block/pflash_cfi01.c | 6 +++--- hw/block/pflash_cfi02.c | 6 +++--- hw/microblaze/petalogix_ml605_mmu.c | 3 ++- hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- hw/mips/jazz.c | 3 ++- hw/mips/malta.c | 2 +- hw/ppc/sam460ex.c | 7 ++++--- hw/ppc/virtex_ml507.c | 2 +- hw/sh4/r2d.c | 2 +- hw/sparc/sun4m.c | 2 +- include/hw/block/fdc.h | 5 +++-- include/hw/block/flash.h | 4 ++-- 20 files changed, 41 insertions(+), 35 deletions(-)
hw/arm/collie.c +1 -1
@@ -58,7 +58,7 @@ static void collie_init(MachineState *machine)for (unsigned i =0 ; i <2 ; i++) {DriveInfo *dinfo =drive_get (IF_PFLASH ,0 , i); -pflash_cfi01_register (i ?SA_CS1 :SA_CS0 , +pflash_cfi01_register (OBJECT (machine), i ?SA_CS1 :SA_CS0 , i ?"collie.fl2" :"collie.fl1" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,FLASH_SECTOR_SIZE ,4 ,0x00 ,0x00 ,0x00 ,0x00 ,0 );
hw/arm/digic_boards.c +1 -1
@@ -117,7 +117,7 @@ static void digic4_add_k8p3215uqb_rom(DigicState *s, hwaddr addr,#define FLASH_K8P3215UQB_SIZE (4 * 1024 * 1024)#define FLASH_K8P3215UQB_SECTOR_SIZE (64 * 1024) - pflash_cfi02_register(addr, "pflash", FLASH_K8P3215UQB_SIZE, + pflash_cfi02_register(OBJECT(s), addr, "pflash", FLASH_K8P3215UQB_SIZE, NULL, FLASH_K8P3215UQB_SECTOR_SIZE, DIGIC4_ROM_MAX_SIZE / FLASH_K8P3215UQB_SIZE, 4,
hw/arm/musicpal.c +2 -1
@@ -1279,7 +1279,8 @@ static void musicpal_init(MachineState *machine)* 0xFF800000 (if there is 8 MB flash). So remap flash access if the * image is smaller than 32 MB. */ - pflash_cfi02_register(0x100000000ULL - MP_FLASH_SIZE_MAX, + pflash_cfi02_register(OBJECT(machine), + 0x100000000ULL - MP_FLASH_SIZE_MAX, "musicpal.flash", flash_size, blk, FLASH_SECTOR_SIZE, MP_FLASH_SIZE_MAX / flash_size,
hw/arm/omap_sx1.c +2 -2
@@ -150,7 +150,7 @@ static void sx1_init(MachineState *machine, const int version) fl_idx =0 ;if ((dinfo =drive_get (IF_PFLASH ,0 , fl_idx)) !=NULL ) { -pflash_cfi01_register (OMAP_CS0_BASE , +pflash_cfi01_register (OBJECT (machine),OMAP_CS0_BASE ,"omap_sx1.flash0-1" , flash_size,blk_by_legacy_dinfo (dinfo),SECTOR_SIZE ,4 ,0 ,0 ,0 ,0 ,0 );
@@ -169,7 +169,7 @@ static void sx1_init(MachineState *machine, const int version)memory_region_add_subregion (address_space,OMAP_CS1_BASE +FLASH1_SIZE , &cs[1 ]); -pflash_cfi01_register (OMAP_CS1_BASE , +pflash_cfi01_register (OBJECT (machine),OMAP_CS1_BASE ,"omap_sx1.flash1-1" ,FLASH1_SIZE ,blk_by_legacy_dinfo (dinfo),SECTOR_SIZE ,4 ,0 ,0 ,0 ,0 ,0 );
hw/arm/versatilepb.c +1 -1
@@ -391,7 +391,7 @@ static void versatile_init(MachineState *machine, int board_id)/* 0x34000000 NOR Flash */ dinfo =drive_get (IF_PFLASH ,0 ,0 ); - pflash_cfi01_register(VERSATILE_FLASH_ADDR, "versatile.flash", + pflash_cfi01_register(OBJECT(machine), VERSATILE_FLASH_ADDR, "versatile.flash", VERSATILE_FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, VERSATILE_FLASH_SECT_SIZE,
hw/arm/xilinx_zynq.c +1 -1
@@ -242,7 +242,7 @@ static void zynq_init(MachineState *machine)DriveInfo *dinfo =drive_get (IF_PFLASH ,0 ,0 );/* AMD */ - pflash_cfi02_register(0xe2000000, "zynq.pflash", FLASH_SIZE, + pflash_cfi02_register(OBJECT(machine), 0xe2000000, "zynq.pflash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, FLASH_SECTOR_SIZE, 1, 1, 0x0066, 0x0022, 0x0000, 0x0000, 0x0555, 0x2aa,
hw/block/fdc-sysbus.c +7 -6
@@ -96,30 +96,31 @@ static void fdctrl_handle_tc(void *opaque, int irq, int level)trace_fdctrl_tc_pulse (level); } -void fdctrl_init_sysbus (qemu_irq irq,hwaddr mmio_base,DriveInfo **fds) +void fdctrl_init_sysbus (Object *parent,qemu_irq irq,hwaddr mmio_base, +DriveInfo **fds) {DeviceState *dev;SysBusDevice *sbd;FDCtrlSysBus *sys; - dev =qdev_new_orphan ("sysbus-fdc" ); + dev =qdev_new (parent,"fdc" ,"sysbus-fdc" ); sys =SYSBUS_FDC (dev); sbd =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (sbd, &error_fatal); +sysbus_realize (sbd, &error_fatal);sysbus_connect_irq (sbd,0 , irq);sysbus_mmio_map (sbd,0 , mmio_base);fdctrl_init_drives (&sys->state.bus, fds); } -void sun4m_fdctrl_init (qemu_irq irq,hwaddr io_base, +void sun4m_fdctrl_init (Object *parent,qemu_irq irq,hwaddr io_base,DriveInfo **fds,qemu_irq *fdc_tc) {DeviceState *dev;FDCtrlSysBus *sys; - dev =qdev_new_orphan ("sun-fdtwo" ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); + dev =qdev_new (parent,"fdc" ,"sun-fdtwo" ); +sysbus_realize (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/fdc.c +2 -2
@@ -2329,12 +2329,12 @@ void fdctrl_init_drives(FloppyBus *bus, DriveInfo **fds)for (i =0 ; i <MAX_FD ; i++) {if (fds[i]) { - dev =qdev_new_orphan ("floppy" ); + dev =qdev_new (OBJECT (bus->bus.parent),"floppy[*]" ,"floppy" );qdev_prop_set_uint32 (dev,"unit" , i);qdev_prop_set_enum (dev,"drive-type" ,FLOPPY_DRIVE_TYPE_AUTO );qdev_prop_set_drive_err (dev,"drive" ,blk_by_legacy_dinfo (fds[i]), &error_fatal); -qdev_realize_and_unref (dev, &bus->bus, &error_fatal); +qdev_realize (dev, &bus->bus, &error_fatal); } } }
hw/block/pflash_cfi01.c +3 -3
@@ -948,7 +948,7 @@ static const TypeInfo pflash_cfi01_types[] = {DEFINE_TYPES (pflash_cfi01_types) -PFlashCFI01 *pflash_cfi01_register(hwaddr base, +PFlashCFI01 *pflash_cfi01_register(Object *parent, hwaddr base, const char *name, hwaddr size, BlockBackend *blk,
@@ -958,7 +958,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base, uint16_t id2, uint16_t id3, int be) { - DeviceState *dev = qdev_new_orphan(TYPE_PFLASH_CFI01); + DeviceState *dev = qdev_new(parent, name, TYPE_PFLASH_CFI01);if (blk) {qdev_prop_set_drive (dev,"drive" , blk);
@@ -973,7 +973,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); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return PFLASH_CFI01 (dev);
hw/block/pflash_cfi02.c +3 -3
@@ -993,7 +993,7 @@ static void pflash_cfi02_register_types(void)type_init (pflash_cfi02_register_types) -PFlashCFI02 *pflash_cfi02_register(hwaddr base, +PFlashCFI02 *pflash_cfi02_register(Object *parent, hwaddr base, const char *name, hwaddr size, BlockBackend *blk,
@@ -1005,7 +1005,7 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base, uint16_t unlock_addr1, int be) { -DeviceState *dev =qdev_new_orphan (TYPE_PFLASH_CFI02 ); +DeviceState *dev =qdev_new (parent, name,TYPE_PFLASH_CFI02 );if (blk) {qdev_prop_set_drive (dev,"drive" , blk);
@@ -1023,7 +1023,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); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return PFLASH_CFI02 (dev);
hw/microblaze/petalogix_ml605_mmu.c +2 -1
@@ -105,7 +105,8 @@ petalogix_ml605_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );/* 5th parameter 2 means bank-width * 10th parameter 0 means little-endian */ -pflash_cfi01_register (FLASH_BASEADDR ,"petalogix_ml605.flash" ,FLASH_SIZE , +pflash_cfi01_register (OBJECT (machine),FLASH_BASEADDR , +"petalogix_ml605.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,64 * KiB,2 ,0x89 ,0x18 ,0x0000 ,0x0 ,0 );
hw/microblaze/petalogix_s3adsp1800_mmu.c +1 -1
@@ -102,7 +102,7 @@ petalogix_s3adsp1800_init(MachineState *machine)memory_region_add_subregion (sysmem, ddr_base, phys_ram); dinfo =drive_get (IF_PFLASH ,0 ,0 ); -pflash_cfi01_register (FLASH_BASEADDR , +pflash_cfi01_register (OBJECT (machine),FLASH_BASEADDR ,"petalogix_s3adsp1800.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,64 * KiB,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 );
hw/mips/jazz.c +2 -1
@@ -351,7 +351,8 @@ static void mips_jazz_init(MachineState *machine, fds[n] =drive_get (IF_FLOPPY ,0 , n); }/* FIXME: we should enable DMA with a custom IsaDma device */ -fdctrl_init_sysbus (qdev_get_gpio_in (rc4030,1 ),0x80003000 , fds); +fdctrl_init_sysbus (OBJECT (machine),qdev_get_gpio_in (rc4030,1 ), +0x80003000 , fds);/* Real time clock */ mc146818_rtc_init (OBJECT (machine), isa_bus,1980 ,NULL );
hw/mips/malta.c +1 -1
@@ -1137,7 +1137,7 @@ void mips_malta_init(MachineState *machine)/* Load firmware in flash / BIOS. */ dinfo =drive_get (IF_PFLASH ,0 , fl_idx); - fl = pflash_cfi01_register(FLASH_ADDRESS, "mips_malta.bios", + fl = pflash_cfi01_register(OBJECT(machine), FLASH_ADDRESS, "mips_malta.bios", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 65536,
hw/ppc/sam460ex.c +4 -3
@@ -83,7 +83,7 @@ struct boot_info {uint32_t entry; }; -static int sam460ex_load_uboot (void ) +static int sam460ex_load_uboot (Object *parent) {/* * This first creates 1MiB of flash memory mapped at the end of
@@ -106,7 +106,8 @@ static int sam460ex_load_uboot(void)DriveInfo *dinfo; dinfo =drive_get (IF_PFLASH ,0 ,0 ); -if (!pflash_cfi01_register (FLASH_BASE | ((hwaddr )FLASH_BASE_H <<32 ), +if (!pflash_cfi01_register (parent, +FLASH_BASE | ((hwaddr )FLASH_BASE_H <<32 ),"sam460ex.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,64 * KiB,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 )) {
@@ -459,7 +460,7 @@ static void sam460ex_init(MachineState *machine)/* Load U-Boot image. */ if (!machine->kernel_filename) { - success =sam460ex_load_uboot (); + success =sam460ex_load_uboot (OBJECT (machine));if (success <0 ) {error_report ("could not load firmware" );exit (1 );
hw/ppc/virtex_ml507.c +1 -1
@@ -213,7 +213,7 @@ static void virtex_init(MachineState *machine)memory_region_add_subregion (address_space_mem, ram_base, machine->ram); dinfo =drive_get (IF_PFLASH ,0 ,0 ); -pflash_cfi01_register (PFLASH_BASEADDR ,"virtex.flash" ,FLASH_SIZE , +pflash_cfi01_register (OBJECT (machine),PFLASH_BASEADDR ,"virtex.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,64 * KiB,1 ,0x89 ,0x18 ,0x0000 ,0x0 ,1 );
hw/sh4/r2d.c +1 -1
@@ -309,7 +309,7 @@ static void r2d_init(MachineState *machine)* addressable in words of 16bit. */ dinfo =drive_get (IF_PFLASH ,0 ,0 ); -pflash_cfi02_register (0x0 ,"r2d.flash" ,FLASH_SIZE , +pflash_cfi02_register (OBJECT (machine),0x0 ,"r2d.flash" ,FLASH_SIZE , dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ,64 * KiB,1 ,2 ,0x0001 ,0x227e ,0x2220 ,0x2200 ,0x555 ,0x2aa ,0 );
hw/sparc/sun4m.c +1 -1
@@ -1015,7 +1015,7 @@ static void sun4m_hw_init(MachineState *machine)/* there is zero or one floppy drive */ memset (fd,0 ,sizeof (fd)); fd[0 ] =drive_get (IF_FLOPPY ,0 ,0 ); -sun4m_fdctrl_init (slavio_irq[22 ], hwdef->fd_base, fd, +sun4m_fdctrl_init (OBJECT (machine), slavio_irq[22 ], hwdef->fd_base, fd, &fdc_tc); }else { fdc_tc =qemu_allocate_irq (dummy_fdc_tc,NULL ,0 );
include/hw/block/fdc.h +3 -2
@@ -10,8 +10,9 @@#define TYPE_ISA_FDC "isa-fdc"void isa_fdc_init_drives (ISADevice *fdc,DriveInfo **fds); -void fdctrl_init_sysbus (qemu_irq irq,hwaddr mmio_base,DriveInfo **fds); -void sun4m_fdctrl_init (qemu_irq irq,hwaddr io_base, +void fdctrl_init_sysbus (Object *parent,qemu_irq irq,hwaddr mmio_base, +DriveInfo **fds); +void sun4m_fdctrl_init (Object *parent,qemu_irq irq,hwaddr io_base,DriveInfo **fds,qemu_irq *fdc_tc);void isa_fdc_set_iobase (ISADevice *fdc,hwaddr iobase);
include/hw/block/flash.h +2 -2
@@ -12,7 +12,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(PFlashCFI01, PFLASH_CFI01) -PFlashCFI01 *pflash_cfi01_register(hwaddr base, +PFlashCFI01 *pflash_cfi01_register(Object *parent, hwaddr base, const char *name, hwaddr size, BlockBackend *blk,
@@ -31,7 +31,7 @@ void pflash_cfi01_legacy_drive(PFlashCFI01 *dev, DriveInfo *dinfo); OBJECT_DECLARE_SIMPLE_TYPE(PFlashCFI02, PFLASH_CFI02) -PFlashCFI02 *pflash_cfi02_register(hwaddr base, +PFlashCFI02 *pflash_cfi02_register(Object *parent, hwaddr base, const char *name, hwaddr size, BlockBackend *blk,
Signature · 1 line
2.47.1
RFC PATCH 48/134 hw/char: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/char to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The public serial helpers serial_mm_init(), serial_hds_isa_init(), parallel_hds_isa_init(), pl011_create(), sifive_uart_create(), xilinx_uartlite_create() and mcf_uart_create*() gain a leading Object *parent argument, threaded through from every board caller.
Per-site rationale (reviewers: dispute the modeling here):
hw/char/exynos4210_uart.c:662 | qdev_new | parent | "uart[*]" | helper called from Exynos4210 SoC realize; thread Object *parenthw/char/mcf_uart.c:354 | qdev_new | parent | "uart[*]" | helper called from mcf5206 mbar realize and mcf5208 board init; thread Object *parent through mcf_uart_create() + mcf_uart_create_mmap() hw/char/mchp_pfsoc_mmuart.c:153 | qdev_new | parent | "uart[*]" | helper called from PolarFire SoC realize; thread Object *parent; note site already uses sysbus_realize (no _and_unref) so leave as-is hw/char/parallel-isa.c:25 | isa_new | parent | "parallel[*]" | static helper called from parallel_hds_isa_init(); thread Object *parent through both and update pc.c + sun4u.c callers hw/char/pl011.c:41 | qdev_new | parent | "uart[*]" | helper called from many ARM board inits; thread Object *parent through pl011_create()
hw/char/serial-isa.c:168 | isa_new | parent | "serial[*]" | static helper called from serial_hds_isa_init(); thread Object *parent through both and update microvm/pc/pnv/sun4u callers hw/char/serial-mm.c:102 | qdev_new | parent | "serial[*]" | very widely used helper; thread Object *parent through serial_mm_init() and update all 41 callers hw/char/sifive_uart.c:402 | qdev_new | parent | "uart[*]" | helper called from SiFive E/U SoC realize; thread Object *parent
hw/char/spapr_vty.c:161 | qdev_new | parent | "vty[*]" | helper called from spapr_machine_init loop; thread Object *parent hw/char/xen_console.c:565 | qdev_new_orphan | ORPHAN-JUSTIFIED | - | XenBackend .create() callback; hotplugged device analogous to qdev_device_add() path
--- hw/arm/allwinner-a10.c | 2 +- hw/arm/allwinner-h3.c | 8 ++++---- hw/arm/allwinner-r40.c | 2 +- hw/arm/exynos4210.c | 8 ++++---- hw/arm/integratorcp.c | 4 ++-- hw/arm/kzm.c | 2 +- hw/arm/msf2-soc.c | 2 +- hw/arm/musicpal.c | 4 ++-- hw/arm/npcm7xx.c | 2 +- hw/arm/npcm8xx.c | 2 +- hw/arm/omap1.c | 8 ++++---- hw/arm/omap_sx1.c | 2 +- hw/arm/realview.c | 8 ++++---- hw/arm/versatilepb.c | 8 ++++---- hw/arm/vexpress.c | 8 ++++---- hw/char/exynos4210_uart.c | 6 +++--- hw/char/mcf_uart.c | 11 ++++++----- hw/char/mchp_pfsoc_mmuart.c | 4 ++-- hw/char/omap_uart.c | 4 ++-- hw/char/parallel-isa.c | 10 +++++----- hw/char/pl011.c | 6 +++--- hw/char/serial-isa.c | 11 ++++++----- hw/char/serial-mm.c | 6 +++--- hw/char/sifive_uart.c | 8 ++++---- hw/char/spapr_vty.c | 6 +++--- hw/hppa/machine.c | 9 ++++++--- hw/i386/microvm.c | 2 +- hw/i386/pc.c | 8 ++++---- hw/loongarch/virt.c | 2 +- hw/m68k/mcf5206.c | 4 ++-- hw/m68k/mcf5208.c | 9 ++++++--- hw/microblaze/petalogix_ml605_mmu.c | 2 +- hw/mips/boston.c | 3 ++- hw/mips/jazz.c | 4 ++-- hw/mips/loongson3_virt.c | 2 +- hw/mips/malta.c | 7 ++++--- hw/or1k/or1k-sim.c | 2 +- hw/or1k/virt.c | 2 +- hw/ppc/e500.c | 4 ++-- hw/ppc/pnv.c | 2 +- hw/ppc/ppc440_bamboo.c | 4 ++-- hw/ppc/sam460ex.c | 4 ++-- hw/ppc/spapr.c | 2 +- hw/ppc/virtex_ml507.c | 3 ++- hw/riscv/boston-aia.c | 3 ++- hw/riscv/k230.c | 8 ++++---- hw/riscv/microblaze-v-generic.c | 2 +- hw/riscv/microchip_pfsoc.c | 10 +++++----- hw/riscv/sifive_e.c | 4 ++-- hw/riscv/sifive_u.c | 4 ++-- hw/riscv/tt_atlantis.c | 2 +- hw/riscv/virt.c | 2 +- hw/riscv/xiangshan_kmh.c | 2 +- hw/sparc64/niagara.c | 2 +- hw/sparc64/sun4u.c | 6 +++--- hw/xtensa/xtfpga.c | 2 +- include/hw/arm/exynos4210.h | 2 +- include/hw/arm/omap.h | 4 ++-- include/hw/char/mchp_pfsoc_mmuart.h | 2 +- include/hw/char/parallel.h | 2 +- include/hw/char/pl011.h | 2 +- include/hw/char/serial-isa.h | 2 +- include/hw/char/serial-mm.h | 2 +- include/hw/char/sifive_uart.h | 4 ++-- include/hw/m68k/mcf.h | 5 +++-- include/hw/ppc/spapr_vio.h | 2 +- 66 files changed, 152 insertions(+), 139 deletions(-)
hw/arm/allwinner-a10.c +1 -1
@@ -156,7 +156,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)sysbus_connect_irq (SYS_BUS_DEVICE (&s->sata),0 ,qdev_get_gpio_in (dev,56 ));/* FIXME use a qdev chardev prop instead of serial_hd() */ -serial_mm_init (get_system_memory (),AW_A10_UART0_REG_BASE ,2 , +serial_mm_init (OBJECT (s),get_system_memory (),AW_A10_UART0_REG_BASE ,2 ,qdev_get_gpio_in (dev,1 ),115200 ,serial_hd (0 ),DEVICE_LITTLE_ENDIAN );
hw/arm/allwinner-h3.c +4 -4
@@ -406,19 +406,19 @@ static void allwinner_h3_realize(DeviceState *dev, Error **errp) AW_H3_GIC_SPI_OHCI3));/* UART0. For future clocktree API: All UARTS are connected to APB2_CLK. */ -serial_mm_init (get_system_memory (), s->memmap[AW_H3_DEV_UART0 ],2 , +serial_mm_init (OBJECT (s),get_system_memory (), s->memmap[AW_H3_DEV_UART0 ],2 ,qdev_get_gpio_in (DEVICE (&s->gic),AW_H3_GIC_SPI_UART0 ),115200 ,serial_hd (0 ),DEVICE_LITTLE_ENDIAN );/* UART1 */ -serial_mm_init (get_system_memory (), s->memmap[AW_H3_DEV_UART1 ],2 , +serial_mm_init (OBJECT (s),get_system_memory (), s->memmap[AW_H3_DEV_UART1 ],2 ,qdev_get_gpio_in (DEVICE (&s->gic),AW_H3_GIC_SPI_UART1 ),115200 ,serial_hd (1 ),DEVICE_LITTLE_ENDIAN );/* UART2 */ -serial_mm_init (get_system_memory (), s->memmap[AW_H3_DEV_UART2 ],2 , +serial_mm_init (OBJECT (s),get_system_memory (), s->memmap[AW_H3_DEV_UART2 ],2 ,qdev_get_gpio_in (DEVICE (&s->gic),AW_H3_GIC_SPI_UART2 ),115200 ,serial_hd (2 ),DEVICE_LITTLE_ENDIAN );/* UART3 */ -serial_mm_init (get_system_memory (), s->memmap[AW_H3_DEV_UART3 ],2 , +serial_mm_init (OBJECT (s),get_system_memory (), s->memmap[AW_H3_DEV_UART3 ],2 ,qdev_get_gpio_in (DEVICE (&s->gic),AW_H3_GIC_SPI_UART3 ),115200 ,serial_hd (3 ),DEVICE_LITTLE_ENDIAN );
hw/arm/allwinner-r40.c +1 -1
@@ -489,7 +489,7 @@ static void allwinner_r40_realize(DeviceState *dev, Error **errp) };const hwaddr addr = s->memmap[AW_R40_DEV_UART0 + i]; -serial_mm_init (get_system_memory (), addr,2 , +serial_mm_init (OBJECT (s),get_system_memory (), addr,2 ,qdev_get_gpio_in (DEVICE (&s->gic), uart_irqs[i]),115200 ,serial_hd (i),DEVICE_LITTLE_ENDIAN ); }
hw/arm/exynos4210.c +4 -4
@@ -723,19 +723,19 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp)/*** UARTs ***/ - uart[0 ] =exynos4210_uart_create (EXYNOS4210_UART0_BASE_ADDR , + uart[0 ] =exynos4210_uart_create (OBJECT (s),EXYNOS4210_UART0_BASE_ADDR ,EXYNOS4210_UART0_FIFO_SIZE ,0 ,serial_hd (0 ), s->irq_table[exynos4210_get_irq (EXYNOS4210_UART_INT_GRP ,0 )]); - uart[1 ] =exynos4210_uart_create (EXYNOS4210_UART1_BASE_ADDR , + uart[1 ] =exynos4210_uart_create (OBJECT (s),EXYNOS4210_UART1_BASE_ADDR ,EXYNOS4210_UART1_FIFO_SIZE ,1 ,serial_hd (1 ), s->irq_table[exynos4210_get_irq (EXYNOS4210_UART_INT_GRP ,1 )]); - uart[2 ] =exynos4210_uart_create (EXYNOS4210_UART2_BASE_ADDR , + uart[2 ] =exynos4210_uart_create (OBJECT (s),EXYNOS4210_UART2_BASE_ADDR ,EXYNOS4210_UART2_FIFO_SIZE ,2 ,serial_hd (2 ), s->irq_table[exynos4210_get_irq (EXYNOS4210_UART_INT_GRP ,2 )]); - uart[3 ] =exynos4210_uart_create (EXYNOS4210_UART3_BASE_ADDR , + uart[3 ] =exynos4210_uart_create (OBJECT (s),EXYNOS4210_UART3_BASE_ADDR ,EXYNOS4210_UART3_FIFO_SIZE ,3 ,serial_hd (3 ), s->irq_table[exynos4210_get_irq (EXYNOS4210_UART_INT_GRP ,3 )]);
hw/arm/integratorcp.c +2 -2
@@ -637,8 +637,8 @@ static void integratorcp_init(MachineState *machine)sysbus_create_varargs_orphan ("integrator_pit" ,0x13000000 , pic[5 ], pic[6 ], pic[7 ],NULL );sysbus_create_simple_orphan ("pl031" ,0x15000000 , pic[8 ]); -pl011_create (0x16000000 , pic[1 ],serial_hd (0 )); -pl011_create (0x17000000 , pic[2 ],serial_hd (1 )); +pl011_create (OBJECT (machine),0x16000000 , pic[1 ],serial_hd (0 )); +pl011_create (OBJECT (machine),0x17000000 , pic[2 ],serial_hd (1 )); icp =sysbus_create_simple_orphan (TYPE_ICP_CONTROL_REGS ,0xcb000000 ,qdev_get_gpio_in (sic,3 ));sysbus_create_simple_orphan ("pl050_keyboard" ,0x18000000 , pic[3 ]);
hw/arm/kzm.c +1 -1
@@ -120,7 +120,7 @@ static void kzm_init(MachineState *machine) }if (serial_hd (2 )) {/* touchscreen */ -serial_mm_init (get_system_memory (),KZM_FPGA_ADDR +0x10 ,0 , +serial_mm_init (OBJECT (machine),get_system_memory (),KZM_FPGA_ADDR +0x10 ,0 ,qdev_get_gpio_in (DEVICE (&s->soc.avic),52 ),14745600 ,serial_hd (2 ),DEVICE_NATIVE_ENDIAN ); }
hw/arm/msf2-soc.c +1 -1
@@ -146,7 +146,7 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp)for (i =0 ; i <MSF2_NUM_UARTS ; i++) {if (serial_hd (i)) { -serial_mm_init (get_system_memory (), uart_addr[i],2 , +serial_mm_init (OBJECT (s),get_system_memory (), uart_addr[i],2 ,qdev_get_gpio_in (armv7m, uart_irq[i]),115200 ,serial_hd (i),DEVICE_NATIVE_ENDIAN ); }
hw/arm/musicpal.c +2 -2
@@ -1255,10 +1255,10 @@ static void musicpal_init(MachineState *machine)qdev_connect_gpio_out (uart_orgate,0 ,qdev_get_gpio_in (pic,MP_UART_SHARED_IRQ )); -serial_mm_init (address_space_mem,MP_UART1_BASE ,2 , +serial_mm_init (OBJECT (machine), address_space_mem,MP_UART1_BASE ,2 ,qdev_get_gpio_in (uart_orgate,0 ),1825000 ,serial_hd (0 ),DEVICE_NATIVE_ENDIAN ); -serial_mm_init (address_space_mem,MP_UART2_BASE ,2 , +serial_mm_init (OBJECT (machine), address_space_mem,MP_UART2_BASE ,2 ,qdev_get_gpio_in (uart_orgate,1 ),1825000 ,serial_hd (1 ),DEVICE_NATIVE_ENDIAN );
hw/arm/npcm7xx.c +1 -1
@@ -588,7 +588,7 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp)/* UART0..3 (16550 compatible) */ for (i =0 ; i <ARRAY_SIZE (npcm7xx_uart_addr); i++) { -serial_mm_init (get_system_memory (), npcm7xx_uart_addr[i],2 , +serial_mm_init (OBJECT (s),get_system_memory (), npcm7xx_uart_addr[i],2 ,npcm7xx_irq (s,NPCM7XX_UART0_IRQ + i),115200 ,serial_hd (i),DEVICE_LITTLE_ENDIAN ); }
hw/arm/npcm8xx.c +1 -1
@@ -602,7 +602,7 @@ static void npcm8xx_realize(DeviceState *dev, Error **errp)/* UART0..6 (16550 compatible) */ for (i =0 ; i <ARRAY_SIZE (npcm8xx_uart_addr); i++) { -serial_mm_init (get_system_memory (), npcm8xx_uart_addr[i],2 , +serial_mm_init (OBJECT (s),get_system_memory (), npcm8xx_uart_addr[i],2 ,npcm8xx_irq (s,NPCM8XX_UART0_IRQ + i),115200 ,serial_hd (i),DEVICE_LITTLE_ENDIAN ); }
hw/arm/omap1.c +4 -4
@@ -3738,7 +3738,7 @@ static int omap_validate_tipb_mpui_addr(struct omap_mpu_state_s *s,return range_covers_byte (0xe1010000 ,0xe1020004 -0xe1010000 , addr); } -struct omap_mpu_state_s *omap310_mpu_init (MemoryRegion *dram, +struct omap_mpu_state_s *omap310_mpu_init (Object *parent,MemoryRegion *dram,const char *cpu_type) {int i;
@@ -3842,21 +3842,21 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *dram,omap_tcmi_init (system_memory,0xfffecc00 , s); - s->uart[0 ] =omap_uart_init (0xfffb0000 , + s->uart[0 ] =omap_uart_init (parent,0xfffb0000 ,qdev_get_gpio_in (s->ih[1 ],OMAP_INT_UART1 ),omap_findclk (s,"uart1_ck" ),omap_findclk (s,"uart1_ck" ), s->drq[OMAP_DMA_UART1_TX ], s->drq[OMAP_DMA_UART1_RX ],"uart1" ,serial_hd (0 )); - s->uart[1 ] =omap_uart_init (0xfffb0800 , + s->uart[1 ] =omap_uart_init (parent,0xfffb0800 ,qdev_get_gpio_in (s->ih[1 ],OMAP_INT_UART2 ),omap_findclk (s,"uart2_ck" ),omap_findclk (s,"uart2_ck" ), s->drq[OMAP_DMA_UART2_TX ], s->drq[OMAP_DMA_UART2_RX ],"uart2" ,serial_hd (0 ) ?serial_hd (1 ) :NULL ); - s->uart[2] = omap_uart_init(0xfffb9800, + s->uart[2] = omap_uart_init(parent, 0xfffb9800, qdev_get_gpio_in(s->ih[0], OMAP_INT_UART3), omap_findclk(s, "uart3_ck"), omap_findclk(s, "uart3_ck"),
hw/arm/omap_sx1.c +1 -1
@@ -125,7 +125,7 @@ static void sx1_init(MachineState *machine, const int version)memory_region_add_subregion (address_space,OMAP_EMIFF_BASE , machine->ram); - mpu =omap310_mpu_init (machine->ram, machine->cpu_type); + mpu =omap310_mpu_init (OBJECT (machine), machine->ram, machine->cpu_type);/* External Flash (EMIFS) */ memory_region_init_rom(flash, NULL, "omap_sx1.flash0-0", flash_size,
hw/arm/realview.c +4 -4
@@ -224,10 +224,10 @@ static void realview_init(MachineState *machine,sysbus_create_simple_orphan ("pl050_keyboard" ,0x10006000 , pic[20 ]);sysbus_create_simple_orphan ("pl050_mouse" ,0x10007000 , pic[21 ]); -pl011_create (0x10009000 , pic[12 ],serial_hd (0 )); -pl011_create (0x1000a000 , pic[13 ],serial_hd (1 )); -pl011_create (0x1000b000 , pic[14 ],serial_hd (2 )); -pl011_create (0x1000c000 , pic[15 ],serial_hd (3 )); +pl011_create (OBJECT (machine),0x10009000 , pic[12 ],serial_hd (0 )); +pl011_create (OBJECT (machine),0x1000a000 , pic[13 ],serial_hd (1 )); +pl011_create (OBJECT (machine),0x1000b000 , pic[14 ],serial_hd (2 )); +pl011_create (OBJECT (machine),0x1000c000 , pic[15 ],serial_hd (3 ));/* DMA controller is optional, apparently. */ dev =qdev_new_orphan ("pl081" );
hw/arm/versatilepb.c +4 -4
@@ -279,10 +279,10 @@ static void versatile_init(MachineState *machine, int board_id) n--; } -pl011_create (0x101f1000 , pic[12 ],serial_hd (0 )); -pl011_create (0x101f2000 , pic[13 ],serial_hd (1 )); -pl011_create (0x101f3000 , pic[14 ],serial_hd (2 )); -pl011_create (0x10009000 , sic[6 ],serial_hd (3 )); +pl011_create (OBJECT (machine),0x101f1000 , pic[12 ],serial_hd (0 )); +pl011_create (OBJECT (machine),0x101f2000 , pic[13 ],serial_hd (1 )); +pl011_create (OBJECT (machine),0x101f3000 , pic[14 ],serial_hd (2 )); +pl011_create (OBJECT (machine),0x10009000 , sic[6 ],serial_hd (3 )); dev =qdev_new_orphan ("pl080" ); object_property_set_link(OBJECT(dev), "downstream", OBJECT(sysmem),
hw/arm/vexpress.c +4 -4
@@ -643,10 +643,10 @@ static void vexpress_common_init(MachineState *machine)sysbus_create_simple_orphan ("pl050_keyboard" , map[VE_KMI0 ], pic[12 ]);sysbus_create_simple_orphan ("pl050_mouse" , map[VE_KMI1 ], pic[13 ]); -pl011_create (map[VE_UART0 ], pic[5 ],serial_hd (0 )); -pl011_create (map[VE_UART1 ], pic[6 ],serial_hd (1 )); -pl011_create (map[VE_UART2 ], pic[7 ],serial_hd (2 )); -pl011_create (map[VE_UART3 ], pic[8 ],serial_hd (3 )); +pl011_create (OBJECT (machine), map[VE_UART0 ], pic[5 ],serial_hd (0 )); +pl011_create (OBJECT (machine), map[VE_UART1 ], pic[6 ],serial_hd (1 )); +pl011_create (OBJECT (machine), map[VE_UART2 ], pic[7 ],serial_hd (2 )); +pl011_create (OBJECT (machine), map[VE_UART3 ], pic[8 ],serial_hd (3 ));sysbus_create_simple_orphan ("sp804" , map[VE_TIMER01 ], pic[2 ]);sysbus_create_simple_orphan ("sp804" , map[VE_TIMER23 ], pic[3 ]);
hw/char/exynos4210_uart.c +3 -3
@@ -650,7 +650,7 @@ static const VMStateDescription vmstate_exynos4210_uart = { } }; -DeviceState *exynos4210_uart_create(hwaddr addr, +DeviceState *exynos4210_uart_create(Object *parent, hwaddr addr, int fifo_size, int channel, Chardev *chr,
@@ -659,7 +659,7 @@ DeviceState *exynos4210_uart_create(hwaddr addr,DeviceState *dev;SysBusDevice *bus; - dev =qdev_new_orphan (TYPE_EXYNOS4210_UART ); + dev =qdev_new (parent,"uart[*]" ,TYPE_EXYNOS4210_UART );qdev_prop_set_chr (dev,"chardev" , chr);qdev_prop_set_uint32 (dev,"channel" , channel);
@@ -667,7 +667,7 @@ DeviceState *exynos4210_uart_create(hwaddr addr,qdev_prop_set_uint32 (dev,"tx-size" , fifo_size); bus =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (bus, &error_fatal); +sysbus_realize (bus, &error_fatal);if (addr != (hwaddr)-1 ) {sysbus_mmio_map (bus,0 , addr); }
hw/char/mcf_uart.c +6 -5
@@ -347,25 +347,26 @@ static void mcf_uart_register(void)type_init (mcf_uart_register) -DeviceState *mcf_uart_create(qemu_irq irq, Chardev *chrdrv) +DeviceState *mcf_uart_create(Object *parent, qemu_irq irq, Chardev *chrdrv) {DeviceState *dev; - dev =qdev_new_orphan (TYPE_MCF_UART ); + dev =qdev_new (parent,"uart[*]" ,TYPE_MCF_UART );if (chrdrv) {qdev_prop_set_chr (dev,"chardev" , chrdrv); } -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq);return dev; } -DeviceState *mcf_uart_create_mmap (hwaddr base,qemu_irq irq,Chardev *chrdrv) +DeviceState *mcf_uart_create_mmap (Object *parent,hwaddr base,qemu_irq irq, +Chardev *chrdrv) {DeviceState *dev; - dev =mcf_uart_create (irq, chrdrv); + dev =mcf_uart_create (parent, irq, chrdrv);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);return dev;
hw/char/mchp_pfsoc_mmuart.c +2 -2
@@ -146,11 +146,11 @@ static void mchp_pfsoc_mmuart_register_types(void)type_init (mchp_pfsoc_mmuart_register_types) -MchpPfSoCMMUartState *mchp_pfsoc_mmuart_create(MemoryRegion *sysmem, +MchpPfSoCMMUartState *mchp_pfsoc_mmuart_create(Object *parent, MemoryRegion *sysmem,hwaddr base,qemu_irq irq,Chardev *chr) { -DeviceState *dev =qdev_new_orphan (TYPE_MCHP_PFSOC_UART ); +DeviceState *dev =qdev_new (parent,"uart[*]" ,TYPE_MCHP_PFSOC_UART );SysBusDevice *sbd =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr);
hw/char/omap_uart.c +2 -2
@@ -47,7 +47,7 @@ void omap_uart_reset(struct omap_uart_s *s) s->clksel =0 ; } -struct omap_uart_s *omap_uart_init (hwaddr base, +struct omap_uart_s *omap_uart_init (Object *parent,hwaddr base,qemu_irq irq,omap_clk fclk,omap_clk iclk,qemu_irq txdma,qemu_irq rxdma,const char *label,Chardev *chr)
@@ -57,7 +57,7 @@ struct omap_uart_s *omap_uart_init(hwaddr base, s->base = base; s->fclk = fclk; s->irq = irq; - s->serial =serial_mm_init (get_system_memory (), base,2 , irq, + s->serial =serial_mm_init (parent,get_system_memory (), base,2 , irq,omap_clk_getrate (fclk) /16 , chr ?:qemu_chr_new (label,"null" ,NULL ),DEVICE_NATIVE_ENDIAN );
hw/char/parallel-isa.c +5 -5
@@ -17,19 +17,19 @@#include "hw/char/parallel.h" #include "qapi/error.h" -static void parallel_init (ISABus *bus,int index,Chardev *chr) +static void parallel_init (Object *parent,ISABus *bus,int index,Chardev *chr) {DeviceState *dev;ISADevice *isadev; - isadev =isa_new_orphan (TYPE_ISA_PARALLEL ); + isadev =isa_new (parent,"parallel[*]" ,TYPE_ISA_PARALLEL ); dev =DEVICE (isadev);qdev_prop_set_uint32 (dev,"index" , index);qdev_prop_set_chr (dev,"chardev" , chr); -isa_realize_and_unref (isadev, bus, &error_fatal); +qdev_realize (dev,BUS (bus), &error_fatal); } -void parallel_hds_isa_init (ISABus *bus,int n) +void parallel_hds_isa_init (Object *parent,ISABus *bus,int n) {int i;
@@ -37,7 +37,7 @@ void parallel_hds_isa_init(ISABus *bus, int n)for (i =0 ; i < n; i++) {if (parallel_hds[i]) { -parallel_init (bus, i, parallel_hds[i]); +parallel_init (parent, bus, i, parallel_hds[i]); } } }
hw/char/pl011.c +3 -3
@@ -33,15 +33,15 @@#include "qemu/module.h" #include "trace.h" -DeviceState *pl011_create (hwaddr addr,qemu_irq irq,Chardev *chr) +DeviceState *pl011_create (Object *parent,hwaddr addr,qemu_irq irq,Chardev *chr) {DeviceState *dev;SysBusDevice *s; - dev =qdev_new_orphan ("pl011" ); + dev =qdev_new (parent,"uart[*]" ,"pl011" ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);sysbus_mmio_map (s,0 , addr);sysbus_connect_irq (s,0 , irq);
hw/char/serial-isa.c +6 -5
@@ -160,19 +160,20 @@ static void serial_register_types(void)type_init (serial_register_types) -static void serial_isa_init(ISABus *bus, int index, Chardev *chr) +static void serial_isa_init(Object *parent, ISABus *bus, int index, +Chardev *chr) {DeviceState *dev;ISADevice *isadev; - isadev =isa_new_orphan (TYPE_ISA_SERIAL ); + isadev =isa_new (parent,"serial[*]" ,TYPE_ISA_SERIAL ); dev =DEVICE (isadev);qdev_prop_set_uint32 (dev,"index" , index);qdev_prop_set_chr (dev,"chardev" , chr); -isa_realize_and_unref (isadev, bus, &error_fatal); +qdev_realize (dev,BUS (bus), &error_fatal); } -void serial_hds_isa_init (ISABus *bus,int from,int to) +void serial_hds_isa_init (Object *parent,ISABus *bus,int from,int to) {int i;
@@ -181,7 +182,7 @@ void serial_hds_isa_init(ISABus *bus, int from, int to)for (i = from; i < to; ++i) {if (serial_hd (i)) { -serial_isa_init (bus, i,serial_hd (i)); +serial_isa_init (parent, bus, i,serial_hd (i)); } } }
hw/char/serial-mm.c +3 -3
@@ -94,12 +94,12 @@ static const VMStateDescription vmstate_serial_mm = { } }; -SerialMM *serial_mm_init (MemoryRegion *address_space, +SerialMM *serial_mm_init (Object *parent,MemoryRegion *address_space,hwaddr base,int regshift,qemu_irq irq,int baudbase,Chardev *chr,enum device_endian end) { -SerialMM *smm =SERIAL_MM (qdev_new_orphan (TYPE_SERIAL_MM )); +SerialMM *smm =SERIAL_MM (qdev_new (parent,"serial[*]" ,TYPE_SERIAL_MM ));MemoryRegion *mr;qdev_prop_set_uint8 (DEVICE (smm),"regshift" , regshift);
@@ -107,7 +107,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); -sysbus_realize_and_unref (SYS_BUS_DEVICE (smm), &error_fatal); +sysbus_realize (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/char/sifive_uart.c +4 -4
@@ -393,16 +393,16 @@ type_init(sifive_uart_register_types)/* * Create UART device. */ -SiFiveUARTState *sifive_uart_create (MemoryRegion *address_space,hwaddr base, -Chardev *chr,qemu_irq irq) +SiFiveUARTState *sifive_uart_create (Object *parent,MemoryRegion *address_space, +hwaddr base,Chardev *chr,qemu_irq irq) {DeviceState *dev;SysBusDevice *s; - dev =qdev_new_orphan ("riscv.sifive.uart" ); + dev =qdev_new (parent,"uart[*]" ,"riscv.sifive.uart" ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);memory_region_add_subregion (address_space, base,sysbus_mmio_get_region (s,0 ));sysbus_connect_irq (s,0 , irq);
hw/char/spapr_vty.c +3 -3
@@ -154,13 +154,13 @@ static target_ulong h_get_term_char(PowerPCCPU *cpu, SpaprMachineState *spapr,return H_SUCCESS ; } -void spapr_vty_create (SpaprVioBus *bus,Chardev *chardev) +void spapr_vty_create (Object *parent,SpaprVioBus *bus,Chardev *chardev) {DeviceState *dev; - dev =qdev_new_orphan ("spapr-vty" ); + dev =qdev_new (parent,"vty[*]" ,"spapr-vty" );qdev_prop_set_chr (dev,"chardev" , chardev); -qdev_realize_and_unref (dev, &bus->bus, &error_fatal); +qdev_realize (dev, &bus->bus, &error_fatal); }static const Property spapr_vty_properties[] = {
hw/hppa/machine.c +6 -3
@@ -607,7 +607,8 @@ static void machine_HP_715_init(MachineState *machine) SYS_BUS_DEVICE(lasi_dev), 0));/* Serial ports: Lasi use a 7.272727 MHz clock. */ -serial_mm_init (addr_space,translate (NULL ,LASI_HPA_715 +LASI_UART +0x800 ),0 , +serial_mm_init (OBJECT (machine), addr_space, +translate (NULL ,LASI_HPA_715 +LASI_UART +0x800 ),0 ,qdev_get_gpio_in (lasi_dev,LASI_IRQ_UART_HPA ),7272727 /16 ,serial_hd (0 ),DEVICE_BIG_ENDIAN );
@@ -694,11 +695,13 @@ static void machine_HP_B160L_init(MachineState *machine)assert (isa_bus);/* Serial ports: Lasi and Dino use a 7.272727 MHz clock. */ -serial_mm_init (addr_space,translate (NULL ,LASI_HPA +LASI_UART +0x800 ),0 , +serial_mm_init (OBJECT (machine), addr_space, +translate (NULL ,LASI_HPA +LASI_UART +0x800 ),0 ,qdev_get_gpio_in (lasi_dev,LASI_IRQ_UART_HPA ),7272727 /16 ,serial_hd (0 ),DEVICE_BIG_ENDIAN ); -serial_mm_init (addr_space,translate (NULL ,DINO_UART_HPA +0x800 ),0 , +serial_mm_init (OBJECT (machine), addr_space, +translate (NULL ,DINO_UART_HPA +0x800 ),0 ,qdev_get_gpio_in (dino_dev,DINO_IRQ_RS232INT ),7272727 /16 ,serial_hd (1 ),DEVICE_BIG_ENDIAN );
hw/i386/microvm.c +1 -1
@@ -273,7 +273,7 @@ static void microvm_devices_init(MicrovmMachineState *mms) }if (mms->isa_serial) { -serial_hds_isa_init (isa_bus,0 ,1 ); +serial_hds_isa_init (OBJECT (mms), isa_bus,0 ,1 ); }if (!x86ms->igvm) {
hw/i386/pc.c +4 -4
@@ -981,7 +981,7 @@ static const MemoryRegionOps ioportF0_io_ops = { }, }; -static void pc_superio_init (ISABus *isa_bus,bool create_fdctrl, +static void pc_superio_init (Object *parent,ISABus *isa_bus,bool create_fdctrl,bool create_i8042,bool no_vmport,Error **errp) {int i;
@@ -989,8 +989,8 @@ static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl,qemu_irq *a20_line;ISADevice *i8042, *port92, *vmmouse; -serial_hds_isa_init (isa_bus,0 ,MAX_ISA_SERIAL_PORTS ); -parallel_hds_isa_init (isa_bus,MAX_PARALLEL_PORTS ); +serial_hds_isa_init (parent, isa_bus,0 ,MAX_ISA_SERIAL_PORTS ); +parallel_hds_isa_init (parent, isa_bus,MAX_PARALLEL_PORTS );for (i =0 ; i <MAX_FD ; i++) { fd[i] =drive_get (IF_FLOPPY ,0 , i);
@@ -1136,7 +1136,7 @@ void pc_basic_device_init(struct PCMachineState *pcms, }/* Super I/O */ -pc_superio_init (isa_bus, create_fdctrl, pcms->i8042_enabled, +pc_superio_init (OBJECT (pcms), isa_bus, create_fdctrl, pcms->i8042_enabled, pcms->vmport !=ON_OFF_AUTO_ON , &error_fatal); pcms->machine_done.notify = pc_machine_done;
hw/loongarch/virt.c +1 -1
@@ -471,7 +471,7 @@ static void virt_devices_init(DeviceState *pch_pic,for (i =VIRT_UART_COUNT ; i-- >0 ;) {hwaddr base =VIRT_UART_BASE + i *VIRT_UART_SIZE ; irq =VIRT_UART_IRQ + i -VIRT_GSI_BASE ; -serial_mm_init (get_system_memory (), base,0 , +serial_mm_init (OBJECT (lvms),get_system_memory (), base,0 ,qdev_get_gpio_in (pch_pic, irq),115200 ,serial_hd (i),DEVICE_LITTLE_ENDIAN ); }
hw/m68k/mcf5206.c +2 -2
@@ -596,8 +596,8 @@ static void mcf5206_mbar_realize(DeviceState *dev, Error **errp) s->pic =qemu_allocate_irqs (m5206_mbar_set_irq, s,14 );m5206_timer_init (&s->timer[0 ], s->pic[9 ]);m5206_timer_init (&s->timer[1 ], s->pic[10 ]); - s->uart[0 ] =mcf_uart_create (s->pic[12 ],serial_hd (0 )); - s->uart[1 ] =mcf_uart_create (s->pic[13 ],serial_hd (1 )); + s->uart[0 ] =mcf_uart_create (OBJECT (s), s->pic[12 ],serial_hd (0 )); + s->uart[1 ] =mcf_uart_create (OBJECT (s), s->pic[13 ],serial_hd (1 )); }static const Property mcf5206_mbar_properties[] = {
hw/m68k/mcf5208.c +6 -3
@@ -309,9 +309,12 @@ static void mcf5208evb_init(MachineState *machine)/* Internal peripherals. */ intc =mcf_intc_init (OBJECT (machine), address_space_mem,0xfc048000 , cpu); -mcf_uart_create_mmap (0xfc060000 ,qdev_get_gpio_in (intc,26 ),serial_hd (0 )); -mcf_uart_create_mmap (0xfc064000 ,qdev_get_gpio_in (intc,27 ),serial_hd (1 )); -mcf_uart_create_mmap (0xfc068000 ,qdev_get_gpio_in (intc,28 ),serial_hd (2 )); +mcf_uart_create_mmap (OBJECT (machine),0xfc060000 , +qdev_get_gpio_in (intc,26 ),serial_hd (0 )); +mcf_uart_create_mmap (OBJECT (machine),0xfc064000 , +qdev_get_gpio_in (intc,27 ),serial_hd (1 )); +mcf_uart_create_mmap (OBJECT (machine),0xfc068000 , +qdev_get_gpio_in (intc,28 ),serial_hd (2 ));mcf5208_sys_init (address_space_mem, intc, cpu);
hw/microblaze/petalogix_ml605_mmu.c +1 -1
@@ -122,7 +122,7 @@ petalogix_ml605_init(MachineState *machine) irq[i] =qdev_get_gpio_in (dev, i); } -serial_mm_init (address_space_mem,UART16550_BASEADDR +0x1000 ,2 , +serial_mm_init (OBJECT (machine), address_space_mem,UART16550_BASEADDR +0x1000 ,2 , irq[UART16550_IRQ ],115200 ,serial_hd (0 ),DEVICE_LITTLE_ENDIAN );
hw/mips/boston.c +2 -1
@@ -755,7 +755,8 @@ static void boston_mach_init(MachineState *machine)memory_region_add_subregion_overlap (sys_mem, boston_memmap[BOSTON_PLATREG ].base, platreg,0 ); - s->uart =serial_mm_init (sys_mem, boston_memmap[BOSTON_UART ].base,2 , + s->uart =serial_mm_init (OBJECT (machine), sys_mem, + boston_memmap[BOSTON_UART ].base,2 ,get_cps_irq (&s->cps,3 ),10000000 ,serial_hd (0 ),DEVICE_LITTLE_ENDIAN );
hw/mips/jazz.c +2 -2
@@ -375,10 +375,10 @@ static void mips_jazz_init(MachineState *machine, 0));/* Serial ports */ -serial_mm_init (address_space,0x80006000 ,0 , +serial_mm_init (OBJECT (machine), address_space,0x80006000 ,0 ,qdev_get_gpio_in (rc4030,8 ),8000000 /16 ,serial_hd (0 ),DEVICE_NATIVE_ENDIAN ); -serial_mm_init (address_space,0x80007000 ,0 , +serial_mm_init (OBJECT (machine), address_space,0x80007000 ,0 ,qdev_get_gpio_in (rc4030,9 ),8000000 /16 ,serial_hd (1 ),DEVICE_NATIVE_ENDIAN );
hw/mips/loongson3_virt.c +1 -1
@@ -532,7 +532,7 @@ static void mips_loongson3_virt_init(MachineState *machine)sysbus_mmio_map (SYS_BUS_DEVICE (liointc),0 , virt_memmap[VIRT_LIOINTC ].base); -serial_mm_init (address_space_mem, virt_memmap[VIRT_UART ].base,0 , +serial_mm_init (OBJECT (machine), address_space_mem, virt_memmap[VIRT_UART ].base,0 ,qdev_get_gpio_in (liointc,UART_IRQ ),115200 ,serial_hd (0 ),DEVICE_LITTLE_ENDIAN );
hw/mips/malta.c +4 -3
@@ -569,7 +569,7 @@ static void malta_fgpa_display_event(void *opaque, QEMUChrEvent event) } } -static MaltaFPGAState *malta_fpga_init (MemoryRegion *address_space, +static MaltaFPGAState *malta_fpga_init (Object *parent,MemoryRegion *address_space,hwaddr base,qemu_irq uart_irq,Chardev *uart_chr) {MaltaFPGAState *s;
@@ -592,7 +592,7 @@ static MaltaFPGAState *malta_fpga_init(MemoryRegion *address_space,qemu_chr_fe_set_handlers (&s->display,NULL ,NULL , malta_fgpa_display_event,NULL , s,NULL , true); - s->uart =serial_mm_init (address_space, base +0x900 ,3 , uart_irq, + s->uart =serial_mm_init (parent, address_space, base +0x900 ,3 , uart_irq,230400 , uart_chr,DEVICE_NATIVE_ENDIAN );malta_fpga_reset (s);
@@ -1133,7 +1133,8 @@ void mips_malta_init(MachineState *machine)/* FPGA */ /* The CBUS UART is attached to the MIPS CPU INT2 pin, ie interrupt 4 */ -malta_fpga_init (system_memory,FPGA_ADDRESS , cbus_irq,serial_hd (2 )); +malta_fpga_init (OBJECT (machine), system_memory,FPGA_ADDRESS , cbus_irq, +serial_hd (2 ));/* Load firmware in flash / BIOS. */ dinfo =drive_get (IF_PFLASH ,0 , fl_idx);
hw/or1k/or1k-sim.c +1 -1
@@ -266,7 +266,7 @@ static void openrisc_sim_serial_init(Or1ksimState *state, hwaddr base, }else { serial_irq =get_cpu_irq (cpus,0 , irq_pin); } -serial_mm_init (get_system_memory (), base,0 , serial_irq,115200 , +serial_mm_init (OBJECT (state),get_system_memory (), base,0 , serial_irq,115200 ,serial_hd (uart_idx),DEVICE_BIG_ENDIAN );
hw/or1k/virt.c +1 -1
@@ -238,7 +238,7 @@ static void openrisc_virt_serial_init(OR1KVirtState *state, hwaddr base,qemu_irq serial_irq =get_per_cpu_irq (OBJECT (state), cpus, num_cpus, irq_pin); -serial_mm_init (get_system_memory (), base,0 , serial_irq,115200 , +serial_mm_init (OBJECT (state),get_system_memory (), base,0 , serial_irq,115200 ,serial_hd (0 ),DEVICE_BIG_ENDIAN );/* Add device tree node for serial. */
hw/ppc/e500.c +2 -2
@@ -1006,13 +1006,13 @@ void ppce500_init(MachineState *machine)/* Serial */ if (serial_hd (0 )) { -serial_mm_init (ccsr_addr_space,MPC8544_SERIAL0_REGS_OFFSET , +serial_mm_init (OBJECT (machine), ccsr_addr_space,MPC8544_SERIAL0_REGS_OFFSET ,0 ,qdev_get_gpio_in (mpicdev,42 ),399193 ,serial_hd (0 ),DEVICE_BIG_ENDIAN ); }if (serial_hd (1 )) { -serial_mm_init (ccsr_addr_space,MPC8544_SERIAL1_REGS_OFFSET , +serial_mm_init (OBJECT (machine), ccsr_addr_space,MPC8544_SERIAL1_REGS_OFFSET ,0 ,qdev_get_gpio_in (mpicdev,42 ),399193 ,serial_hd (1 ),DEVICE_BIG_ENDIAN ); }
hw/ppc/pnv.c +1 -1
@@ -1311,7 +1311,7 @@ static void pnv_init(MachineState *machine) pnv->isa_bus =pnv_isa_create (pnv->chips[0 ], &error_fatal);/* Create serial port */ -serial_hds_isa_init (pnv->isa_bus,0 ,MAX_ISA_SERIAL_PORTS ); +serial_hds_isa_init (OBJECT (machine), pnv->isa_bus,0 ,MAX_ISA_SERIAL_PORTS );/* Create an RTC ISA device too */ mc146818_rtc_init (OBJECT (machine), pnv->isa_bus,2000 ,NULL );
hw/ppc/ppc440_bamboo.c +2 -2
@@ -200,13 +200,13 @@ static void bamboo_init(MachineState *machine)memory_region_add_subregion (get_system_memory (),PPC440EP_PCI_IO , isa);if (serial_hd (0 ) !=NULL ) { -serial_mm_init (address_space_mem,0xef600300 ,0 , +serial_mm_init (OBJECT (machine), address_space_mem,0xef600300 ,0 ,qdev_get_gpio_in (uicdev,0 ),PPC_SERIAL_MM_BAUDBASE ,serial_hd (0 ),DEVICE_BIG_ENDIAN ); }if (serial_hd (1 ) !=NULL ) { -serial_mm_init (address_space_mem,0xef600400 ,0 , +serial_mm_init (OBJECT (machine), address_space_mem,0xef600400 ,0 ,qdev_get_gpio_in (uicdev,1 ),PPC_SERIAL_MM_BAUDBASE ,serial_hd (1 ),DEVICE_BIG_ENDIAN );
hw/ppc/sam460ex.c +2 -2
@@ -446,13 +446,13 @@ static void sam460ex_init(MachineState *machine)/* SoC has 4 UARTs but board has only one wired and two described in fdt */ if (serial_hd (0 ) !=NULL ) { -serial_mm_init (get_system_memory (),0x4ef600300 ,0 , +serial_mm_init (OBJECT (machine),get_system_memory (),0x4ef600300 ,0 ,qdev_get_gpio_in (uic[1 ],1 ),PPC_SERIAL_MM_BAUDBASE ,serial_hd (0 ),DEVICE_BIG_ENDIAN ); }if (serial_hd (1 ) !=NULL ) { -serial_mm_init (get_system_memory (),0x4ef600400 ,0 , +serial_mm_init (OBJECT (machine),get_system_memory (),0x4ef600400 ,0 ,qdev_get_gpio_in (uic[0 ],1 ),PPC_SERIAL_MM_BAUDBASE ,serial_hd (1 ),DEVICE_BIG_ENDIAN );
hw/ppc/spapr.c +1 -1
@@ -3033,7 +3033,7 @@ static void spapr_machine_init(MachineState *machine) spapr->vio_bus =spapr_vio_bus_init ();for (i =0 ;serial_hd (i); i++) { -spapr_vty_create (spapr->vio_bus,serial_hd (i)); +spapr_vty_create (OBJECT (machine), spapr->vio_bus,serial_hd (i)); }/* We always have at least the nvram device on VIO */
hw/ppc/virtex_ml507.c +2 -1
@@ -228,7 +228,8 @@ static void virtex_init(MachineState *machine) irq[i] =qdev_get_gpio_in (dev, i); } -serial_mm_init (address_space_mem,UART16550_BASEADDR ,2 , irq[UART16550_IRQ ], +serial_mm_init (OBJECT (machine), address_space_mem,UART16550_BASEADDR ,2 , + irq[UART16550_IRQ ],115200 ,serial_hd (0 ),DEVICE_LITTLE_ENDIAN );/* 2 timers at irq 2 @ 62 Mhz. */
hw/riscv/boston-aia.c +2 -1
@@ -404,7 +404,8 @@ static void boston_mach_init(MachineState *machine)memory_region_add_subregion_overlap (sys_mem, boston_memmap[BOSTON_PLATREG ].base, platreg,0 ); - s->uart =serial_mm_init (sys_mem, boston_memmap[BOSTON_UART ].base,2 , + s->uart =serial_mm_init (OBJECT (machine), sys_mem, + boston_memmap[BOSTON_UART ].base,2 ,qdev_get_gpio_in (s->cps.aplic,UART_INT ),10000000 ,serial_hd (0 ),DEVICE_LITTLE_ENDIAN );
hw/riscv/k230.c +4 -4
@@ -137,8 +137,8 @@ static DeviceState *k230_create_plic(Object *parent, int base_hartid, memmap[K230_DEV_PLIC].size); } -static void k230_create_uart (MemoryRegion *sys_mem,DeviceState *plic, -int index) +static void k230_create_uart (Object *parent,MemoryRegion *sys_mem, +DeviceState *plic,int index) {int uart_dev =K230_DEV_UART0 + index; g_autofree char *name = g_strdup_printf("uart%d", index);
@@ -147,7 +147,7 @@ static void k230_create_uart(MemoryRegion *sys_mem, DeviceState *plic,create_unimplemented_device (name, memmap[uart_dev].base, memmap[uart_dev].size); -serial_mm_init (sys_mem, memmap[uart_dev].base,2 , +serial_mm_init (parent, sys_mem, memmap[uart_dev].base,2 ,qdev_get_gpio_in (plic,K230_UART0_IRQ + index),399193 ,serial_hd (index),DEVICE_LITTLE_ENDIAN ); }
@@ -190,7 +190,7 @@ static void k230_soc_realize(DeviceState *dev, Error **errp)/* UART */ for (int i =0 ; i <K230_UART_COUNT ; i++) { -k230_create_uart (sys_mem,DEVICE (s->c908_plic), i); +k230_create_uart (OBJECT (s), sys_mem,DEVICE (s->c908_plic), i); }/* Watchdog */
hw/riscv/microblaze-v-generic.c +1 -1
@@ -100,7 +100,7 @@ static void mb_v_generic_init(MachineState *machine)sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq[UARTLITE_IRQ ]);/* Full uart */ -serial_mm_init (sysmem,UART16550_BASEADDR +0x1000 ,2 , +serial_mm_init (OBJECT (machine), sysmem,UART16550_BASEADDR +0x1000 ,2 , irq[UART16550_IRQ ],115200 ,serial_hd (1 ),DEVICE_LITTLE_ENDIAN );
hw/riscv/microchip_pfsoc.c +5 -5
@@ -346,23 +346,23 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp) qdev_get_gpio_in(DEVICE(s->plic), MICROCHIP_PFSOC_EMMC_SD_IRQ));/* MMUARTs */ - s->serial0 =mchp_pfsoc_mmuart_create (system_memory, + s->serial0 =mchp_pfsoc_mmuart_create (OBJECT (s), system_memory, memmap[MICROCHIP_PFSOC_MMUART0 ].base,qdev_get_gpio_in (DEVICE (s->plic),MICROCHIP_PFSOC_MMUART0_IRQ ),serial_hd (0 )); - s->serial1 =mchp_pfsoc_mmuart_create (system_memory, + s->serial1 =mchp_pfsoc_mmuart_create (OBJECT (s), system_memory, memmap[MICROCHIP_PFSOC_MMUART1 ].base,qdev_get_gpio_in (DEVICE (s->plic),MICROCHIP_PFSOC_MMUART1_IRQ ),serial_hd (1 )); - s->serial2 =mchp_pfsoc_mmuart_create (system_memory, + s->serial2 =mchp_pfsoc_mmuart_create (OBJECT (s), system_memory, memmap[MICROCHIP_PFSOC_MMUART2 ].base,qdev_get_gpio_in (DEVICE (s->plic),MICROCHIP_PFSOC_MMUART2_IRQ ),serial_hd (2 )); - s->serial3 =mchp_pfsoc_mmuart_create (system_memory, + s->serial3 =mchp_pfsoc_mmuart_create (OBJECT (s), system_memory, memmap[MICROCHIP_PFSOC_MMUART3 ].base,qdev_get_gpio_in (DEVICE (s->plic),MICROCHIP_PFSOC_MMUART3_IRQ ),serial_hd (3 )); - s->serial4 =mchp_pfsoc_mmuart_create (system_memory, + s->serial4 =mchp_pfsoc_mmuart_create (OBJECT (s), system_memory, memmap[MICROCHIP_PFSOC_MMUART4 ].base,qdev_get_gpio_in (DEVICE (s->plic),MICROCHIP_PFSOC_MMUART4_IRQ ),serial_hd (4 ));
hw/riscv/sifive_e.c +2 -2
@@ -266,13 +266,13 @@ static void sifive_e_soc_realize(DeviceState *dev, Error **errp)qdev_get_gpio_in (DEVICE (s->plic), SIFIVE_E_AON_WDT_IRQ)); -sifive_uart_create (sys_mem, memmap[SIFIVE_E_DEV_UART0 ].base, +sifive_uart_create (OBJECT (s), sys_mem, memmap[SIFIVE_E_DEV_UART0 ].base,serial_hd (0 ),qdev_get_gpio_in (DEVICE (s->plic),SIFIVE_E_UART0_IRQ ));create_unimplemented_device ("riscv.sifive.e.qspi0" , memmap[SIFIVE_E_DEV_QSPI0 ].base, memmap[SIFIVE_E_DEV_QSPI0 ].size);create_unimplemented_device ("riscv.sifive.e.pwm0" , memmap[SIFIVE_E_DEV_PWM0 ].base, memmap[SIFIVE_E_DEV_PWM0 ].size); -sifive_uart_create (sys_mem, memmap[SIFIVE_E_DEV_UART1 ].base, +sifive_uart_create (OBJECT (s), sys_mem, memmap[SIFIVE_E_DEV_UART1 ].base,serial_hd (1 ),qdev_get_gpio_in (DEVICE (s->plic),SIFIVE_E_UART1_IRQ ));create_unimplemented_device ("riscv.sifive.e.qspi1" , memmap[SIFIVE_E_DEV_QSPI1 ].base, memmap[SIFIVE_E_DEV_QSPI1 ].size);
hw/riscv/sifive_u.c +2 -2
@@ -783,9 +783,9 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp)SIFIVE_U_PLIC_CONTEXT_STRIDE , memmap[SIFIVE_U_DEV_PLIC].size);g_free (plic_hart_config); -sifive_uart_create (system_memory, memmap[SIFIVE_U_DEV_UART0 ].base, +sifive_uart_create (OBJECT (s), system_memory, memmap[SIFIVE_U_DEV_UART0 ].base,serial_hd (0 ),qdev_get_gpio_in (DEVICE (s->plic),SIFIVE_U_UART0_IRQ )); -sifive_uart_create (system_memory, memmap[SIFIVE_U_DEV_UART1 ].base, +sifive_uart_create (OBJECT (s), system_memory, memmap[SIFIVE_U_DEV_UART1 ].base,serial_hd (1 ),qdev_get_gpio_in (DEVICE (s->plic),SIFIVE_U_UART1_IRQ ));riscv_aclint_swi_create (OBJECT (dev), memmap[SIFIVE_U_DEV_CLINT ].base,0 , ms->smp.cpus, false);
hw/riscv/tt_atlantis.c +1 -1
@@ -545,7 +545,7 @@ static void tt_atlantis_machine_init(MachineState *machine) bootrom);/* UART1, the soc console (UART0 is for the boot microcontroller) */ -serial_mm_init (system_memory, s->memmap[TT_ATL_UART1 ].base,2 , +serial_mm_init (OBJECT (machine), system_memory, s->memmap[TT_ATL_UART1 ].base,2 ,qdev_get_gpio_in (s->irqchip,TT_ATL_UART1_IRQ ),115200 ,serial_hd (0 ),DEVICE_LITTLE_ENDIAN );/*
hw/riscv/virt.c +1 -1
@@ -1490,7 +1490,7 @@ static void virt_machine_init(MachineState *machine)create_platform_bus (s, mmio_irqchip); -serial_mm_init (system_memory, s->memmap[VIRT_UART0 ].base, +serial_mm_init (OBJECT (machine), system_memory, s->memmap[VIRT_UART0 ].base,0 ,qdev_get_gpio_in (mmio_irqchip,UART0_IRQ ),399193 ,serial_hd (0 ),DEVICE_LITTLE_ENDIAN );
hw/riscv/xiangshan_kmh.c +1 -1
@@ -112,7 +112,7 @@ static void xiangshan_kmh_soc_realize(DeviceState *dev, Error **errp) s->irqchip =xiangshan_kmh_create_aia (OBJECT (dev), num_harts);/* UART */ -serial_mm_init (system_memory, memmap[XIANGSHAN_KMH_UART0 ].base,2 , +serial_mm_init (OBJECT (s), system_memory, memmap[XIANGSHAN_KMH_UART0 ].base,2 ,qdev_get_gpio_in (s->irqchip,XIANGSHAN_KMH_UART0_IRQ ),115200 ,serial_hd (0 ),DEVICE_LITTLE_ENDIAN );
hw/sparc64/niagara.c +1 -1
@@ -151,7 +151,7 @@ static void niagara_init(MachineState *machine)exit (1 ); } } -serial_mm_init (sysmem,NIAGARA_UART_BASE ,0 ,NULL , +serial_mm_init (OBJECT (machine), sysmem,NIAGARA_UART_BASE ,0 ,NULL ,115200 ,serial_hd (0 ),DEVICE_BIG_ENDIAN );create_unimplemented_device ("sun4v-iob" ,NIAGARA_IOBBASE ,NIAGARA_IOBSIZE );sun4v_rtc_init (OBJECT (machine),NIAGARA_RTC_BASE );
hw/sparc64/sun4u.c +3 -3
@@ -319,14 +319,14 @@ static void ebus_realize(PCIDevice *pci_dev, Error **errp)/* Serial ports */ i =0 ;if (s->console_serial_base) { -serial_mm_init (pci_address_space (pci_dev), s->console_serial_base, +serial_mm_init (OBJECT (s),pci_address_space (pci_dev), s->console_serial_base,0 ,NULL ,115200 ,serial_hd (i),DEVICE_BIG_ENDIAN ); i++; } -serial_hds_isa_init (s->isa_bus, i,MAX_ISA_SERIAL_PORTS ); +serial_hds_isa_init (OBJECT (s), s->isa_bus, i,MAX_ISA_SERIAL_PORTS );/* Parallel ports */ -parallel_hds_isa_init (s->isa_bus,MAX_PARALLEL_PORTS ); +parallel_hds_isa_init (OBJECT (s), s->isa_bus,MAX_PARALLEL_PORTS );/* Keyboard */ isa_create_simple (OBJECT (s),"i8042" , s->isa_bus,TYPE_I8042 );
hw/xtensa/xtfpga.c +1 -1
@@ -312,7 +312,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)xtfpga_fpga_init (system_io,0x0d020000 , freq);xtfpga_net_init (system_io,0x0d030000 ,0x0d030400 ,0x0d800000 , extints[1 ]); -serial_mm_init (system_io,0x0d050020 ,2 , extints[0 ], +serial_mm_init (OBJECT (machine), system_io,0x0d050020 ,2 , extints[0 ],115200 ,serial_hd (0 ),DEVICE_NATIVE_ENDIAN ); dinfo =drive_get (IF_PFLASH ,0 ,0 );
include/hw/arm/exynos4210.h +1 -1
@@ -120,7 +120,7 @@ uint32_t exynos4210_get_irq(uint32_t grp, uint32_t bit);/* * exynos4210 UART */ -DeviceState *exynos4210_uart_create(hwaddr addr, +DeviceState *exynos4210_uart_create(Object *parent, hwaddr addr, int fifo_size, int channel, Chardev *chr,
include/hw/arm/omap.h +2 -2
@@ -256,7 +256,7 @@ struct omap_dma_lcd_channel_s {#define OMAP_DMA_USB_W2FC_TX2 31struct omap_uart_s ; -struct omap_uart_s *omap_uart_init (hwaddr base, +struct omap_uart_s *omap_uart_init (Object *parent,hwaddr base,qemu_irq irq,omap_clk fclk,omap_clk iclk,qemu_irq txdma,qemu_irq rxdma,const char *label,Chardev *chr);
@@ -426,7 +426,7 @@ struct omap_mpu_state_s { };/* omap1.c */ -struct omap_mpu_state_s *omap310_mpu_init (MemoryRegion *sdram, +struct omap_mpu_state_s *omap310_mpu_init (Object *parent,MemoryRegion *sdram,const char *core);#define OMAP_BAD_REG (paddr) \
include/hw/char/mchp_pfsoc_mmuart.h +1 -1
@@ -62,7 +62,7 @@ typedef struct MchpPfSoCMMUartState {* * @return: a pointer to the device specific control structure */ -MchpPfSoCMMUartState *mchp_pfsoc_mmuart_create (MemoryRegion *sysmem, +MchpPfSoCMMUartState *mchp_pfsoc_mmuart_create (Object *parent,MemoryRegion *sysmem,hwaddr base,qemu_irq irq,Chardev *chr);#endif /* HW_MCHP_PFSOC_MMUART_H */
include/hw/char/parallel.h +1 -1
@@ -23,7 +23,7 @@ typedef struct ParallelState {int it_shift; } ParallelState; -void parallel_hds_isa_init (ISABus *bus,int n); +void parallel_hds_isa_init (Object *parent,ISABus *bus,int n); bool parallel_mm_init(MemoryRegion *address_space, hwaddr base, int it_shift, qemu_irq irq,
include/hw/char/pl011.h +1 -1
@@ -60,6 +60,6 @@ struct PL011State { uint8_t padding_for_rust[16]; }; -DeviceState *pl011_create (hwaddr addr,qemu_irq irq,Chardev *chr); +DeviceState *pl011_create (Object *parent,hwaddr addr,qemu_irq irq,Chardev *chr);#endif
include/hw/char/serial-isa.h +1 -1
@@ -31,7 +31,7 @@#define MAX_ISA_SERIAL_PORTS 4#define TYPE_ISA_SERIAL "isa-serial" -void serial_hds_isa_init (ISABus *bus,int from,int to); +void serial_hds_isa_init (Object *parent,ISABus *bus,int from,int to);void isa_serial_set_iobase (ISADevice *serial,hwaddr iobase);void isa_serial_set_enabled (ISADevice *serial,bool enabled);
include/hw/char/serial-mm.h +1 -1
@@ -44,7 +44,7 @@ struct SerialMM {uint8_t endianness; }; -SerialMM *serial_mm_init (MemoryRegion *address_space, +SerialMM *serial_mm_init (Object *parent,MemoryRegion *address_space,hwaddr base,int regshift,qemu_irq irq,int baudbase,Chardev *chr,enum device_endian end);
include/hw/char/sifive_uart.h +2 -2
@@ -85,7 +85,7 @@ struct SiFiveUARTState { QEMUTimer *fifo_trigger_handle; }; -SiFiveUARTState *sifive_uart_create (MemoryRegion *address_space,hwaddr base, -Chardev *chr,qemu_irq irq); +SiFiveUARTState *sifive_uart_create (Object *parent,MemoryRegion *address_space, +hwaddr base,Chardev *chr,qemu_irq irq);#endif
include/hw/m68k/mcf.h +3 -2
@@ -10,8 +10,9 @@ uint64_t mcf_uart_read(void *opaque, hwaddr addr, unsigned size);void mcf_uart_write (void *opaque,hwaddr addr,uint64_t val,unsigned size); -DeviceState *mcf_uart_create (qemu_irq irq,Chardev *chr); -DeviceState *mcf_uart_create_mmap (hwaddr base,qemu_irq irq,Chardev *chr); +DeviceState *mcf_uart_create (Object *parent,qemu_irq irq,Chardev *chr); +DeviceState *mcf_uart_create_mmap (Object *parent,hwaddr base,qemu_irq irq, +Chardev *chr);/* mcf_intc.c */ DeviceState *mcf_intc_init(Object *parent, struct MemoryRegion *sysmem,
include/hw/ppc/spapr_vio.h +1 -1
@@ -137,7 +137,7 @@ int spapr_vio_send_crq(SpaprVioDevice *dev, uint8_t *crq);SpaprVioDevice *vty_lookup (SpaprMachineState *spapr,target_ulong reg);void vty_putchars (SpaprVioDevice *sdev,uint8_t *buf,int len); -void spapr_vty_create (SpaprVioBus *bus,Chardev *chardev); +void spapr_vty_create (Object *parent,SpaprVioBus *bus,Chardev *chardev);void spapr_vlan_create (Object *parent,SpaprVioBus *bus,NICInfo *nd);void spapr_vscsi_create (Object *parent,SpaprVioBus *bus);
Signature · 1 line
2.47.1
RFC PATCH 49/134 hw/isa: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/isa to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/isa/i82378.c:106 | isa_new | OBJECT(s) | "pcspk" | i82378_realize() creates ISA children of the i82378 PCI-ISA bridge hw/isa/i82378.c:113 | isa_create_simple | OBJECT(s) | "dma" | i82378_realize() creates ISA children of the i82378 PCI-ISA bridge hw/isa/isa-bus.c:62 | qdev_new_orphan | ORPHAN-JUSTIFIED | - | fallback isabus-bridge when caller passes dev==NULL; parenting requires isa_bus_new() signature change across many callers, deferred hw/isa/isa-bus.c:174 | isa_new_orphan | ORPHAN-JUSTIFIED | - | API definition (transitional _orphan wrapper) hw/isa/isa-bus.c:176 | qdev_new_orphan | ORPHAN-JUSTIFIED | - | API definition body of isa_new_orphan() hw/isa/isa-bus.c:179 | isa_try_new_orphan | ORPHAN-JUSTIFIED | - | API definition (transitional _orphan wrapper) hw/isa/isa-bus.c:181 | qdev_try_new_orphan | ORPHAN-JUSTIFIED | - | API definition body of isa_try_new_orphan() hw/isa/isa-bus.c:184 | isa_create_simple_orphan | ORPHAN-JUSTIFIED | - | API definition (transitional _orphan wrapper) hw/isa/isa-bus.c:188 | isa_new_orphan | ORPHAN-JUSTIFIED | - | API definition body of isa_create_simple_orphan() hw/isa/isa-bus.c:208 | isa_create_simple_orphan | ORPHAN-JUSTIFIED | - | isa_vga_init() is a public helper called from board code (hw/i386/pc.c); needs Object *parent threaded through include/hw/isa/isa.h; deferred to caller-side patch hw/isa/isa-bus.c:213 | isa_create_simple_orphan | ORPHAN-JUSTIFIED | - | isa_vga_init() is a public helper called from board code; deferred to caller-side patch hw/isa/isa-superio.c:57 | isa_new | OBJECT(dev) | name | isa_superio_realize(); collapse existing object_property_add_child(OBJECT(dev), name, ...) keeping dynamic per-index name hw/isa/isa-superio.c:96 | isa_new | OBJECT(dev) | name | isa_superio_realize(); collapse existing object_property_add_child(OBJECT(dev), name, ...) keeping dynamic per-index name hw/isa/isa-superio.c:123 | isa_new | OBJECT(sio) | "isa-fdc" | isa_superio_realize(); collapse existing object_property_add_child(OBJECT(sio), "isa-fdc", ...) hw/isa/isa-superio.c:147 | isa_new | OBJECT(sio) | TYPE_I8042 | isa_superio_realize(); collapse existing object_property_add_child(OBJECT(sio), TYPE_I8042, ...) hw/isa/isa-superio.c:154 | isa_new | OBJECT(sio) | "isa-ide" | isa_superio_realize(); collapse existing object_property_add_child(OBJECT(sio), "isa-ide", ...)
--- hw/isa/i82378.c | 6 +++--- hw/isa/isa-superio.c | 25 ++++++++++--------------- 2 files changed, 13 insertions(+), 18 deletions(-)
hw/isa/i82378.c +3 -3
@@ -103,14 +103,14 @@ static void i82378_realize(PCIDevice *pci, Error **errp) pit =i8254_pit_init (isabus,0x40 ,0 ,NULL );/* speaker */ - pcspk =isa_new_orphan (TYPE_PC_SPEAKER ); + pcspk =isa_new (OBJECT (s),"pcspk" ,TYPE_PC_SPEAKER );object_property_set_link (OBJECT (pcspk),"pit" ,OBJECT (pit), &error_fatal); -if (!isa_realize_and_unref (pcspk, isabus, errp)) { +if (!qdev_realize (DEVICE (pcspk),BUS (isabus), errp)) {return ; }/* 2 82C37 (dma) */ -isa_create_simple_orphan (isabus,"i82374" ); +isa_create_simple (OBJECT (s),"dma" , isabus,"i82374" ); }static void i82378_init (Object *obj)
hw/isa/isa-superio.c +10 -15
@@ -54,7 +54,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp) }else { name =g_strdup_printf ("parallel%d" , i); } - isa =isa_new_orphan (TYPE_ISA_PARALLEL ); + isa =isa_new (OBJECT (dev), name,TYPE_ISA_PARALLEL ); d =DEVICE (isa);qdev_prop_set_uint32 (d,"index" , i);if (k->parallel.get_iobase) {
@@ -65,8 +65,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp)qdev_prop_set_uint32 (d,"irq" , k->parallel.get_irq (sio, i)); }qdev_prop_set_chr (d,"chardev" , chr); -object_property_add_child (OBJECT (dev), name,OBJECT (isa)); -isa_realize_and_unref (isa, bus, &error_fatal); +qdev_realize (DEVICE (isa),BUS (bus), &error_fatal); sio->parallel[i] = isa; trace_superio_create_parallel(i, k->parallel.get_iobase ?
@@ -93,7 +92,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp) }else { name =g_strdup_printf ("serial%d" , i); } - isa =isa_new_orphan (TYPE_ISA_SERIAL ); + isa =isa_new (OBJECT (dev), name,TYPE_ISA_SERIAL ); d =DEVICE (isa);qdev_prop_set_uint32 (d,"index" , i);if (k->serial.get_iobase) {
@@ -104,8 +103,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp)qdev_prop_set_uint32 (d,"irq" , k->serial.get_irq (sio, i)); }qdev_prop_set_chr (d,"chardev" , chr); -object_property_add_child (OBJECT (dev), name,OBJECT (isa)); -isa_realize_and_unref (isa, bus, &error_fatal); +qdev_realize (DEVICE (isa),BUS (bus), &error_fatal); sio->serial[i] = isa; trace_superio_create_serial(i, k->serial.get_iobase ?
@@ -120,7 +118,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp)assert (k->floppy.count <=1 );if (k->floppy.count && (!k->floppy.is_enabled || k->floppy.is_enabled (sio,0 ))) { - isa =isa_new_orphan (TYPE_ISA_FDC ); + isa =isa_new (OBJECT (sio),"isa-fdc" ,TYPE_ISA_FDC ); d =DEVICE (isa);if (k->floppy.get_iobase) {qdev_prop_set_uint32 (d,"iobase" , k->floppy.get_iobase (sio,0 ));
@@ -132,8 +130,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp)for (i =0 ; i <MAX_FD ; i++) { fd[i] =drive_get (IF_FLOPPY ,0 , i); } -object_property_add_child (OBJECT (sio),"isa-fdc" ,OBJECT (isa)); -isa_realize_and_unref (isa, bus, &error_fatal); +qdev_realize (DEVICE (isa),BUS (bus), &error_fatal);isa_fdc_init_drives (isa, fd); sio->floppy = isa; trace_superio_create_floppy(0,
@@ -144,14 +141,13 @@ static void isa_superio_realize(DeviceState *dev, Error **errp) }/* Keyboard, mouse */ - isa =isa_new_orphan (TYPE_I8042 ); -object_property_add_child (OBJECT (sio),TYPE_I8042 ,OBJECT (isa)); -isa_realize_and_unref (isa, bus, &error_fatal); + isa =isa_new (OBJECT (sio),TYPE_I8042 ,TYPE_I8042 ); +qdev_realize (DEVICE (isa),BUS (bus), &error_fatal); sio->kbc = isa;/* IDE */ if (k->ide.count && (!k->ide.is_enabled || k->ide.is_enabled (sio,0 ))) { - isa =isa_new_orphan ("isa-ide" ); + isa =isa_new (OBJECT (sio),"isa-ide" ,"isa-ide" ); d =DEVICE (isa);if (k->ide.get_iobase) {qdev_prop_set_uint32 (d,"iobase" , k->ide.get_iobase (sio,0 ));
@@ -162,8 +158,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp)if (k->ide.get_irq) {qdev_prop_set_uint32 (d,"irq" , k->ide.get_irq (sio,0 )); } -object_property_add_child (OBJECT (sio),"isa-ide" ,OBJECT (isa)); -isa_realize_and_unref (isa, bus, &error_fatal); +qdev_realize (DEVICE (isa),BUS (bus), &error_fatal); sio->ide = isa; trace_superio_create_ide(0, k->ide.get_iobase ?
Signature · 1 line
2.47.1
RFC PATCH 50/134 hw/pci: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/pci to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/pci/pci.c:2121 | pci_new_orphan | ORPHAN-JUSTIFIED | - | pci_init_nic_in_slot() is a public helper called from board init in hw/{riscv,sh4,ppc,mips}; parenting requires threading Object* through include/hw/pci/pci.h and 5 callers; deferred to caller-side patches
hw/pci/pci.c:2132 | pci_create_simple_orphan | ORPHAN-JUSTIFIED | - | pci_vga_init() is a public helper called from board init in hw/{i386,ppc,mips,alpha}; parenting requires threading Object* through include/hw/pci/pci.h and 11 callers; deferred to caller-side patches
hw/pci/pci.c:2134 | pci_create_simple_orphan | ORPHAN-JUSTIFIED | - | pci_vga_init() public helper; deferred (see :2132)
hw/pci/pci.c:2136 | pci_create_simple_orphan | ORPHAN-JUSTIFIED | - | pci_vga_init() public helper; deferred (see :2132)
hw/pci/pci.c:2138 | pci_create_simple_orphan | ORPHAN-JUSTIFIED | - | pci_vga_init() public helper; deferred (see :2132)
hw/pci/pci.c:2140 | pci_create_simple_orphan | ORPHAN-JUSTIFIED | - | pci_vga_init() public helper; deferred (see :2132)
hw/pci/pci.c:2396 | qdev_new_orphan | ORPHAN-JUSTIFIED | - | pci_new_internal() is the implementation body of pci_new*_orphan() transitional API
hw/pci/pci.c:2443 | pci_new_multifunction_orphan | ORPHAN-JUSTIFIED | - | API definition (transitional _orphan wrapper)
hw/pci/pci.c:2448 | pci_new_orphan | ORPHAN-JUSTIFIED | - | API definition (transitional _orphan wrapper)
hw/pci/pci.c:2458 | pci_create_simple_multifunction_orphan | ORPHAN-JUSTIFIED | - | API definition (transitional _orphan wrapper)
hw/pci/pci.c:2461 | pci_new_multifunction_orphan | ORPHAN-JUSTIFIED | - | API definition body of pci_create_simple_multifunction_orphan()
hw/pci/pci.c:2466 | pci_create_simple_orphan | ORPHAN-JUSTIFIED | - | API definition (transitional _orphan wrapper)
hw/pci/pci.c:2468 | pci_new_orphan | ORPHAN-JUSTIFIED | - | API definition body of pci_create_simple_orphan()hw/pci/pcie_sriov.c:174 | pci_new | OBJECT(dev) | "vf[*]" | pcie_sriov_pf_init(): VFs are children of the PF PCIDevice; already uses qdev_realize(); drop extra object_unref() on error path since parent child<> holds the only ref
--- hw/pci/pcie_sriov.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
hw/pci/pcie_sriov.c +1 -2
@@ -171,13 +171,12 @@ bool pcie_sriov_pf_init(PCIDevice *dev, uint16_t offset, dev->exp.sriov_pf.vf = g_new(PCIDevice *, total_vfs);for (uint16_t i =0 ; i < total_vfs; i++) { -PCIDevice *vf =pci_new_orphan (devfn, vfname); +PCIDevice *vf =pci_new (OBJECT (dev),"vf[*]" , devfn, vfname); vf->exp.sriov_vf.pf = dev; vf->exp.sriov_vf.vf_number = i;if (!qdev_realize (&vf->qdev, bus, errp)) {object_unparent (OBJECT (vf)); -object_unref (vf);unparent_vfs (dev, i);return false; }
Signature · 1 line
2.47.1
RFC PATCH 51/134 hw/riscv: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/riscv to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/riscv/boston-aia.c:308 | qdev_new | OBJECT(machine) | "pcie" | static helper called from board init; thread Object *parent through hw/riscv/boston-aia.c:355 | qdev_new | OBJECT(machine) | "boston" | board MachineClass.init() hw/riscv/boston-aia.c:422 | pci_create_simple_multifunction | OBJECT(machine) | "ahci" | board MachineClass.init() hw/riscv/microblaze-v-generic.c:82 | qdev_new | OBJECT(machine) | "intc" | board MachineClass.init() hw/riscv/microblaze-v-generic.c:95 | qdev_new | OBJECT(machine) | "uartlite" | board MachineClass.init() hw/riscv/microblaze-v-generic.c:108 | qdev_new | OBJECT(machine) | "timer[*]" | board MachineClass.init(); two timers hw/riscv/microblaze-v-generic.c:117 | qdev_new | OBJECT(machine) | "timer[*]" | board MachineClass.init(); two timers hw/riscv/microblaze-v-generic.c:126 | qdev_new | OBJECT(machine) | "ethlite" | board MachineClass.init() hw/riscv/microblaze-v-generic.c:136 | qdev_new | OBJECT(machine) | "xilinx-eth" | board init; collapse existing object_property_add_child, keep name hw/riscv/microblaze-v-generic.c:137 | qdev_new | OBJECT(machine) | "xilinx-dma" | board init; collapse existing object_property_add_child, keep name hw/riscv/microchip_pfsoc.c:584 | qdev_new | OBJECT(machine) | "sd-card" | board MachineClass.init() hw/riscv/sifive_u.c:596 | qdev_new | OBJECT(machine) | "flash" | board MachineClass.init() hw/riscv/sifive_u.c:609 | ssi_create_peripheral | OBJECT(machine) | "ssi-sd" | board MachineClass.init() hw/riscv/sifive_u.c:616 | qdev_new | OBJECT(machine) | "sd-card" | board MachineClass.init() hw/riscv/tt_atlantis.c:580 | i2c_slave_create_simple | OBJECT(s) | "rtc" | board init; s is TTAtlantisState (machine) hw/riscv/tt_atlantis.c:581 | i2c_slave_create_simple | OBJECT(s) | "tmp105" | board init; s is TTAtlantisState (machine) hw/riscv/virt.c:129 | qdev_new | OBJECT(s) | name | helper receives RISCVVirtState *s; collapse existing object_property_add_child, keep name arg hw/riscv/virt.c:1054 | qdev_new | OBJECT(s) | "pcie" | helper receives RISCVVirtState *s (machine) hw/riscv/virt.c:1147 | qdev_new | OBJECT(s) | "platform-bus" | helper receives RISCVVirtState *s (machine) hw/riscv/virt.c:1484 | sysbus_create_simple | OBJECT(machine) | "virtio-mmio[*]" | board MachineClass.init(); loop hw/riscv/virt.c:1497 | sysbus_create_simple | OBJECT(machine) | "rtc" | board MachineClass.init() hw/riscv/virt.c:1519 | qdev_new | OBJECT(machine) | "iommu" | board MachineClass.init()
--- hw/riscv/boston-aia.c | 17 +++++++++-------- hw/riscv/microblaze-v-generic.c | 32 ++++++++++++++------------------ hw/riscv/microchip_pfsoc.c | 5 +++-- hw/riscv/sifive_u.c | 15 ++++++++------- hw/riscv/tt_atlantis.c | 5 +++-- hw/riscv/virt.c | 24 ++++++++++++------------ 6 files changed, 49 insertions(+), 49 deletions(-)
hw/riscv/boston-aia.c +9 -8
@@ -297,7 +297,7 @@ static void gen_firmware(uint32_t *p) }static inline XilinxPCIEHost * -xilinx_pcie_init (MemoryRegion *sys_mem,uint32_t bus_nr, +xilinx_pcie_init (Object *parent,MemoryRegion *sys_mem,uint32_t bus_nr,hwaddr cfg_base,uint64_t cfg_size,hwaddr mmio_base,uint64_t mmio_size,qemu_irq irq)
@@ -305,7 +305,7 @@ xilinx_pcie_init(MemoryRegion *sys_mem, uint32_t bus_nr,DeviceState *dev;MemoryRegion *cfg, *mmio; - dev =qdev_new_orphan (TYPE_XILINX_PCIE_HOST ); + dev =qdev_new (parent,"pcie" ,TYPE_XILINX_PCIE_HOST );qdev_prop_set_uint32 (dev,"bus_nr" , bus_nr);qdev_prop_set_uint64 (dev,"cfg_base" , cfg_base);
@@ -313,7 +313,7 @@ xilinx_pcie_init(MemoryRegion *sys_mem, uint32_t bus_nr,qdev_prop_set_uint64 (dev,"mmio_base" , mmio_base);qdev_prop_set_uint64 (dev,"mmio_size" , mmio_size); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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 );
@@ -352,8 +352,8 @@ static void boston_mach_init(MachineState *machine)exit (1 ); } - dev =qdev_new_orphan (TYPE_MIPS_BOSTON_AIA ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); + dev =qdev_new (OBJECT (machine),"boston" ,TYPE_MIPS_BOSTON_AIA ); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); s =BOSTON (dev); s->mach = machine;
@@ -390,7 +390,7 @@ static void boston_mach_init(MachineState *machine) MIN(machine->ram_size, (256 * MiB)));memory_region_add_subregion_overlap (sys_mem,0 , ddr_low_alias,0 ); - pcie2 = xilinx_pcie_init(sys_mem, 2, + pcie2 = xilinx_pcie_init(OBJECT(machine), sys_mem, 2, boston_memmap[BOSTON_PCIE2].base, boston_memmap[BOSTON_PCIE2].size, boston_memmap[BOSTON_PCIE2_MMIO].base,
@@ -419,8 +419,9 @@ static void boston_mach_init(MachineState *machine)qemu_chr_fe_set_handlers (&s->lcd_display,NULL ,NULL , boston_lcd_event,NULL , s,NULL , true); - pdev =pci_create_simple_multifunction_orphan (&PCI_BRIDGE (&pcie2->root)->sec_bus, -PCI_DEVFN (0 ,0 ),TYPE_ICH9_AHCI ); + pdev =pci_create_simple_multifunction (OBJECT (machine),"ahci" , + &PCI_BRIDGE (&pcie2->root)->sec_bus, +PCI_DEVFN (0 ,0 ),TYPE_ICH9_AHCI ); ich9 =ICH9_AHCI (pdev);g_assert (ARRAY_SIZE (hd) == ich9->ahci.ports);ide_drive_get (hd, ich9->ahci.ports);
hw/riscv/microblaze-v-generic.c +14 -18
@@ -79,11 +79,11 @@ static void mb_v_generic_init(MachineState *machine) ram_size, &error_fatal);memory_region_add_subregion (sysmem, ddr_base, phys_ram); - dev =qdev_new_orphan ("xlnx.xps-intc" ); + dev =qdev_new (OBJECT (machine),"intc" ,"xlnx.xps-intc" );qdev_prop_set_enum (dev,"endianness" ,ENDIAN_MODE_LITTLE );qdev_prop_set_uint32 (dev,"kind-of-intr" ,1 <<UARTLITE_IRQ ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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),11 ));
@@ -92,10 +92,10 @@ static void mb_v_generic_init(MachineState *machine) }/* Uartlite */ - dev =qdev_new_orphan (TYPE_XILINX_UARTLITE ); + dev =qdev_new (OBJECT (machine),"uartlite" ,TYPE_XILINX_UARTLITE );qdev_prop_set_enum (dev,"endianness" ,ENDIAN_MODE_LITTLE );qdev_prop_set_chr (dev,"chardev" ,serial_hd (0 )); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,UARTLITE_BASEADDR );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq[UARTLITE_IRQ ]);
@@ -105,40 +105,36 @@ static void mb_v_generic_init(MachineState *machine) DEVICE_LITTLE_ENDIAN);/* 2 timers at irq 0 @ 100 Mhz. */ - dev =qdev_new_orphan ("xlnx.xps-timer" ); + dev =qdev_new (OBJECT (machine),"timer[*]" ,"xlnx.xps-timer" );qdev_prop_set_enum (dev,"endianness" ,ENDIAN_MODE_LITTLE );qdev_prop_set_uint32 (dev,"one-timer-only" ,0 );qdev_prop_set_uint32 (dev,"clock-frequency" ,100000000 ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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 ]);/* 2 timers at irq 3 @ 100 Mhz. */ - dev =qdev_new_orphan ("xlnx.xps-timer" ); + dev =qdev_new (OBJECT (machine),"timer[*]" ,"xlnx.xps-timer" );qdev_prop_set_enum (dev,"endianness" ,ENDIAN_MODE_LITTLE );qdev_prop_set_uint32 (dev,"one-timer-only" ,0 );qdev_prop_set_uint32 (dev,"clock-frequency" ,100000000 ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,TIMER_BASEADDR2 );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq[TIMER_IRQ2 ]);/* Emaclite */ - dev =qdev_new_orphan ("xlnx.xps-ethernetlite" ); + dev =qdev_new (OBJECT (machine),"ethlite" ,"xlnx.xps-ethernetlite" );qdev_prop_set_enum (dev,"endianness" ,ENDIAN_MODE_LITTLE );qemu_configure_nic_device (dev, true,NULL );qdev_prop_set_uint32 (dev,"tx-ping-pong" ,0 );qdev_prop_set_uint32 (dev,"rx-ping-pong" ,0 ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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 ]);/* axi ethernet and dma initialization. */ - eth0 =qdev_new_orphan ("xlnx.axi-ethernet" ); - dma =qdev_new_orphan ("xlnx.axi-dma" ); - -/* FIXME: attach to the sysbus instead */ -object_property_add_child (qdev_get_machine (),"xilinx-eth" ,OBJECT (eth0)); -object_property_add_child (qdev_get_machine (),"xilinx-dma" ,OBJECT (dma)); + eth0 =qdev_new (OBJECT (machine),"xilinx-eth" ,"xlnx.axi-ethernet" ); + dma =qdev_new (OBJECT (machine),"xilinx-dma" ,"xlnx.axi-dma" ); ds =object_property_get_link (OBJECT (dma),"axistream-connected-target" ,NULL );
@@ -151,7 +147,7 @@ static void mb_v_generic_init(MachineState *machine) &error_abort);object_property_set_link (OBJECT (eth0),"axistream-control-connected" , cs, &error_abort); -sysbus_realize_and_unref (SYS_BUS_DEVICE (eth0), &error_fatal); +sysbus_realize (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 ]);
@@ -164,7 +160,7 @@ static void mb_v_generic_init(MachineState *machine) &error_abort);object_property_set_link (OBJECT (dma),"axistream-control-connected" , cs, &error_abort); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dma), &error_fatal); +sysbus_realize (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 ]);
hw/riscv/microchip_pfsoc.c +3 -2
@@ -581,11 +581,12 @@ static void microchip_icicle_kit_machine_init(MachineState *machine)/* Attach an SD card */ if (dinfo) {CadenceSDHCIState *sdhci = &(s->soc.sdhci); -DeviceState *card =qdev_new_orphan (TYPE_SD_CARD ); +DeviceState *card =qdev_new (OBJECT (machine),"sd-card" , +TYPE_SD_CARD );qdev_prop_set_drive_err (card,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); -qdev_realize_and_unref (card, sdhci->bus, &error_fatal); +qdev_realize (card, sdhci->bus, &error_fatal); }/*
hw/riscv/sifive_u.c +8 -7
@@ -593,31 +593,32 @@ static void sifive_u_machine_init(MachineState *machine) sizeof(reset_vec), kernel_entry);/* Connect an SPI flash to SPI0 */ - flash_dev =qdev_new_orphan ("is25wp256" ); + flash_dev =qdev_new (OBJECT (machine),"flash" ,"is25wp256" ); dinfo =drive_get (IF_MTD ,0 ,0 );if (dinfo) {qdev_prop_set_drive_err (flash_dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); } -qdev_realize_and_unref (flash_dev,BUS (s->soc.spi0.spi), &error_fatal); +qdev_realize (flash_dev,BUS (s->soc.spi0.spi), &error_fatal); flash_cs =qdev_get_gpio_in_named (flash_dev,SSI_GPIO_CS ,0 );sysbus_connect_irq (SYS_BUS_DEVICE (&s->soc.spi0),1 , flash_cs);/* Connect an SD card to SPI2 */ - sd_dev =ssi_create_peripheral_orphan (s->soc.spi2.spi,"ssi-sd" ); + sd_dev =ssi_create_peripheral (OBJECT (machine),"ssi-sd" , + s->soc.spi2.spi,"ssi-sd" ); sd_cs =qdev_get_gpio_in_named (sd_dev,SSI_GPIO_CS ,0 );sysbus_connect_irq (SYS_BUS_DEVICE (&s->soc.spi2),1 , sd_cs); dinfo =drive_get (IF_SD ,0 ,0 ); blk = dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ; - card_dev =qdev_new_orphan (TYPE_SD_CARD_SPI ); + card_dev =qdev_new (OBJECT (machine),"sd-card" ,TYPE_SD_CARD_SPI );qdev_prop_set_drive_err (card_dev,"drive" , blk, &error_fatal); -qdev_realize_and_unref (card_dev, -qdev_get_child_bus (sd_dev,"sd-bus" ), - &error_fatal); +qdev_realize (card_dev, +qdev_get_child_bus (sd_dev,"sd-bus" ), + &error_fatal); }static bool sifive_u_machine_get_start_in_flash (Object *obj,Error **errp)
hw/riscv/tt_atlantis.c +3 -2
@@ -577,8 +577,9 @@ static void tt_atlantis_machine_init(MachineState *machine) }/* I2C peripherals: qemu specific */ -i2c_slave_create_simple_orphan (i2c_get_bus (s,0 ),"ds1338" ,0x6f ); -i2c_slave_create_simple_orphan (i2c_get_bus (s,4 ),"tmp105" ,0x48 ); +i2c_slave_create_simple (OBJECT (s),"rtc" ,i2c_get_bus (s,0 ),"ds1338" ,0x6f ); +i2c_slave_create_simple (OBJECT (s),"tmp105" ,i2c_get_bus (s,4 ), +"tmp105" ,0x48 );/* Load or create device tree */ if (machine->dtb) {
hw/riscv/virt.c +12 -12
@@ -126,7 +126,7 @@ static PFlashCFI01 *virt_flash_create1(RISCVVirtState *s,* Create a single flash device. We use the same parameters as * the flash devices on the ARM virt board. */ -DeviceState *dev =qdev_new_orphan (TYPE_PFLASH_CFI01 ); +DeviceState *dev =qdev_new (OBJECT (s), name,TYPE_PFLASH_CFI01 );qdev_prop_set_uint64 (dev,"sector-length" ,VIRT_FLASH_SECTOR_SIZE );qdev_prop_set_uint8 (dev,"width" ,4 );
@@ -138,7 +138,6 @@ static PFlashCFI01 *virt_flash_create1(RISCVVirtState *s,qdev_prop_set_uint16 (dev,"id3" ,0x00 );qdev_prop_set_string (dev,"name" , name); -object_property_add_child (OBJECT (s), name,OBJECT (dev));object_property_add_alias (OBJECT (s), alias_prop_name,OBJECT (dev),"drive" );
@@ -160,7 +159,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 ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); memory_region_add_subregion(sysmem, base, sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),
@@ -1051,7 +1050,7 @@ static inline DeviceState *gpex_pcie_init(MemoryRegion *sys_mem,qemu_irq irq;int i; - dev =qdev_new_orphan (TYPE_GPEX_HOST ); + dev =qdev_new (OBJECT (s),"pcie" ,TYPE_GPEX_HOST );/* Set GPEX object properties for the virt machine */ object_property_set_uint(OBJECT(dev), PCI_HOST_ECAM_BASE,
@@ -1071,7 +1070,7 @@ static inline DeviceState *gpex_pcie_init(MemoryRegion *sys_mem,object_property_set_int (OBJECT (dev),PCI_HOST_PIO_SIZE , pio_size,NULL ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); ecam_alias =g_new0 (MemoryRegion,1 ); ecam_reg =sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 );
@@ -1144,11 +1143,11 @@ static void create_platform_bus(RISCVVirtState *s, DeviceState *irqchip)int i;MemoryRegion *sysmem =get_system_memory (); - dev =qdev_new_orphan (TYPE_PLATFORM_BUS_DEVICE ); + dev =qdev_new (OBJECT (s),"platform-bus" ,TYPE_PLATFORM_BUS_DEVICE ); dev->id =g_strdup (TYPE_PLATFORM_BUS_DEVICE );qdev_prop_set_uint32 (dev,"num_irqs" ,VIRT_PLATFORM_BUS_NUM_IRQS );qdev_prop_set_uint32 (dev,"mmio_size" , s->memmap[VIRT_PLATFORM_BUS ].size); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); s->platform_bus_dev = dev; sysbus =SYS_BUS_DEVICE (dev);
@@ -1481,7 +1480,7 @@ static void virt_machine_init(MachineState *machine)/* VirtIO MMIO devices */ for (i =0 ; i <VIRTIO_COUNT ; i++) { -sysbus_create_simple_orphan ("virtio-mmio" , +sysbus_create_simple (OBJECT (machine),"virtio-mmio[*]" ,"virtio-mmio" , s->memmap[VIRT_VIRTIO ].base + i * s->memmap[VIRT_VIRTIO ].size,qdev_get_gpio_in (virtio_irqchip,VIRTIO_IRQ + i)); }
@@ -1494,8 +1493,8 @@ static void virt_machine_init(MachineState *machine)0 ,qdev_get_gpio_in (mmio_irqchip,UART0_IRQ ),399193 , serial_hd(0), DEVICE_LITTLE_ENDIAN); -sysbus_create_simple_orphan ("goldfish_rtc" , s->memmap[VIRT_RTC ].base, -qdev_get_gpio_in (mmio_irqchip,RTC_IRQ )); +sysbus_create_simple (OBJECT (machine),"rtc" ,"goldfish_rtc" , + s->memmap[VIRT_RTC ].base,qdev_get_gpio_in (mmio_irqchip,RTC_IRQ ));for (i =0 ; i <ARRAY_SIZE (s->flash); i++) {/* Map legacy -drive if=pflash to machine properties */
@@ -1516,7 +1515,8 @@ static void virt_machine_init(MachineState *machine) }if (virt_is_iommu_sys_enabled (s)) { -DeviceState *iommu_sys =qdev_new_orphan (TYPE_RISCV_IOMMU_SYS ); +DeviceState *iommu_sys =qdev_new (OBJECT (machine),"iommu" , +TYPE_RISCV_IOMMU_SYS ); object_property_set_uint(OBJECT(iommu_sys), "addr", s->memmap[VIRT_IOMMU_SYS].base,
@@ -1535,7 +1535,7 @@ static void virt_machine_init(MachineState *machine)riscv_is_32bit (&s->soc[0 ]) ?34 :56 , &error_fatal); -sysbus_realize_and_unref (SYS_BUS_DEVICE (iommu_sys), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (iommu_sys), &error_fatal); } s->machine_done.notify = virt_machine_done;
Signature · 1 line
2.47.1
RFC PATCH 52/134 hw/mips: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/mips to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/mips/boston.c:435 | qdev_new | parent | "pcie[*]" | static helper called 3x from board init; thread Object *parent as first arg hw/mips/boston.c:691 | qdev_new | OBJECT(machine) | "boston" | board MachineClass.init() hw/mips/boston.c:773 | pci_create_simple_multifunction | OBJECT(machine) | "ahci" | board MachineClass.init() hw/mips/fuloong2e.c:289 | pci_new_multifunction | OBJECT(machine) | "via" | board MachineClass.init() hw/mips/fuloong2e.c:315 | pci_new | OBJECT(machine) | "vga" | board MachineClass.init() hw/mips/jazz.c:130 | qdev_new | parent | "dp8393x" | static helper called from board init; thread Object *parent as first arg hw/mips/jazz.c:292 | isa_new | OBJECT(machine) | "pcspk" | board MachineClass.init() helper receiving MachineState* hw/mips/jazz.c:299 | qdev_new | OBJECT(machine) | "g364" | board MachineClass.init() helper receiving MachineState* hw/mips/jazz.c:316 | qdev_new | OBJECT(machine) | "vga" | board MachineClass.init() helper receiving MachineState* hw/mips/jazz.c:332 | qdev_new | OBJECT(machine) | "esp" | board MachineClass.init() helper receiving MachineState* hw/mips/jazz.c:363 | qdev_new | OBJECT(machine) | "i8042" | board MachineClass.init() helper receiving MachineState* hw/mips/jazz.c:393 | qdev_new | OBJECT(machine) | "nvram" | board MachineClass.init() helper receiving MachineState* hw/mips/jazz.c:399 | sysbus_create_simple | OBJECT(machine) | "led" | board MachineClass.init() helper receiving MachineState* hw/mips/loongson3_virt.c:427 | qdev_new | OBJECT(machine) | "pcie" | inline helper receiving MachineState* from board init hw/mips/loongson3_virt.c:468 | pci_create_simple | OBJECT(machine) | "ohci" | inline helper receiving MachineState* from board init hw/mips/loongson3_virt.c:471 | usb_create_simple | OBJECT(machine) | "usb-kbd" | inline helper receiving MachineState* from board init hw/mips/loongson3_virt.c:472 | usb_create_simple | OBJECT(machine) | "usb-tablet" | inline helper receiving MachineState* from board init hw/mips/loongson3_virt.c:522 | qdev_new | OBJECT(machine) | "ipi" | board MachineClass.init() hw/mips/loongson3_virt.c:530 | qdev_new | OBJECT(machine) | "liointc" | board MachineClass.init() hw/mips/loongson3_virt.c:539 | sysbus_create_simple | OBJECT(machine) | "rtc" | board MachineClass.init() hw/mips/malta.c:1101 | qdev_new | OBJECT(machine) | "malta" | board MachineClass.init() hw/mips/malta.c:1230 | qdev_new | OBJECT(machine) | "gt64120" | board MachineClass.init() hw/mips/malta.c:1237 | pci_new_multifunction | OBJECT(machine) | "piix4" | board MachineClass.init() hw/mips/malta.c:1257 | isa_create_simple | OBJECT(machine) | "superio" | board MachineClass.init()
--- hw/mips/boston.c | 21 +++++++++++---------- hw/mips/fuloong2e.c | 9 +++++---- hw/mips/jazz.c | 36 +++++++++++++++++++----------------- hw/mips/loongson3_virt.c | 22 ++++++++++++---------- hw/mips/malta.c | 16 +++++++++------- 5 files changed, 56 insertions(+), 48 deletions(-)
hw/mips/boston.c +11 -10
@@ -424,7 +424,7 @@ static const struct fit_loader boston_fit_loader = { };static inline XilinxPCIEHost * -xilinx_pcie_init (MemoryRegion *sys_mem,uint32_t bus_nr, +xilinx_pcie_init (Object *parent,MemoryRegion *sys_mem,uint32_t bus_nr,hwaddr cfg_base,uint64_t cfg_size,hwaddr mmio_base,uint64_t mmio_size,qemu_irq irq)
@@ -432,7 +432,7 @@ xilinx_pcie_init(MemoryRegion *sys_mem, uint32_t bus_nr,DeviceState *dev;MemoryRegion *cfg, *mmio; - dev =qdev_new_orphan (TYPE_XILINX_PCIE_HOST ); + dev =qdev_new (parent,"pcie[*]" ,TYPE_XILINX_PCIE_HOST );qdev_prop_set_uint32 (dev,"bus_nr" , bus_nr);qdev_prop_set_uint64 (dev,"cfg_base" , cfg_base);
@@ -440,7 +440,7 @@ xilinx_pcie_init(MemoryRegion *sys_mem, uint32_t bus_nr,qdev_prop_set_uint64 (dev,"mmio_base" , mmio_base);qdev_prop_set_uint64 (dev,"mmio_size" , mmio_size); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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 );
@@ -688,8 +688,8 @@ static void boston_mach_init(MachineState *machine)exit (1 ); } - dev =qdev_new_orphan (TYPE_BOSTON ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); + dev =qdev_new (OBJECT (machine),"boston" ,TYPE_BOSTON ); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); s =BOSTON (dev); s->mach = machine;
@@ -727,21 +727,21 @@ static void boston_mach_init(MachineState *machine) MIN(machine->ram_size, (256 * MiB)));memory_region_add_subregion_overlap (sys_mem,0 , ddr_low_alias,0 ); -xilinx_pcie_init (sys_mem,0 , +xilinx_pcie_init (OBJECT (machine), sys_mem,0 , boston_memmap[BOSTON_PCIE0 ].base, boston_memmap[BOSTON_PCIE0 ].size, boston_memmap[BOSTON_PCIE0_MMIO ].base, boston_memmap[BOSTON_PCIE0_MMIO ].size,get_cps_irq (&s->cps,2 )); -xilinx_pcie_init (sys_mem,1 , +xilinx_pcie_init (OBJECT (machine), sys_mem,1 , boston_memmap[BOSTON_PCIE1 ].base, boston_memmap[BOSTON_PCIE1 ].size, boston_memmap[BOSTON_PCIE1_MMIO ].base, boston_memmap[BOSTON_PCIE1_MMIO ].size,get_cps_irq (&s->cps,1 )); - pcie2 = xilinx_pcie_init(sys_mem, 2, + pcie2 = xilinx_pcie_init(OBJECT(machine), sys_mem, 2, boston_memmap[BOSTON_PCIE2].base, boston_memmap[BOSTON_PCIE2].size, boston_memmap[BOSTON_PCIE2_MMIO].base,
@@ -770,8 +770,9 @@ static void boston_mach_init(MachineState *machine)qemu_chr_fe_set_handlers (&s->lcd_display,NULL ,NULL , boston_lcd_event,NULL , s,NULL , true); - pdev =pci_create_simple_multifunction_orphan (&PCI_BRIDGE (&pcie2->root)->sec_bus, -PCI_DEVFN (0 ,0 ),TYPE_ICH9_AHCI ); + pdev =pci_create_simple_multifunction (OBJECT (machine),"ahci" , + &PCI_BRIDGE (&pcie2->root)->sec_bus, +PCI_DEVFN (0 ,0 ),TYPE_ICH9_AHCI ); ich9 =ICH9_AHCI (pdev);g_assert (ARRAY_SIZE (hd) == ich9->ahci.ports);ide_drive_get (hd, ich9->ahci.ports);
hw/mips/fuloong2e.c +5 -4
@@ -286,7 +286,8 @@ static void mips_fuloong2e_init(MachineState *machine) pci_bus =bonito_init (OBJECT (machine), (qemu_irq *)&(env->irq[2 ]));/* South bridge -> IP5 */ - pci_dev =pci_new_multifunction_orphan (PCI_DEVFN (FULOONG2E_VIA_SLOT ,0 ), + pci_dev =pci_new_multifunction (OBJECT (machine),"via" , +PCI_DEVFN (FULOONG2E_VIA_SLOT ,0 ),TYPE_VT82C686B_ISA );/* Set properties on individual devices before realizing the south bridge */
@@ -295,7 +296,7 @@ static void mips_fuloong2e_init(MachineState *machine)qdev_prop_set_string (dev,"audiodev" , machine->audiodev); } -pci_realize_and_unref (pci_dev, pci_bus, &error_abort); +qdev_realize (DEVICE (pci_dev),BUS (pci_bus), &error_abort); object_property_add_alias(OBJECT(machine), "rtc-time", object_resolve_path_component(OBJECT(pci_dev),
@@ -312,12 +313,12 @@ static void mips_fuloong2e_init(MachineState *machine)/* GPU */ if (vga_interface_type !=VGA_NONE ) { vga_interface_created = true; - pci_dev =pci_new_orphan (-1 ,"ati-vga" ); + pci_dev =pci_new (OBJECT (machine),"vga" ,-1 ,"ati-vga" ); dev =DEVICE (pci_dev);qdev_prop_set_uint32 (dev,"vgamem_mb" ,16 );qdev_prop_set_uint16 (dev,"x-device-id" ,0x5159 );qdev_prop_set_uint64 (dev,"x-linear-aper-size" ,16 * MiB); -pci_realize_and_unref (pci_dev, pci_bus, &error_fatal); +qdev_realize (DEVICE (pci_dev),BUS (pci_bus), &error_fatal); }/* Populate SPD eeprom data */
hw/mips/jazz.c +19 -17
@@ -113,7 +113,8 @@ static const MemoryRegionOps dma_dummy_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static void mips_jazz_init_net (IOMMUMemoryRegion *rc4030_dma_mr, +static void mips_jazz_init_net (Object *parent, +IOMMUMemoryRegion *rc4030_dma_mr,DeviceState *rc4030,MemoryRegion *dp8393x_prom) {DeviceState *dev;
@@ -127,14 +128,14 @@ static void mips_jazz_init_net(IOMMUMemoryRegion *rc4030_dma_mr,return ; } - dev =qdev_new_orphan ("dp8393x" ); + dev =qdev_new (parent,"dp8393x" ,"dp8393x" );qdev_set_nic_properties (dev, nd);qdev_prop_set_uint8 (dev,"it_shift" ,2 );qdev_prop_set_bit (dev,"big_endian" ,TARGET_BIG_ENDIAN );object_property_set_link (OBJECT (dev),"dma_mr" ,OBJECT (rc4030_dma_mr), &error_abort); sysbus =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (sysbus, &error_fatal); +sysbus_realize (sysbus, &error_fatal);sysbus_mmio_map (sysbus,0 ,0x80001000 );sysbus_connect_irq (sysbus,0 ,qdev_get_gpio_in (rc4030,4 ));
@@ -289,16 +290,16 @@ static void mips_jazz_init(MachineState *machine,isa_bus_register_input_irqs (isa_bus, i8259);i8257_dma_init (OBJECT (rc4030), isa_bus,0 ); pit =i8254_pit_init (isa_bus,0x40 ,0 ,NULL ); - pcspk =isa_new_orphan (TYPE_PC_SPEAKER ); + pcspk =isa_new (OBJECT (machine),"pcspk" ,TYPE_PC_SPEAKER );object_property_set_link (OBJECT (pcspk),"pit" ,OBJECT (pit), &error_fatal); -isa_realize_and_unref (pcspk, isa_bus, &error_fatal); +qdev_realize (DEVICE (pcspk),BUS (isa_bus), &error_fatal);/* Video card */ switch (jazz_model) {case JAZZ_MAGNUM : - dev =qdev_new_orphan ("sysbus-g364" ); + dev =qdev_new (OBJECT (machine),"g364" ,"sysbus-g364" ); sysbus =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (sysbus, &error_fatal); +sysbus_realize (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 ));
@@ -313,10 +314,10 @@ static void mips_jazz_init(MachineState *machine, }break ;case JAZZ_PICA61 : - dev =qdev_new_orphan (TYPE_VGA_MMIO ); + dev =qdev_new (OBJECT (machine),"vga" ,TYPE_VGA_MMIO );qdev_prop_set_uint8 (dev,"it_shift" ,0 ); sysbus =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (sysbus, &error_fatal); +sysbus_realize (sysbus, &error_fatal);sysbus_mmio_map (sysbus,0 ,0x60000000 );sysbus_mmio_map (sysbus,1 ,0x400a0000 );sysbus_mmio_map (sysbus,2 ,VBE_DISPI_LFB_PHYSICAL_ADDRESS );
@@ -326,10 +327,10 @@ static void mips_jazz_init(MachineState *machine, }/* Network controller */ -mips_jazz_init_net (rc4030_dma_mr, rc4030, dp8393x_prom); +mips_jazz_init_net (OBJECT (machine), rc4030_dma_mr, rc4030, dp8393x_prom);/* SCSI adapter */ - dev =qdev_new_orphan (TYPE_SYSBUS_ESP ); + dev =qdev_new (OBJECT (machine),"esp" ,TYPE_SYSBUS_ESP ); sysbus_esp =SYSBUS_ESP (dev); esp = &sysbus_esp->esp; esp->dma_memory_read = rc4030_dma_read;
@@ -340,7 +341,7 @@ static void mips_jazz_init(MachineState *machine, esp->dma_enabled =1 ; sysbus =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (sysbus, &error_fatal); +sysbus_realize (sysbus, &error_fatal);sysbus_connect_irq (sysbus,0 ,qdev_get_gpio_in (rc4030,5 ));sysbus_mmio_map (sysbus,0 ,0x80002000 );
@@ -360,10 +361,10 @@ static void mips_jazz_init(MachineState *machine,memory_region_add_subregion (address_space,0x80004000 , rtc);/* Keyboard (i8042) */ - i8042 =I8042_MMIO (qdev_new_orphan (TYPE_I8042_MMIO )); + i8042 =I8042_MMIO (qdev_new (OBJECT (machine),"i8042" ,TYPE_I8042_MMIO ));qdev_prop_set_uint64 (DEVICE (i8042),"mask" ,1 );qdev_prop_set_uint32 (DEVICE (i8042),"size" ,0x1000 ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (i8042), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (i8042), &error_fatal);qdev_connect_gpio_out (DEVICE (i8042),I8042_KBD_IRQ ,qdev_get_gpio_in (rc4030,6 ));
@@ -390,13 +391,14 @@ static void mips_jazz_init(MachineState *machine,/* FIXME: missing Jazz sound at 0x8000c000, rc4030[2] */ /* NVRAM */ - dev =qdev_new_orphan ("ds1225y" ); + dev =qdev_new (OBJECT (machine),"nvram" ,"ds1225y" ); sysbus =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (sysbus, &error_fatal); +sysbus_realize (sysbus, &error_fatal);sysbus_mmio_map (sysbus,0 ,0x80009000 );/* LED indicator */ -sysbus_create_simple_orphan ("jazz-led" ,0x8000f000 ,NULL ); +sysbus_create_simple (OBJECT (machine),"led" ,"jazz-led" , +0x8000f000 ,NULL );g_free (dmas); }
hw/mips/loongson3_virt.c +12 -10
@@ -424,8 +424,8 @@ static inline void loongson3_virt_devices_init(MachineState *machine,MachineClass *mc =MACHINE_GET_CLASS (machine);LoongsonMachineState *s =LOONGSON_MACHINE (machine); - dev =qdev_new_orphan (TYPE_GPEX_HOST ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); + dev =qdev_new (OBJECT (machine),"pcie" ,TYPE_GPEX_HOST ); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); pci_bus =PCI_HOST_BRIDGE (dev)->bus; s->ecam_alias =g_new0 (MemoryRegion,1 );
@@ -465,11 +465,12 @@ static inline void loongson3_virt_devices_init(MachineState *machine,if (defaults_enabled () &&object_class_by_name ("pci-ohci" )) {USBBus *usb_bus; -pci_create_simple_orphan (pci_bus,-1 ,"pci-ohci" ); +pci_create_simple (OBJECT (machine),"ohci" , pci_bus,-1 ,"pci-ohci" ); usb_bus =USB_BUS (object_resolve_type_unambiguous (TYPE_USB_BUS , &error_abort)); -usb_create_simple_orphan (usb_bus,"usb-kbd" ); -usb_create_simple_orphan (usb_bus,"usb-tablet" ); +usb_create_simple (OBJECT (machine),"usb-kbd" , usb_bus,"usb-kbd" ); +usb_create_simple (OBJECT (machine),"usb-tablet" , usb_bus, +"usb-tablet" ); }pci_init_nic_devices (pci_bus, mc->default_nic);
@@ -519,16 +520,16 @@ static void mips_loongson3_virt_init(MachineState *machine)memory_region_init (iocsr,OBJECT (machine),"loongson3.iocsr" ,UINT32_MAX ); - ipi =qdev_new_orphan (TYPE_LOONGSON_IPI ); + ipi =qdev_new (OBJECT (machine),"ipi" ,TYPE_LOONGSON_IPI );qdev_prop_set_uint32 (ipi,"num-cpu" , machine->smp.cpus); -sysbus_realize_and_unref (SYS_BUS_DEVICE (ipi), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (ipi), &error_fatal);memory_region_add_subregion (iocsr,SMP_IPI_MAILBOX ,sysbus_mmio_get_region (SYS_BUS_DEVICE (ipi),0 ));memory_region_add_subregion (iocsr,MAIL_SEND_ADDR ,sysbus_mmio_get_region (SYS_BUS_DEVICE (ipi),1 )); - liointc =qdev_new_orphan ("loongson.liointc" ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (liointc), &error_fatal); + liointc =qdev_new (OBJECT (machine),"liointc" ,"loongson.liointc" ); +sysbus_realize (SYS_BUS_DEVICE (liointc), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (liointc),0 , virt_memmap[VIRT_LIOINTC ].base);
@@ -536,7 +537,8 @@ static void mips_loongson3_virt_init(MachineState *machine)qdev_get_gpio_in (liointc,UART_IRQ ),115200 ,serial_hd (0 ), DEVICE_LITTLE_ENDIAN); -sysbus_create_simple_orphan ("goldfish_rtc" , virt_memmap[VIRT_RTC ].base, +sysbus_create_simple (OBJECT (machine),"rtc" ,"goldfish_rtc" , + virt_memmap[VIRT_RTC ].base,qdev_get_gpio_in (liointc,RTC_IRQ )); cpuclk =clock_new (OBJECT (machine),"cpu-refclk" );
hw/mips/malta.c +9 -7
@@ -1098,8 +1098,8 @@ void mips_malta_init(MachineState *machine)PCIDevice *piix4;DeviceState *dev; - s =MIPS_MALTA (qdev_new_orphan (TYPE_MIPS_MALTA )); -sysbus_realize_and_unref (SYS_BUS_DEVICE (s), &error_fatal); + s =MIPS_MALTA (qdev_new (OBJECT (machine),"malta" ,TYPE_MIPS_MALTA )); +sysbus_realize (SYS_BUS_DEVICE (s), &error_fatal);/* create CPU */ mips_create_cpu (machine, s, &cbus_irq, &i8259_irq);
@@ -1227,16 +1227,17 @@ void mips_malta_init(MachineState *machine)stl_p (memory_region_get_ram_ptr (bios_copy) +0x10 ,0x00000420 );/* Northbridge */ - dev =qdev_new_orphan ("gt64120" ); + dev =qdev_new (OBJECT (machine),"gt64120" ,"gt64120" );qdev_prop_set_bit (dev,"cpu-little-endian" , !TARGET_BIG_ENDIAN ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); pci_bus =PCI_BUS (qdev_get_child_bus (dev,"pci" ));pci_bus_map_irqs (pci_bus, malta_pci_slot_get_pirq);/* Southbridge */ - piix4 =pci_new_multifunction_orphan (PIIX4_PCI_DEVFN ,TYPE_PIIX4_PCI_DEVICE ); + piix4 =pci_new_multifunction (OBJECT (machine),"piix4" , +PIIX4_PCI_DEVFN ,TYPE_PIIX4_PCI_DEVICE );qdev_prop_set_uint32 (DEVICE (piix4),"smb_io_base" ,0x1100 ); -pci_realize_and_unref (piix4, pci_bus, &error_fatal); +qdev_realize (DEVICE (piix4),BUS (pci_bus), &error_fatal); isa_bus =ISA_BUS (qdev_get_child_bus (DEVICE (piix4),"isa.0" )); dev =DEVICE (object_resolve_path_component (OBJECT (piix4),"ide" ));
@@ -1254,7 +1255,8 @@ void mips_malta_init(MachineState *machine)g_free (smbus_eeprom_buf);/* Super I/O: SMS FDC37M817 */ -isa_create_simple_orphan (isa_bus,TYPE_FDC37M81X_SUPERIO ); +isa_create_simple (OBJECT (machine),"superio" , isa_bus, +TYPE_FDC37M81X_SUPERIO );/* Network card */ network_init (pci_bus);
Signature · 1 line
2.47.1
RFC PATCH 53/134 hw/i386: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/i386 to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
Six of the singletons in hw/i386/kvm/ (kvmclock, xen-evtchn, xen-gnttab, xen-overlay, xen-xenstore, xen-primary-console) are created via a public helper; those helpers gain an Object *parent first argument and all callers are updated in this patch.
The pcspk device created in pc_machine_initfn() is left orphan for
now: it is created in instance_init and object_unref()ed in instance_finalize when never realized. Making it a child<> would free it via object_property_del_all() before finalize runs, leaving finalize with a dangling pointer. This site needs a separate refactor of pc_machine_finalize() first.
Per-site rationale (reviewers: dispute the modeling here):
hw/i386/isapc.c:115 | isa_new | OBJECT(machine) | "rtc" | board init pc_init_isa()hw/i386/kvm/clock.c:380 | sysbus_create_simple | parent | "kvmclock" | thread Object *parent into kvmclock_create(); callers pass OBJECT(machine)/OBJECT(mms)
hw/i386/kvm/xen_evtchn.c:309 | sysbus_create_simple | parent | "xen-evtchn" | thread Object *parent into xen_evtchn_create(); caller pc_basic_device_init passes OBJECT(pcms) hw/i386/kvm/xen_gnttab.c:155 | sysbus_create_simple | parent | "xen-gnttab" | thread Object *parent into xen_gnttab_create(); caller passes OBJECT(pcms) hw/i386/kvm/xen_overlay.c:172 | sysbus_create_simple | parent | "xen-overlay" | thread Object *parent into xen_overlay_create(); caller passes OBJECT(pcms) hw/i386/kvm/xen_primary_console.c:87 | sysbus_create_simple | parent | "xen-primary-console" | thread Object *parent into xen_primary_console_create(); callers: pc.c stub-guarded, xen_console_realize passes OBJECT(xendev) hw/i386/kvm/xen_xenstore.c:279 | sysbus_create_simple | parent | "xen-xenstore" | thread Object *parent into xen_xenstore_create(); caller passes OBJECT(pcms) hw/i386/microvm.c:111 | qdev_new | OBJECT(mms) | "gpex" | board helper create_gpex(MicrovmMachineState *mms) hw/i386/microvm.c:200 | sysbus_create_simple | OBJECT(mms) | "virtio-mmio[*]" | board init loop hw/i386/microvm.c:207 | qdev_new | OBJECT(mms) | "acpi-ged" | board init; already sysbus_realize (no unref), just parent hw/i386/microvm.c:219 | qdev_new | OBJECT(mms) | "xhci" | board init; already sysbus_realize (no unref), just parent hw/i386/nitro_enclave.c:49 | qdev_new | OBJECT(nems) | "vsock" | board helper receiving NitroEnclaveMachineState* hw/i386/nitro_enclave.c:78 | qdev_new | OBJECT(nems) | "nsm" | board helper receiving NitroEnclaveMachineState* hw/i386/pc.c:1001 | isa_new | parent | "fdc" | pc_superio_init already has Object *parent hw/i386/pc.c:1017 | isa_create_simple | parent | "i8042" | pc_superio_init already has Object *parent hw/i386/pc.c:1019 | isa_create_simple | parent | "vmport" | pc_superio_init already has Object *parent hw/i386/pc.c:1020 | isa_try_new | parent | "vmmouse" | pc_superio_init already has Object *parent hw/i386/pc.c:1029 | isa_create_simple | parent | "port92" | pc_superio_init already has Object *parent hw/i386/pc.c:1068 | qdev_try_new | OBJECT(pcms) | "hpet" | pc_basic_device_init receives PCMachineState* hw/i386/pc.c:1107 | pci_create_simple | OBJECT(pcms) | "xen-platform" | pc_basic_device_init receives PCMachineState* hw/i386/pc.c:1642 | isa_new | ORPHAN-JUSTIFIED | - | instance_init + explicit unref in instance_finalize; parenting here would double-free via object_property_del_all before finalize; needs separate refactor of pc_machine_finalize hw/i386/pc_piix.c:196 | qdev_new | OBJECT(machine) | "i440fx" | collapse existing object_property_add_child(machine,"i440fx") hw/i386/pc_piix.c:239 | pci_new_multifunction | OBJECT(machine) | "south-bridge" | board init pc_init1() hw/i386/pc_piix.c:387 | pci_create_simple | OBJECT(machine) | "xen-platform" | board init pc_xen_hvm_init() hw/i386/pc_q35.c:117 | pci_new_multifunction | parent | "ehci[*]" | thread Object *parent into ehci_create_ich9_with_companions(); caller passes OBJECT(machine) hw/i386/pc_q35.c:122 | pci_new_multifunction | parent | "uhci[*]" | thread Object *parent into ehci_create_ich9_with_companions() hw/i386/pc_q35.c:202 | qdev_new | OBJECT(machine) | "q35" | collapse existing object_property_add_child(machine,"q35") hw/i386/pc_q35.c:238 | pci_new_multifunction | OBJECT(machine) | "lpc" | board init pc_q35_init() hw/i386/pc_q35.c:293 | pci_create_simple_multifunction | OBJECT(machine) | "sata" | board init pc_q35_init() hw/i386/pc_q35.c:314 | pci_create_simple_multifunction | OBJECT(machine) | "smbus" | board init pc_q35_init() hw/i386/pc_sysfw.c:82 | qdev_new | OBJECT(pcms) | name | collapse existing object_property_add_child(pcms,name); drop explicit object_unref hw/i386/sgx.c:314 | qdev_new | OBJECT(pcms) | "sgx-epc[*]" | board helper receiving PCMachineState* hw/i386/x86-common.c:508 | qdev_new | parent | "ioapic" | collapse existing object_property_add_child(parent,"ioapic") hw/i386/x86-common.c:510 | qdev_new | parent | "ioapic" | collapse existing object_property_add_child(parent,"ioapic") hw/i386/x86-common.c:528 | qdev_new | parent | "ioapic2" | thread Object *parent into ioapic_init_secondary(); caller passes OBJECT(mms)
--- hw/char/xen_console.c | 2 +- hw/i386/isapc.c | 6 +++--- hw/i386/kvm/clock.c | 4 ++-- hw/i386/kvm/clock.h | 2 +- hw/i386/kvm/xen-stubs.c | 2 +- hw/i386/kvm/xen_evtchn.c | 6 ++++-- hw/i386/kvm/xen_evtchn.h | 3 ++- hw/i386/kvm/xen_gnttab.c | 6 ++++-- hw/i386/kvm/xen_gnttab.h | 2 +- hw/i386/kvm/xen_overlay.c | 6 ++++-- hw/i386/kvm/xen_overlay.h | 2 +- hw/i386/kvm/xen_primary_console.c | 5 +++-- hw/i386/kvm/xen_primary_console.h | 2 +- hw/i386/kvm/xen_xenstore.c | 5 +++-- hw/i386/kvm/xen_xenstore.h | 2 +- hw/i386/microvm.c | 15 ++++++++------- hw/i386/nitro_enclave.c | 9 +++++---- hw/i386/pc.c | 29 ++++++++++++++-------------- hw/i386/pc_piix.c | 15 ++++++++------- hw/i386/pc_q35.c | 32 +++++++++++++++++-------------- hw/i386/pc_sysfw.c | 10 ++-------- hw/i386/sgx.c | 5 +++-- hw/i386/x86-common.c | 13 ++++++------- include/hw/i386/x86.h | 2 +- 24 files changed, 98 insertions(+), 87 deletions(-)
hw/char/xen_console.c +1 -1
@@ -440,7 +440,7 @@ static void xen_console_realize(XenDevice *xendev, Error **errp)*/ if (!con->dev) {if (xen_mode ==XEN_EMULATE ) { -xen_primary_console_create (); +xen_primary_console_create (OBJECT (xendev)); }else if (xen_device_frontend_scanf (xendev,"ring-ref" ,"%u" , &u) !=1 ||xen_device_frontend_scanf (xendev,"port" ,"%u" , &u) !=1 ) {
hw/i386/isapc.c +3 -3
@@ -90,7 +90,7 @@ static void pc_init_isa(MachineState *machine)x86_cpus_init (x86ms, pcmc->default_cpu_version);if (kvm_enabled ()) { -kvmclock_create (pcmc->kvmclock_create_always); +kvmclock_create (OBJECT (machine), pcmc->kvmclock_create_always); }/* allocate ram and load rom/bios */
@@ -112,9 +112,9 @@ static void pc_init_isa(MachineState *machine) &error_abort);isa_bus_register_input_irqs (isa_bus, x86ms->gsi); - x86ms->rtc =isa_new_orphan (TYPE_MC146818_RTC ); + x86ms->rtc =isa_new (OBJECT (machine),"rtc" ,TYPE_MC146818_RTC );qdev_prop_set_int32 (DEVICE (x86ms->rtc),"base_year" ,2000 ); -isa_realize_and_unref (x86ms->rtc, isa_bus, &error_fatal); +qdev_realize (DEVICE (x86ms->rtc),BUS (isa_bus), &error_fatal); irq =object_property_get_uint (OBJECT (x86ms->rtc),"irq" , &error_fatal);isa_connect_gpio_out (ISA_DEVICE (x86ms->rtc),0 , irq);
hw/i386/kvm/clock.c +2 -2
@@ -369,7 +369,7 @@ static const TypeInfo kvmclock_info = { };/* Note: Must be called after VCPU initialization. */ -void kvmclock_create (bool create_always) +void kvmclock_create (Object *parent,bool create_always) {X86CPU *cpu =X86_CPU (first_cpu);
@@ -377,7 +377,7 @@ void kvmclock_create(bool create_always)if (create_always || cpu->env.features[FEAT_KVM ] & (CPUID_KVM_CLOCK |CPUID_KVM_CLOCK2 )) { -sysbus_create_simple_orphan (TYPE_KVM_CLOCK ,-1 ,NULL ); +sysbus_create_simple (parent,"kvmclock" ,TYPE_KVM_CLOCK ,-1 ,NULL ); } }
hw/i386/kvm/clock.h +1 -1
@@ -13,6 +13,6 @@#ifndef HW_I386_KVM_CLOCK_H #define HW_I386_KVM_CLOCK_H -void kvmclock_create (bool create_always); +void kvmclock_create (Object *parent,bool create_always);#endif
hw/i386/kvm/xen-stubs.c +1 -1
@@ -32,7 +32,7 @@ bool xen_evtchn_deliver_pirq_msi(uint64_t address, uint32_t data)return false; } -void xen_primary_console_create (void ) +void xen_primary_console_create (Object *parent) { }
hw/i386/kvm/xen_evtchn.c +4 -2
@@ -304,9 +304,11 @@ static void gsi_assert_bh(void *opaque) } } -void xen_evtchn_create (unsigned int nr_gsis,qemu_irq *system_gsis) +void xen_evtchn_create (Object *parent,unsigned int nr_gsis, +qemu_irq *system_gsis) { -XenEvtchnState *s =XEN_EVTCHN (sysbus_create_simple_orphan (TYPE_XEN_EVTCHN , +XenEvtchnState *s =XEN_EVTCHN (sysbus_create_simple (parent,"xen-evtchn" , +TYPE_XEN_EVTCHN ,-1 ,NULL ));int i;
hw/i386/kvm/xen_evtchn.h +2 -1
@@ -16,7 +16,8 @@typedef uint32_t evtchn_port_t ; -void xen_evtchn_create (unsigned int nr_gsis,qemu_irq *system_gsis); +void xen_evtchn_create (Object *parent,unsigned int nr_gsis, +qemu_irq *system_gsis);int xen_evtchn_soft_reset (void );int xen_evtchn_set_callback_param (uint64_t param);void xen_evtchn_set_callback_level (int level);
hw/i386/kvm/xen_gnttab.c +4 -2
@@ -150,9 +150,11 @@ static const TypeInfo xen_gnttab_info = { .class_init = xen_gnttab_class_init, }; -void xen_gnttab_create (void ) +void xen_gnttab_create (Object *parent) { - xen_gnttab_singleton =XEN_GNTTAB (sysbus_create_simple_orphan (TYPE_XEN_GNTTAB , + xen_gnttab_singleton =XEN_GNTTAB (sysbus_create_simple (parent, +"xen-gnttab" , +TYPE_XEN_GNTTAB ,-1 ,NULL )); }
hw/i386/kvm/xen_gnttab.h +1 -1
@@ -12,7 +12,7 @@#ifndef QEMU_XEN_GNTTAB_H #define QEMU_XEN_GNTTAB_H -void xen_gnttab_create (void ); +void xen_gnttab_create (Object *parent);int xen_gnttab_reset (void );int xen_gnttab_map_page (uint64_t idx,uint64_t gfn);
hw/i386/kvm/xen_overlay.c +4 -2
@@ -167,9 +167,11 @@ static const TypeInfo xen_overlay_info = { .class_init = xen_overlay_class_init, }; -void xen_overlay_create (void ) +void xen_overlay_create (Object *parent) { - xen_overlay_singleton =XEN_OVERLAY (sysbus_create_simple_orphan (TYPE_XEN_OVERLAY , + xen_overlay_singleton =XEN_OVERLAY (sysbus_create_simple (parent, +"xen-overlay" , +TYPE_XEN_OVERLAY ,-1 ,NULL ));/* If xen_domid wasn't explicitly set, at least make sure it isn't zero. */
hw/i386/kvm/xen_overlay.h +1 -1
@@ -12,7 +12,7 @@#ifndef QEMU_XEN_OVERLAY_H #define QEMU_XEN_OVERLAY_H -void xen_overlay_create (void ); +void xen_overlay_create (Object *parent);int xen_overlay_map_shinfo_page (uint64_t gpa);void *xen_overlay_get_shinfo_ptr (void );
hw/i386/kvm/xen_primary_console.c +3 -2
@@ -82,9 +82,10 @@ static const TypeInfo xen_primary_console_info = { }; -void xen_primary_console_create (void ) +void xen_primary_console_create (Object *parent) { -DeviceState *dev =sysbus_create_simple_orphan (TYPE_XEN_PRIMARY_CONSOLE ,-1 ,NULL ); +DeviceState *dev =sysbus_create_simple (parent,"xen-primary-console" , +TYPE_XEN_PRIMARY_CONSOLE ,-1 ,NULL );trace_xen_primary_console_create ();
hw/i386/kvm/xen_primary_console.h +1 -1
@@ -12,7 +12,7 @@#ifndef QEMU_XEN_PRIMARY_CONSOLE_H #define QEMU_XEN_PRIMARY_CONSOLE_H -void xen_primary_console_create (void ); +void xen_primary_console_create (Object *parent);int xen_primary_console_reset (void );uint16_t xen_primary_console_get_port (void );
hw/i386/kvm/xen_xenstore.c +3 -2
@@ -274,9 +274,10 @@ static const TypeInfo xen_xenstore_info = { .class_init = xen_xenstore_class_init, }; -void xen_xenstore_create (void ) +void xen_xenstore_create (Object *parent) { -DeviceState *dev =sysbus_create_simple_orphan (TYPE_XEN_XENSTORE ,-1 ,NULL ); +DeviceState *dev =sysbus_create_simple (parent,"xen-xenstore" , +TYPE_XEN_XENSTORE ,-1 ,NULL ); xen_xenstore_singleton =XEN_XENSTORE (dev);
hw/i386/kvm/xen_xenstore.h +1 -1
@@ -12,7 +12,7 @@#ifndef QEMU_XEN_XENSTORE_H #define QEMU_XEN_XENSTORE_H -void xen_xenstore_create (void ); +void xen_xenstore_create (Object *parent);int xen_xenstore_reset (void );uint16_t xen_xenstore_get_port (void );
hw/i386/microvm.c +8 -7
@@ -108,8 +108,8 @@ static void create_gpex(MicrovmMachineState *mms)DeviceState *dev;int i; - dev =qdev_new_orphan (TYPE_GPEX_HOST ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); + dev =qdev_new (OBJECT (mms),"gpex" ,TYPE_GPEX_HOST ); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);/* Map only the first size_ecam bytes of ECAM space */ ecam_alias =g_new0 (MemoryRegion,1 );
@@ -177,11 +177,11 @@ static void microvm_devices_init(MicrovmMachineState *mms)ioapic_init_gsi (gsi_state,OBJECT (mms));if (ioapics >1 ) { - x86ms->ioapic2 =ioapic_init_secondary (gsi_state); + x86ms->ioapic2 =ioapic_init_secondary (OBJECT (mms), gsi_state); }if (kvm_enabled ()) { -kvmclock_create (true); +kvmclock_create (OBJECT (mms), true); } mms->virtio_irq_base =5 ;
@@ -197,14 +197,15 @@ static void microvm_devices_init(MicrovmMachineState *mms) }for (i =0 ; i < mms->virtio_num_transports; i++) { -sysbus_create_simple_orphan ("virtio-mmio" , +sysbus_create_simple (OBJECT (mms),"virtio-mmio[*]" ,"virtio-mmio" ,VIRTIO_MMIO_BASE + i *512 , x86ms->gsi[mms->virtio_irq_base + i]); }/* Optional and legacy devices */ if (x86_machine_is_acpi_enabled (x86ms)) { -DeviceState *dev =qdev_new_orphan (TYPE_ACPI_GED ); +DeviceState *dev =qdev_new (OBJECT (mms),"acpi-ged" , +TYPE_ACPI_GED );qdev_prop_set_uint32 (dev,"ged-event" ,ACPI_GED_PWR_DOWN_EVT );sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,GED_MMIO_BASE );
@@ -216,7 +217,7 @@ static void microvm_devices_init(MicrovmMachineState *mms) }if (x86_machine_is_acpi_enabled (x86ms) &&machine_usb (MACHINE (mms))) { -DeviceState *dev =qdev_new_orphan (TYPE_XHCI_SYSBUS ); +DeviceState *dev =qdev_new (OBJECT (mms),"xhci" ,TYPE_XHCI_SYSBUS );qdev_prop_set_uint32 (dev,"intrs" ,1 );qdev_prop_set_uint32 (dev,"slots" ,XHCI_MAXSLOTS );qdev_prop_set_uint32 (dev,"p2" ,8 );
hw/i386/nitro_enclave.c +5 -4
@@ -46,7 +46,8 @@ static BusState *find_free_virtio_mmio_bus(void)static void vhost_user_vsock_init (NitroEnclaveMachineState *nems) { -DeviceState *dev =qdev_new_orphan (TYPE_VHOST_USER_VSOCK ); +DeviceState *dev =qdev_new (OBJECT (nems),"vsock" , +TYPE_VHOST_USER_VSOCK );VHostUserVSock *vsock =VHOST_USER_VSOCK (dev);BusState *bus;
@@ -70,12 +71,12 @@ static void vhost_user_vsock_init(NitroEnclaveMachineState *nems) vsock->conf.chardev.chr = chardev; -qdev_realize_and_unref (dev, bus, &error_fatal); +qdev_realize (dev, bus, &error_fatal); }static void virtio_nsm_init (NitroEnclaveMachineState *nems) { -DeviceState *dev =qdev_new_orphan (TYPE_VIRTIO_NSM ); +DeviceState *dev =qdev_new (OBJECT (nems),"nsm" ,TYPE_VIRTIO_NSM );VirtIONSM *vnsm =VIRTIO_NSM (dev);BusState *bus =find_free_virtio_mmio_bus ();
@@ -86,7 +87,7 @@ static void virtio_nsm_init(NitroEnclaveMachineState *nems)qdev_prop_set_string (dev,"module-id" , nems->id); -qdev_realize_and_unref (dev, bus, &error_fatal); +qdev_realize (dev, bus, &error_fatal); nems->vnsm = vnsm; }
hw/i386/pc.c +15 -14
@@ -998,9 +998,9 @@ static void pc_superio_init(Object *parent, ISABus *isa_bus, bool create_fdctrl, }if (create_fdctrl) {#ifdef CONFIG_FDC_ISA -ISADevice *fdc =isa_new_orphan (TYPE_ISA_FDC ); +ISADevice *fdc =isa_new (parent,"fdc" ,TYPE_ISA_FDC );if (fdc) { -isa_realize_and_unref (fdc, isa_bus, &error_fatal); +qdev_realize (DEVICE (fdc),BUS (isa_bus), &error_fatal);isa_fdc_init_drives (fdc, fd); }#endif
@@ -1014,19 +1014,19 @@ static void pc_superio_init(Object *parent, ISABus *isa_bus, bool create_fdctrl,return ; } - i8042 =isa_create_simple_orphan (isa_bus,TYPE_I8042 ); + i8042 =isa_create_simple (parent,"i8042[*]" , isa_bus,TYPE_I8042 );if (!no_vmport) { -isa_create_simple_orphan (isa_bus,TYPE_VMPORT ); - vmmouse =isa_try_new_orphan ("vmmouse" ); +isa_create_simple (parent,"vmport[*]" , isa_bus,TYPE_VMPORT ); + vmmouse =isa_try_new (parent,"vmmouse" ,"vmmouse" ); }else { vmmouse =NULL ; }if (vmmouse) {object_property_set_link (OBJECT (vmmouse),TYPE_I8042 ,OBJECT (i8042), &error_abort); -isa_realize_and_unref (vmmouse, isa_bus, &error_fatal); +qdev_realize (DEVICE (vmmouse),BUS (isa_bus), &error_fatal); } - port92 =isa_create_simple_orphan (isa_bus,TYPE_PORT92 ); + port92 =isa_create_simple (parent,"port92" , isa_bus,TYPE_PORT92 ); a20_line =qemu_allocate_irqs (handle_a20_line_change, first_cpu,2 ); qdev_connect_gpio_out_named(DEVICE(i8042),
@@ -1065,7 +1065,7 @@ void pc_basic_device_init(struct PCMachineState *pcms,if (pcms->hpet_enabled) {qemu_irq rtc_irq; - hpet =qdev_try_new_orphan (TYPE_HPET ); + hpet =qdev_try_new (OBJECT (pcms),"hpet[*]" ,TYPE_HPET );if (!hpet) {error_report ("couldn't create HPET device" );exit (1 );
@@ -1080,7 +1080,7 @@ void pc_basic_device_init(struct PCMachineState *pcms,if (!compat) {qdev_prop_set_uint32 (hpet,HPET_INTCAP , hpet_irqs); } -sysbus_realize_and_unref (SYS_BUS_DEVICE (hpet), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (hpet), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (hpet),0 ,HPET_BASE );for (i =0 ; i <IOAPIC_NUM_PINS ; i++) {
@@ -1099,12 +1099,13 @@ void pc_basic_device_init(struct PCMachineState *pcms,#ifdef CONFIG_XEN_EMU if (xen_mode ==XEN_EMULATE ) { -xen_overlay_create (); -xen_evtchn_create (IOAPIC_NUM_PINS , gsi); -xen_gnttab_create (); -xen_xenstore_create (); +xen_overlay_create (OBJECT (pcms)); +xen_evtchn_create (OBJECT (pcms),IOAPIC_NUM_PINS , gsi); +xen_gnttab_create (OBJECT (pcms)); +xen_xenstore_create (OBJECT (pcms));if (pcms->pcibus) { -pci_create_simple_orphan (pcms->pcibus,-1 ,"xen-platform" ); +pci_create_simple (OBJECT (pcms),"xen-platform" , pcms->pcibus, +-1 ,"xen-platform" ); }xen_bus_init (); }
hw/i386/pc_piix.c +8 -7
@@ -187,14 +187,13 @@ static void pc_init1(MachineState *machine, const char *pci_type)x86_cpus_init (x86ms, pcmc->default_cpu_version);if (kvm_enabled ()) { -kvmclock_create (pcmc->kvmclock_create_always); +kvmclock_create (OBJECT (machine), pcmc->kvmclock_create_always); } pci_memory =g_new (MemoryRegion,1 );memory_region_init (pci_memory,NULL ,"pci" ,UINT64_MAX ); - phb =OBJECT (qdev_new_orphan (TYPE_I440FX_PCI_HOST_BRIDGE )); -object_property_add_child (OBJECT (machine),"i440fx" , phb); + phb =OBJECT (qdev_new (OBJECT (machine),"i440fx" ,TYPE_I440FX_PCI_HOST_BRIDGE ));object_property_set_link (phb,PCI_HOST_PROP_RAM_MEM ,OBJECT (ram_memory), &error_fatal); object_property_set_link(phb, PCI_HOST_PROP_PCI_MEM,
@@ -209,7 +208,7 @@ static void pc_init1(MachineState *machine, const char *pci_type) x86ms->above_4g_mem_size, &error_fatal);object_property_set_str (phb,I440FX_HOST_PROP_PCI_TYPE , pci_type, &error_fatal); -sysbus_realize_and_unref (SYS_BUS_DEVICE (phb), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (phb), &error_fatal); pcms->pcibus =PCI_BUS (qdev_get_child_bus (DEVICE (phb),"pci.0" )); pci_bus_map_irqs(pcms->pcibus,
@@ -236,7 +235,8 @@ static void pc_init1(MachineState *machine, const char *pci_type) gsi_state =pc_gsi_create (&x86ms->gsi, true); - pci_dev =pci_new_multifunction_orphan (-1 , pcms->south_bridge); + pci_dev =pci_new_multifunction (OBJECT (machine),"south-bridge" ,-1 , + pcms->south_bridge);object_property_set_bool (OBJECT (pci_dev),"has-usb" ,machine_usb (machine), &error_abort); object_property_set_bool(OBJECT(pci_dev), "has-acpi",
@@ -254,7 +254,7 @@ static void pc_init1(MachineState *machine, const char *pci_type)for (i =0 ; i <ISA_NUM_IRQS ; i++) {qdev_connect_gpio_out_named (dev,"isa-irqs" , i, x86ms->gsi[i]); } -pci_realize_and_unref (pci_dev, pcms->pcibus, &error_fatal); +qdev_realize (DEVICE (pci_dev),BUS (pcms->pcibus), &error_fatal);if (xen_enabled ()) { pci_device_set_intx_routing_notifier(
@@ -384,7 +384,8 @@ static void pc_xen_hvm_init(MachineState *machine) : TYPE_I440FX_PCI_DEVICE);xen_igd_reserve_slot (pcms->pcibus); - pci_create_simple_orphan(pcms->pcibus, -1, "xen-platform"); +pci_create_simple (OBJECT (machine),"xen-platform" , pcms->pcibus,-1 , + "xen-platform"); }#endif
hw/i386/pc_q35.c +18 -14
@@ -93,7 +93,8 @@ static const struct ehci_companions ich9_1a[] = { { .name = TYPE_ICH9_USB_UHCI(6), .func = 2, .port = 4 }, }; -static int ehci_create_ich9_with_companions (PCIBus *bus,int slot) +static int ehci_create_ich9_with_companions (Object *parent,PCIBus *bus, +int slot) {const struct ehci_companions *comp;PCIDevice *ehci, *uhci;
@@ -114,16 +115,17 @@ static int ehci_create_ich9_with_companions(PCIBus *bus, int slot)return -1 ; } - ehci =pci_new_multifunction_orphan (PCI_DEVFN (slot,7 ), name); -pci_realize_and_unref (ehci, bus, &error_fatal); + ehci =pci_new_multifunction (parent,"ehci[*]" ,PCI_DEVFN (slot,7 ), name); +qdev_realize (DEVICE (ehci),BUS (bus), &error_fatal); usbbus =QLIST_FIRST (&ehci->qdev.child_bus);for (i =0 ; i <3 ; i++) { - uhci =pci_new_multifunction_orphan (PCI_DEVFN (slot, comp[i].func), + uhci =pci_new_multifunction (parent,"uhci[*]" , +PCI_DEVFN (slot, comp[i].func), comp[i].name);qdev_prop_set_string (&uhci->qdev,"masterbus" , usbbus->name);qdev_prop_set_uint32 (&uhci->qdev,"firstport" , comp[i].port); -pci_realize_and_unref (uhci, bus, &error_fatal); +qdev_realize (DEVICE (uhci),BUS (bus), &error_fatal); }return 0 ; }
@@ -195,11 +197,11 @@ static void pc_q35_init(MachineState *machine)x86_cpus_init (x86ms, pcmc->default_cpu_version);if (kvm_enabled ()) { -kvmclock_create (pcmc->kvmclock_create_always); +kvmclock_create (OBJECT (machine), pcmc->kvmclock_create_always); }/* create pci host bus */ - phb =OBJECT (qdev_new_orphan (TYPE_Q35_HOST_DEVICE )); + phb =OBJECT (qdev_new (OBJECT (machine),"q35" ,TYPE_Q35_HOST_DEVICE )); pci_hole64_size = object_property_get_uint(phb, PCI_HOST_PROP_PCI_HOLE64_SIZE,
@@ -209,7 +211,6 @@ static void pc_q35_init(MachineState *machine)memory_region_init (pci_memory,NULL ,"pci" ,UINT64_MAX );pc_memory_init (pcms, system_memory, pci_memory, pci_hole64_size); -object_property_add_child (OBJECT (machine),"q35" , phb);object_property_set_link (phb,PCI_HOST_PROP_RAM_MEM ,OBJECT (machine->ram),NULL ); object_property_set_link(phb, PCI_HOST_PROP_PCI_MEM,
@@ -226,7 +227,7 @@ static void pc_q35_init(MachineState *machine) pcms->default_bus_bypass_iommu, NULL);object_property_set_bool (phb,PCI_HOST_PROP_SMM_RANGES ,x86_machine_is_smm_enabled (x86ms),NULL ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (phb), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (phb), &error_fatal);/* pci */ pcms->pcibus =PCI_BUS (qdev_get_child_bus (DEVICE (phb),"pcie.0" ));
@@ -235,7 +236,8 @@ static void pc_q35_init(MachineState *machine) gsi_state =pc_gsi_create (&x86ms->gsi, true);/* create ISA bus */ - lpc =pci_new_multifunction_orphan (PCI_DEVFN (ICH9_LPC_DEV ,ICH9_LPC_FUNC ), + lpc =pci_new_multifunction (OBJECT (machine),"lpc" , +PCI_DEVFN (ICH9_LPC_DEV ,ICH9_LPC_FUNC ),TYPE_ICH9_LPC_DEVICE ); lpc_dev =DEVICE (lpc); qdev_prop_set_bit(lpc_dev, "smm-enabled",
@@ -243,7 +245,7 @@ static void pc_q35_init(MachineState *machine)for (i =0 ; i <IOAPIC_NUM_PINS ; i++) {qdev_connect_gpio_out_named (lpc_dev,ICH9_GPIO_GSI , i, x86ms->gsi[i]); } -pci_realize_and_unref (lpc, pcms->pcibus, &error_fatal); +qdev_realize (DEVICE (lpc),BUS (pcms->pcibus), &error_fatal); x86ms->rtc =ISA_DEVICE (object_resolve_path_component (OBJECT (lpc),"rtc" ));
@@ -290,7 +292,8 @@ static void pc_q35_init(MachineState *machine)AHCIPCIState *ich9;/* ahci and SATA device, for q35 1 ahci controller is built-in */ - pdev =pci_create_simple_multifunction_orphan (pcms->pcibus, + pdev =pci_create_simple_multifunction (OBJECT (machine),"sata[*]" , + pcms->pcibus,PCI_DEVFN (ICH9_SATA1_DEV ,ICH9_SATA1_FUNC ),"ich9-ahci" );
@@ -304,14 +307,15 @@ static void pc_q35_init(MachineState *machine)if (machine_usb (machine)) {/* Should we create 6 UHCI according to ich9 spec? */ -ehci_create_ich9_with_companions (pcms->pcibus,0x1d ); +ehci_create_ich9_with_companions (OBJECT (machine), pcms->pcibus,0x1d ); }if (pcms->smbus_enabled) {PCIDevice *smb;/* TODO: Populate SPD eeprom data. */ - smb =pci_create_simple_multifunction_orphan (pcms->pcibus, + smb =pci_create_simple_multifunction (OBJECT (machine),"smbus[*]" , + pcms->pcibus,PCI_DEVFN (ICH9_SMB_DEV ,ICH9_SMB_FUNC ),TYPE_ICH9_SMB_DEVICE );
hw/i386/pc_sysfw.c +2 -8
@@ -79,19 +79,13 @@ static PFlashCFI01 *pc_pflash_create(PCMachineState *pcms,const char *name, const char *alias_prop_name) { - DeviceState *dev = qdev_new_orphan(TYPE_PFLASH_CFI01); + DeviceState *dev = qdev_new(OBJECT(pcms), name, TYPE_PFLASH_CFI01);qdev_prop_set_uint64 (dev,"sector-length" ,FLASH_SECTOR_SIZE );qdev_prop_set_uint8 (dev,"width" ,1 );qdev_prop_set_string (dev,"name" , name); -object_property_add_child (OBJECT (pcms), name,OBJECT (dev));object_property_add_alias (OBJECT (pcms), alias_prop_name,OBJECT (dev),"drive" ); -/* -* The returned reference is tied to the child property and -* will be removed with object_unparent. -*/ -object_unref (OBJECT (dev));return PFLASH_CFI01 (dev); }
@@ -189,7 +183,7 @@ static void pc_system_flash_map(PCMachineState *pcms, gpa =0x100000000ULL - total_size;/* where the flash is mapped */ qdev_prop_set_uint32 (DEVICE (system_flash),"num-blocks" , size /FLASH_SECTOR_SIZE ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (system_flash), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (system_flash), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (system_flash),0 , gpa);if (i ==0 ) {
hw/i386/sgx.c +3 -2
@@ -311,7 +311,8 @@ void pc_machine_init_sgx_epc(PCMachineState *pcms) &sgx_epc->mr);for (list = x86ms->sgx_epc_list; list; list = list->next) { -DeviceState *dev =qdev_new_orphan (TYPE_SGX_EPC ); +DeviceState *dev =qdev_new (OBJECT (pcms),"sgx-epc[*]" , +TYPE_SGX_EPC );/* set the memdev link with memory backend */ object_property_parse(OBJECT(dev), SGX_EPC_MEMDEV_PROP,
@@ -319,7 +320,7 @@ void pc_machine_init_sgx_epc(PCMachineState *pcms)/* set the numa node property for sgx epc object */ object_property_set_uint (OBJECT (dev),SGX_EPC_NUMA_NODE_PROP , list->value->node, &error_fatal); -qdev_realize_and_unref (dev,NULL , &error_fatal); +qdev_realize (dev,NULL , &error_fatal); }if ((sgx_epc->base + sgx_epc->size) < sgx_epc->base) {
hw/i386/x86-common.c +6 -7
@@ -505,13 +505,12 @@ void ioapic_init_gsi(GSIState *gsi_state, Object *parent)assert (parent);if (kvm_ioapic_in_kernel ()) { - dev =qdev_new_orphan (TYPE_KVM_IOAPIC ); + dev =qdev_new (parent,"ioapic" ,TYPE_KVM_IOAPIC ); }else { - dev =qdev_new_orphan (TYPE_IOAPIC ); + dev =qdev_new (parent,"ioapic" ,TYPE_IOAPIC ); } -object_property_add_child (parent,"ioapic" ,OBJECT (dev)); d =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (d, &error_fatal); +sysbus_realize (d, &error_fatal);sysbus_mmio_map (d,0 ,IO_APIC_DEFAULT_ADDRESS );for (i =0 ; i <IOAPIC_NUM_PINS ; i++) {
@@ -519,15 +518,15 @@ void ioapic_init_gsi(GSIState *gsi_state, Object *parent) } } -DeviceState *ioapic_init_secondary (GSIState *gsi_state) +DeviceState *ioapic_init_secondary (Object *parent,GSIState *gsi_state) {DeviceState *dev;SysBusDevice *d;unsigned int i; - dev =qdev_new_orphan (TYPE_IOAPIC ); + dev =qdev_new (parent,"ioapic2[*]" ,TYPE_IOAPIC ); d =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (d, &error_fatal); +sysbus_realize (d, &error_fatal);sysbus_mmio_map (d,0 ,IO_APIC_SECONDARY_ADDRESS );for (i =0 ; i <IOAPIC_NUM_PINS ; i++) {
include/hw/i386/x86.h +1 -1
@@ -147,7 +147,7 @@ typedef struct GSIState {qemu_irq x86_allocate_cpu_irq (void );void gsi_handler (void *opaque,int n,int level);void ioapic_init_gsi (GSIState *gsi_state,Object *parent); -DeviceState *ioapic_init_secondary (GSIState *gsi_state); +DeviceState *ioapic_init_secondary (Object *parent,GSIState *gsi_state);/* pc_sysfw.c */ void x86_firmware_configure (hwaddr gpa,void *ptr,int size);
Signature · 1 line
2.47.1
RFC PATCH 54/134 hw/ppc: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/ppc to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing device for composite children. Names follow existing QOM conventions.
pnv_bmc_create() and spapr_vio_bus_init() gain an Object *parent first argument; the callers are updated in this patch.
Per-site rationale (reviewers: dispute the modeling here):
file:line | creator | parent | name | rationale
hw/ppc/amigaone.c:282 | cpu_create | OBJECT(machine) | "cpu" | board init, single CPU hw/ppc/amigaone.c:305 | qdev_new | OBJECT(machine) | "nvram" | board init hw/ppc/amigaone.c:332 | sysbus_create_simple | OBJECT(machine) | "articia" | board init, north bridge hw/ppc/amigaone.c:358 | pci_create_simple_multifunction | OBJECT(machine) | "via" | board init, south bridge hw/ppc/e500.c:818 | qdev_new | OBJECT(machine) | "pic" | collapse existing add_child; helper receives PPCE500MachineState hw/ppc/e500.c:843 | qdev_new | parent | "pic" | thread Object *parent into ppce500_init_mpic_kvm(); drop object_unparent on error hw/ppc/e500.c:996 | qdev_new | OBJECT(machine) | "e500-ccsr" | collapse existing add_child, keep name hw/ppc/e500.c:1021 | qdev_new | OBJECT(machine) | "i2c" | board init hw/ppc/e500.c:1028 | i2c_slave_create_simple | OBJECT(machine) | "rtc" | board init, DS1338 RTC hw/ppc/e500.c:1032 | qdev_new | OBJECT(machine) | "esdhc-stub" | board init, unimplemented placeholder hw/ppc/e500.c:1040 | qdev_new | OBJECT(machine) | "esdhc" | board init hw/ppc/e500.c:1049 | qdev_new | OBJECT(machine) | "guts" | board init hw/ppc/e500.c:1056 | qdev_new | OBJECT(machine) | "pci-host" | collapse existing add_child, keep name hw/ppc/e500.c:1079 | sysbus_create_simple | OBJECT(machine) | "spin" | board init hw/ppc/e500.c:1084 | qdev_new | OBJECT(machine) | "gpio" | board init hw/ppc/e500.c:1097 | qdev_new | OBJECT(machine) | "platform-bus" | board init hw/ppc/e500.c:1139 | qdev_new | OBJECT(machine) | "flash" | board init hw/ppc/mac_newworld.c:162 | cpu_create | OBJECT(machine) | "cpu[*]" | board init, SMP loop hw/ppc/mac_newworld.c:289 | qdev_new | OBJECT(machine) | "uni-n" | board init, UniNorth main hw/ppc/mac_newworld.c:298 | qdev_new | OBJECT(machine) | "u3-agp" | board init, U3 AGP host hw/ppc/mac_newworld.c:313 | qdev_new | OBJECT(machine) | "uni-n-agp" | board init hw/ppc/mac_newworld.c:320 | qdev_new | OBJECT(machine) | "uni-n-internal" | board init hw/ppc/mac_newworld.c:328 | qdev_new | OBJECT(machine) | "uni-n-pci" | board init hw/ppc/mac_newworld.c:351 | pci_new | OBJECT(machine) | "macio" | board init hw/ppc/mac_newworld.c:411 | qdev_new | OBJECT(machine) | "adb-keyboard" | board init hw/ppc/mac_newworld.c:414 | qdev_new | OBJECT(machine) | "adb-mouse" | board init hw/ppc/mac_newworld.c:419 | pci_create_simple | OBJECT(machine) | "ohci" | board init hw/ppc/mac_newworld.c:428 | usb_create_simple | OBJECT(machine) | "usb-kbd" | board init hw/ppc/mac_newworld.c:429 | usb_create_simple | OBJECT(machine) | "usb-mouse" | board init hw/ppc/mac_newworld.c:456 | qdev_new | OBJECT(machine) | "nvram" | board init hw/ppc/mac_newworld.c:465 | qdev_new | OBJECT(machine) | TYPE_FW_CFG | collapse existing add_child, keep name hw/ppc/mac_oldworld.c:114 | cpu_create | OBJECT(machine) | "cpu[*]" | board init, SMP loop hw/ppc/mac_oldworld.c:215 | qdev_new | OBJECT(machine) | "grackle" | board init hw/ppc/mac_oldworld.c:232 | pci_new | OBJECT(machine) | "macio" | board init hw/ppc/mac_oldworld.c:282 | qdev_new | OBJECT(machine) | "adb-keyboard" | board init hw/ppc/mac_oldworld.c:284 | qdev_new | OBJECT(machine) | "adb-mouse" | board init hw/ppc/mac_oldworld.c:288 | pci_create_simple | OBJECT(machine) | "ohci" | board init hw/ppc/mac_oldworld.c:306 | qdev_new | OBJECT(machine) | TYPE_FW_CFG | collapse existing add_child, keep name hw/ppc/pegasos.c:166 | cpu_create | OBJECT(machine) | "cpu" | board init, single CPU hw/ppc/pegasos.c:221 | sysbus_create_simple | OBJECT(machine) | "articia" | board init, north bridge (Pegasos1 branch) hw/ppc/pegasos.c:236 | sysbus_create_simple | OBJECT(machine) | "mv64361" | board init, north bridge (Pegasos2 branch) hw/ppc/pegasos.c:244 | pci_new_multifunction | OBJECT(machine) | "via" | board init, south bridge hw/ppc/pnv.c:1013 | isa_new | parent | "ipmi-bt" | thread Object *parent into pnv_ipmi_bt_init() hw/ppc/pnv.c:1130 | qdev_new | OBJECT(machine) | "pnor" | board init hw/ppc/pnv.c:1272 | qdev_new | OBJECT(pnv) | chip_name | collapse existing add_child; move snprintf before create hw/ppc/pnv.c:2828 | i2c_slave_create_simple | OBJECT(pnv) | "pca9552[*]" | pnv_rainier_i2c_init receives PnvMachineState; per-chip loop hw/ppc/pnv.c:2846 | i2c_slave_create_simple | OBJECT(pnv) | "pca9554[*]" | pnv_rainier_i2c_init receives PnvMachineState; per-chip loop hw/ppc/pnv_bmc.c:302 | qdev_new | parent | "bmc" | thread Object *parent into pnv_bmc_create() (+ header, caller) hw/ppc/ppc440_bamboo.c:151 | cpu_create | OBJECT(machine) | "cpu" | board init, single CPU hw/ppc/ppc440_bamboo.c:165 | qdev_new | OBJECT(machine) | "uic" | board init; drop object_unref hw/ppc/ppc440_bamboo.c:175 | qdev_new | OBJECT(machine) | "sdram" | board init; drop object_unref hw/ppc/ppc440_bamboo.c:186 | sysbus_create_varargs | OBJECT(machine) | "pci-host" | board init hw/ppc/prep.c:260 | cpu_create | OBJECT(machine) | "cpu" | board init, single CPU hw/ppc/prep.c:292 | qdev_new | OBJECT(machine) | "raven" | collapse existing add_child(qdev_get_machine()) hw/ppc/prep.c:303 | pci_new | OBJECT(machine) | "i82378" | board init, ISA bridge hw/ppc/prep.c:312 | isa_new | OBJECT(machine) | "systemio" | board init hw/ppc/prep.c:319 | isa_new | OBJECT(machine) | "mc" | board init, memory controller hw/ppc/prep.c:325 | isa_new | OBJECT(machine) | "rtc" | board init hw/ppc/prep.c:337 | isa_create_simple | OBJECT(machine) | "m48t59" | board init hw/ppc/prep.c:339 | isa_new | OBJECT(machine) | "cs4231a" | board init, audio hw/ppc/prep.c:348 | isa_new | OBJECT(machine) | "pc87312" | board init, superio hw/ppc/prep.c:353 | pci_create_simple | OBJECT(machine) | "scsi" | board init, LSI SCSI hw/ppc/prep.c:366 | qdev_new | OBJECT(machine) | TYPE_FW_CFG | collapse existing add_child, keep name hw/ppc/sam460ex.c:264 | cpu_create | OBJECT(machine) | "cpu" | board init, single CPU hw/ppc/sam460ex.c:279 | qdev_new | OBJECT(machine) | "plb" | board init; drop object_unref hw/ppc/sam460ex.c:295 | qdev_new | OBJECT(machine) | "uic[*]" | board init loop; drop object_unref hw/ppc/sam460ex.c:325 | qdev_new | OBJECT(machine) | "sdram" | board init; drop object_unref hw/ppc/sam460ex.c:340 | sysbus_create_simple | OBJECT(machine) | "i2c[*]" | board init, first IIC hw/ppc/sam460ex.c:349 | i2c_slave_create_simple | OBJECT(machine) | "rtc" | board init, M41T80 RTC hw/ppc/sam460ex.c:351 | sysbus_create_simple | OBJECT(machine) | "i2c[*]" | board init, second IIC hw/ppc/sam460ex.c:355 | qdev_new | OBJECT(machine) | "ebc" | board init; drop object_unref hw/ppc/sam460ex.c:369 | qdev_new | OBJECT(machine) | "mal" | board init; drop object_unref hw/ppc/sam460ex.c:391 | sysbus_create_simple | OBJECT(machine) | "ehci" | board init hw/ppc/sam460ex.c:393 | qdev_new | OBJECT(machine) | "ohci" | board init hw/ppc/sam460ex.c:402 | usb_create_simple | OBJECT(machine) | "usb-kbd" | board init hw/ppc/sam460ex.c:403 | usb_create_simple | OBJECT(machine) | "usb-mouse" | board init hw/ppc/sam460ex.c:406 | qdev_new | OBJECT(machine) | "pcie-host[*]" | board init, first PCIe hw/ppc/sam460ex.c:412 | qdev_new | OBJECT(machine) | "pcie-host[*]" | board init, second PCIe hw/ppc/sam460ex.c:420 | sysbus_create_simple | OBJECT(machine) | "pcix-host" | board init hw/ppc/sam460ex.c:426 | pci_create_simple | OBJECT(machine) | "sm501" | board init, display hw/ppc/sam460ex.c:433 | pci_create_simple | OBJECT(machine) | "sata" | board init, SiI3112 SATA hw/ppc/spapr.c:1888 | qdev_new | OBJECT(spapr) | "nvram" | helper receives SpaprMachineState hw/ppc/spapr.c:2802 | qdev_new | parent | "phb[*]" | thread Object *parent into spapr_create_default_phb() hw/ppc/spapr.c:3078 | pci_create_simple | OBJECT(machine) | "xhci" | board init hw/ppc/spapr.c:3085 | usb_create_simple | OBJECT(machine) | "usb-kbd" | board init hw/ppc/spapr.c:3086 | usb_create_simple | OBJECT(machine) | "usb-mouse" | board init hw/ppc/spapr_irq.c:315 | qdev_new | OBJECT(spapr) | "xive" | spapr_irq_init receives SpaprMachineState hw/ppc/spapr_vio.c:567 | qdev_new | parent | "vio-bridge" | thread Object *parent into spapr_vio_bus_init() (+ header, caller) hw/ppc/virtex_ml507.c:79 | cpu_create | parent | "cpu" | thread Object *parent into ppc440_init_xilinx() hw/ppc/virtex_ml507.c:87 | qdev_new | parent | "uic" | ppc440_init_xilinx(); drop object_unref hw/ppc/virtex_ml507.c:221 | qdev_new | OBJECT(machine) | "intc" | board init hw/ppc/virtex_ml507.c:236 | qdev_new | OBJECT(machine) | "timer" | board init
--- hw/ppc/amigaone.c | 12 ++++---- hw/ppc/e500.c | 58 +++++++++++++++++++------------------- hw/ppc/mac_newworld.c | 54 +++++++++++++++++++---------------- hw/ppc/mac_oldworld.c | 28 +++++++++--------- hw/ppc/pegasos.c | 13 +++++---- hw/ppc/pnv.c | 29 ++++++++++--------- hw/ppc/pnv_bmc.c | 4 +-- hw/ppc/ppc440_bamboo.c | 11 ++++---- hw/ppc/prep.c | 44 ++++++++++++++--------------- hw/ppc/sam460ex.c | 55 +++++++++++++++++------------------- hw/ppc/spapr.c | 21 +++++++------- hw/ppc/spapr_irq.c | 4 +-- hw/ppc/spapr_vio.c | 6 ++-- hw/ppc/virtex_ml507.c | 18 ++++++------ include/hw/ppc/pnv.h | 2 +- include/hw/ppc/spapr_vio.h | 2 +- 16 files changed, 186 insertions(+), 175 deletions(-)
hw/ppc/amigaone.c +7 -5
@@ -279,7 +279,7 @@ static void amigaone_init(MachineState *machine)struct boot_info *bi =NULL ;/* init CPU */ - cpu =POWERPC_CPU (cpu_create_orphan (machine->cpu_type)); + cpu =POWERPC_CPU (cpu_create (OBJECT (machine),"cpu" , machine->cpu_type)); env = &cpu->env;if (PPC_INPUT (env) != PPC_FLAGS_INPUT_6xx) {error_report ("Incompatible CPU, only 6xx bus supported" );
@@ -302,12 +302,12 @@ static void amigaone_init(MachineState *machine) }/* nvram */ - dev =qdev_new_orphan (TYPE_A1_NVRAM ); + dev =qdev_new (OBJECT (machine),"nvram" ,TYPE_A1_NVRAM ); di =drive_get (IF_MTD ,0 ,0 );if (di) {qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (di)); } -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);memory_region_add_subregion (get_system_memory (),NVRAM_ADDR ,sysbus_mmio_get_region (SYS_BUS_DEVICE (dev),0 ));
@@ -329,7 +329,8 @@ static void amigaone_init(MachineState *machine) }/* Articia S */ - dev =sysbus_create_simple_orphan (TYPE_ARTICIA ,ARTICIA_ADDR ,NULL ); + dev =sysbus_create_simple (OBJECT (machine),"articia" ,TYPE_ARTICIA , +ARTICIA_ADDR ,NULL ); i2c_bus =I2C_BUS (qdev_get_child_bus (dev,"smbus" ));if (machine->ram_size >512 * MiB) {
@@ -355,7 +356,8 @@ static void amigaone_init(MachineState *machine) pci_bus =PCI_BUS (qdev_get_child_bus (dev,"pci.0" ));/* VIA VT82c686B South Bridge (multifunction PCI device) */ - via =OBJECT (pci_create_simple_multifunction_orphan (pci_bus,PCI_DEVFN (7 ,0 ), + via =OBJECT (pci_create_simple_multifunction (OBJECT (machine),"via" , + pci_bus,PCI_DEVFN (7 ,0 ),TYPE_VT82C686B_ISA )); object_property_add_alias(OBJECT(machine), "rtc-time", object_resolve_path_component(via, "rtc"),
hw/ppc/e500.c +29 -29
162 lines not on this page · raw message
hw/ppc/mac_newworld.c +29 -25
137 lines not on this page · raw message
hw/ppc/mac_oldworld.c +15 -13
@@ -111,7 +111,8 @@ static void ppc_heathrow_init(MachineState *machine)/* init CPUs */ for (i =0 ; i < machine->smp.cpus; i++) { - cpu =POWERPC_CPU (cpu_create_orphan (machine->cpu_type)); + cpu =POWERPC_CPU (cpu_create (OBJECT (machine),"cpu[*]" , + machine->cpu_type)); env = &cpu->env;/* Set time-base frequency to 16.6 Mhz */
@@ -212,10 +213,11 @@ static void ppc_heathrow_init(MachineState *machine) }/* Grackle PCI host bridge */ - grackle_dev =qdev_new_orphan (TYPE_GRACKLE_PCI_HOST_BRIDGE ); + grackle_dev =qdev_new (OBJECT (machine),"grackle" , +TYPE_GRACKLE_PCI_HOST_BRIDGE );qdev_prop_set_uint32 (grackle_dev,"ofw-addr" ,0x80000000 ); s =SYS_BUS_DEVICE (grackle_dev); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);sysbus_mmio_map (s,0 ,GRACKLE_BASE );sysbus_mmio_map (s,1 ,GRACKLE_BASE +0x200000 );
@@ -229,7 +231,8 @@ static void ppc_heathrow_init(MachineState *machine) pci_bus =PCI_HOST_BRIDGE (grackle_dev)->bus;/* MacIO */ - macio =OBJECT (pci_new_orphan (PCI_DEVFN (16 ,0 ),TYPE_OLDWORLD_MACIO )); + macio =OBJECT (pci_new (OBJECT (machine),"macio" ,PCI_DEVFN (16 ,0 ), +TYPE_OLDWORLD_MACIO ));qdev_prop_set_uint64 (DEVICE (macio),"frequency" , tbfreq); dev =DEVICE (object_resolve_path_component (macio,"escc" ));
@@ -242,7 +245,7 @@ static void ppc_heathrow_init(MachineState *machine)qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (dinfo)); } -pci_realize_and_unref (PCI_DEVICE (macio), pci_bus, &error_fatal); +qdev_realize (DEVICE (macio),BUS (pci_bus), &error_fatal); pic_dev =DEVICE (object_resolve_path_component (macio,"pic" ));for (i =0 ; i <4 ; i++) {
@@ -279,13 +282,13 @@ static void ppc_heathrow_init(MachineState *machine)/* MacIO CUDA/ADB */ dev =DEVICE (object_resolve_path_component (macio,"cuda" )); adb_bus =qdev_get_child_bus (dev,"adb.0" ); - dev =qdev_new_orphan (TYPE_ADB_KEYBOARD ); -qdev_realize_and_unref (dev, adb_bus, &error_fatal); - dev =qdev_new_orphan (TYPE_ADB_MOUSE ); -qdev_realize_and_unref (dev, adb_bus, &error_fatal); + dev =qdev_new (OBJECT (machine),"adb-keyboard" ,TYPE_ADB_KEYBOARD ); +qdev_realize (dev, adb_bus, &error_fatal); + dev =qdev_new (OBJECT (machine),"adb-mouse" ,TYPE_ADB_MOUSE ); +qdev_realize (dev, adb_bus, &error_fatal);if (machine_usb (machine)) { -pci_create_simple_orphan (pci_bus,-1 ,"pci-ohci" ); +pci_create_simple (OBJECT (machine),"ohci" , pci_bus,-1 ,"pci-ohci" ); }if (!graphic_width) {
@@ -303,13 +306,12 @@ static void ppc_heathrow_init(MachineState *machine)/* No PCI init: the BIOS will do it */ - dev =qdev_new_orphan (TYPE_FW_CFG_MEM ); + dev =qdev_new (OBJECT (machine),TYPE_FW_CFG ,TYPE_FW_CFG_MEM ); fw_cfg =FW_CFG (dev);qdev_prop_set_uint32 (dev,"data_width" ,1 );qdev_prop_set_bit (dev,"dma_enabled" , false); -object_property_add_child (OBJECT (machine),TYPE_FW_CFG ,OBJECT (fw_cfg)); s =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);sysbus_mmio_map (s,0 ,CFG_ADDR );sysbus_mmio_map (s,1 ,CFG_ADDR +2 );
hw/ppc/pegasos.c +8 -5
@@ -163,7 +163,7 @@ static void pegasos_init(MachineState *machine)uint8_t *spd_data;/* init CPU */ - pm->cpu =POWERPC_CPU (cpu_create_orphan (machine->cpu_type)); + pm->cpu =POWERPC_CPU (cpu_create (OBJECT (machine),"cpu" , machine->cpu_type)); env = &pm->cpu->env;if (PPC_INPUT (env) != PPC_FLAGS_INPUT_6xx) {error_report ("Incompatible CPU, only 6xx bus supported" );
@@ -218,7 +218,8 @@ static void pegasos_init(MachineState *machine)MemoryRegion *pci_mem, *mr;/* Articia S */ - pm->nb =DEVICE (sysbus_create_simple_orphan (TYPE_ARTICIA ,0xfe000000 ,NULL )); + pm->nb =DEVICE (sysbus_create_simple (OBJECT (machine),"articia" , +TYPE_ARTICIA ,0xfe000000 ,NULL )); pci_mem =sysbus_mmio_get_region (SYS_BUS_DEVICE (pm->nb),1 ); mr =g_new (MemoryRegion,1 ); memory_region_init_alias(mr, OBJECT(pm->nb), "pci-mem-low", pci_mem,
@@ -233,7 +234,8 @@ static void pegasos_init(MachineState *machine) }case PEGASOS2 :/* Marvell Discovery II system controller */ - pm->nb =DEVICE (sysbus_create_simple_orphan (TYPE_MV64361 ,-1 , + pm->nb =DEVICE (sysbus_create_simple (OBJECT (machine),"mv64361" , +TYPE_MV64361 ,-1 ,qdev_get_gpio_in (DEVICE (pm->cpu), PPC6xx_INPUT_INT))); pci_bus =mv64361_get_pci_bus (pm->nb,1 );break ;
@@ -241,7 +243,8 @@ static void pegasos_init(MachineState *machine)/* VIA VT8231 South Bridge (multifunction PCI device) */ devfn =PCI_DEVFN (pm->type ==PEGASOS1 ?7 :12 ,0 ); - pm->sb =DEVICE (pci_new_multifunction_orphan (devfn,TYPE_VT8231_ISA )); + pm->sb =DEVICE (pci_new_multifunction (OBJECT (machine),"via" , devfn, +TYPE_VT8231_ISA )); via =OBJECT (pm->sb);/* Set properties on individual devices before realizing the south bridge */
@@ -250,7 +253,7 @@ static void pegasos_init(MachineState *machine)qdev_prop_set_string (DEVICE (dev),"audiodev" , machine->audiodev); } -pci_realize_and_unref (PCI_DEVICE (via), pci_bus, &error_abort); +qdev_realize (DEVICE (via),BUS (pci_bus), &error_abort);object_property_add_alias (OBJECT (machine),"rtc-time" ,object_resolve_path_component (via,"rtc" ),"date" );
hw/ppc/pnv.c +16 -13
@@ -1008,13 +1008,14 @@ static bool pnv_match_cpu(const char *default_type, const char *cpu_type)return ppc_default->pvr_match (ppc_default, ppc->pvr, false); } -static void pnv_ipmi_bt_init (ISABus *bus,IPMIBmc *bmc,uint32_t irq) +static void pnv_ipmi_bt_init (Object *parent,ISABus *bus,IPMIBmc *bmc, +uint32_t irq) { -ISADevice *dev =isa_new_orphan ("isa-ipmi-bt" ); +ISADevice *dev =isa_new (parent,"ipmi-bt" ,"isa-ipmi-bt" );object_property_set_link (OBJECT (dev),"bmc" ,OBJECT (bmc), &error_fatal);object_property_set_int (OBJECT (dev),"irq" , irq, &error_fatal); -isa_realize_and_unref (dev, bus, &error_fatal); +qdev_realize (DEVICE (dev),BUS (bus), &error_fatal); }static void pnv_chip_power10_pic_print_info (PnvChip *chip,GString *buf)
@@ -1127,7 +1128,7 @@ static void pnv_init(MachineState *machine)/* * Create our simple PNOR device */ - dev =qdev_new_orphan (TYPE_PNV_PNOR ); + dev =qdev_new (OBJECT (machine),"pnor" ,TYPE_PNV_PNOR ); pnor =drive_get (IF_MTD ,0 ,0 );if (!pnor &&defaults_enabled ()) { fw_filename =qemu_find_file (QEMU_FILE_TYPE_BIOS ,PNOR_FILE_NAME );
@@ -1143,7 +1144,7 @@ static void pnv_init(MachineState *machine)if (pnor) {qdev_prop_set_drive (dev,"drive" ,blk_by_legacy_dinfo (pnor)); } -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); pnv->pnor =PNV_PNOR (dev);/* load skiboot firmware */
@@ -1269,9 +1270,11 @@ static void pnv_init(MachineState *machine) pnv->chips = g_new0(PnvChip *, pnv->num_chips);for (i =0 ; i < pnv->num_chips; i++) {char chip_name[32 ]; -Object *chip =OBJECT (qdev_new_orphan (chip_typename)); +Object *chip;uint64_t chip_ram_size =pnv_chip_get_ram_size (pnv, i); +snprintf (chip_name,sizeof (chip_name),"chip[%d]" , i); + chip =OBJECT (qdev_new (OBJECT (pnv), chip_name, chip_typename)); pnv->chips[i] =PNV_CHIP (chip);/* Distribute RAM among the chips */
@@ -1281,8 +1284,6 @@ static void pnv_init(MachineState *machine) &error_fatal); chip_ram_start += chip_ram_size; -snprintf (chip_name,sizeof (chip_name),"chip[%d]" , i); -object_property_add_child (OBJECT (pnv), chip_name, chip);object_property_set_int (chip,"chip-id" , i, &error_fatal);object_property_set_int (chip,"nr-cores" , machine->smp.cores, &error_fatal);
@@ -1303,7 +1304,7 @@ static void pnv_init(MachineState *machine)object_property_set_link (chip,"xive-fabric" ,OBJECT (pnv), &error_abort); } -sysbus_realize_and_unref (SYS_BUS_DEVICE (chip), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (chip), &error_fatal); }g_free (chip_typename);
@@ -1321,8 +1322,8 @@ static void pnv_init(MachineState *machine)* communication with the BMC */ if (defaults_enabled ()) { - pnv->bmc =pnv_bmc_create (pnv->pnor); -pnv_ipmi_bt_init (pnv->isa_bus, pnv->bmc,10 ); + pnv->bmc =pnv_bmc_create (OBJECT (machine), pnv->pnor); +pnv_ipmi_bt_init (OBJECT (machine), pnv->isa_bus, pnv->bmc,10 ); }/*
@@ -2825,7 +2826,8 @@ static void pnv_rainier_i2c_init(PnvMachineState *pnv)* Add a PCA9552 I2C device for PCIe hotplug control * to engine 2, bus 1, address 0x63 */ -I2CSlave *dev =i2c_slave_create_simple_orphan (chip10->i2c[2 ].busses[1 ], +I2CSlave *dev =i2c_slave_create_simple (OBJECT (pnv),"pca9552[*]" , + chip10->i2c[2 ].busses[1 ],"pca9552" ,0x63 );/*
@@ -2843,7 +2845,8 @@ static void pnv_rainier_i2c_init(PnvMachineState *pnv)* Add a PCA9554 I2C device for cable card presence detection * to engine 2, bus 1, address 0x25 */ -i2c_slave_create_simple_orphan (chip10->i2c[2 ].busses[1 ],"pca9554" ,0x25 ); +i2c_slave_create_simple (OBJECT (pnv),"pca9554[*]" , + chip10->i2c[2 ].busses[1 ],"pca9554" ,0x25 ); } }
hw/ppc/pnv_bmc.c +2 -2
@@ -295,11 +295,11 @@ void pnv_bmc_set_pnor(IPMIBmc *bmc, PnvPnor *pnor)* Instantiate the machine BMC. PowerNV uses the QEMU internal * simulator but it could also be external. */ -IPMIBmc *pnv_bmc_create (PnvPnor *pnor) +IPMIBmc *pnv_bmc_create (Object *parent,PnvPnor *pnor) {DeviceState *dev; - dev =qdev_new_orphan (TYPE_IPMI_BMC_SIMULATOR ); + dev =qdev_new (parent,"bmc" ,TYPE_IPMI_BMC_SIMULATOR );qdev_realize (dev,NULL , &error_fatal);pnv_bmc_set_pnor (IPMI_BMC (dev), pnor);
hw/ppc/ppc440_bamboo.c +5 -6
@@ -148,7 +148,7 @@ static void bamboo_init(MachineState *machine)exit (EXIT_FAILURE ); } - cpu =POWERPC_CPU (cpu_create_orphan (machine->cpu_type)); + cpu =POWERPC_CPU (cpu_create (OBJECT (machine),"cpu" , machine->cpu_type)); env = &cpu->env;if (env->mmu_model !=POWERPC_MMU_BOOKE ) {
@@ -162,9 +162,8 @@ static void bamboo_init(MachineState *machine)ppc_dcr_init (env,NULL ,NULL );/* interrupt controller */ - uicdev =qdev_new_orphan (TYPE_PPC_UIC ); + uicdev =qdev_new (OBJECT (machine),"uic" ,TYPE_PPC_UIC );ppc4xx_dcr_realize (PPC4xx_DCR_DEVICE (uicdev), cpu, &error_fatal); -object_unref (OBJECT (uicdev)); uicsbd =SYS_BUS_DEVICE (uicdev);sysbus_connect_irq (uicsbd,PPCUIC_OUTPUT_INT ,qdev_get_gpio_in (DEVICE (cpu), PPC40x_INPUT_INT));
@@ -172,18 +171,18 @@ static void bamboo_init(MachineState *machine) qdev_get_gpio_in(DEVICE(cpu), PPC40x_INPUT_CINT));/* SDRAM controller */ - dev =qdev_new_orphan (TYPE_PPC4xx_SDRAM_DDR); + dev =qdev_new (OBJECT (machine),"sdram" , TYPE_PPC4xx_SDRAM_DDR);object_property_set_link (OBJECT (dev),"dram" ,OBJECT (machine->ram), &error_abort);ppc4xx_dcr_realize (PPC4xx_DCR_DEVICE (dev), cpu, &error_fatal); -object_unref (OBJECT (dev));/* XXX 440EP's ECC interrupts are on UIC1, but we've only created UIC0. */ sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 ,qdev_get_gpio_in (uicdev,14 ));/* Enable SDRAM memory regions, this should be done by the firmware */ ppc4xx_sdram_ddr_enable (PPC4xx_SDRAM_DDR (dev));/* PCI */ - dev = sysbus_create_varargs_orphan(TYPE_PPC4xx_PCI_HOST, PPC440EP_PCI_CONFIG, + dev = sysbus_create_varargs(OBJECT(machine), "pci-host", + TYPE_PPC4xx_PCI_HOST, PPC440EP_PCI_CONFIG, qdev_get_gpio_in(uicdev, pci_irq_nrs[0]), qdev_get_gpio_in(uicdev, pci_irq_nrs[1]), qdev_get_gpio_in(uicdev, pci_irq_nrs[2]),
hw/ppc/prep.c +22 -22
107 lines not on this page · raw message
hw/ppc/sam460ex.c +26 -29
148 lines not on this page · raw message
hw/ppc/spapr.c +11 -10
@@ -1885,7 +1885,7 @@ static void spapr_machine_reset(MachineState *machine, ResetType type)static void spapr_create_nvram (SpaprMachineState *spapr) { -DeviceState *dev =qdev_new_orphan ("spapr-nvram" ); +DeviceState *dev =qdev_new (OBJECT (spapr),"nvram" ,"spapr-nvram" );DriveInfo *dinfo =drive_get (IF_PFLASH ,0 ,0 );if (dinfo) {
@@ -1893,7 +1893,7 @@ static void spapr_create_nvram(SpaprMachineState *spapr) &error_fatal); } -qdev_realize_and_unref (dev, &spapr->vio_bus->bus, &error_fatal); +qdev_realize (dev, &spapr->vio_bus->bus, &error_fatal); spapr->nvram = (struct SpaprNvram *)dev; }
@@ -2795,13 +2795,13 @@ static void spapr_init_cpus(SpaprMachineState *spapr) } } -static PCIHostState *spapr_create_default_phb (void ) +static PCIHostState *spapr_create_default_phb (Object *parent) {DeviceState *dev; - dev =qdev_new_orphan (TYPE_SPAPR_PCI_HOST_BRIDGE ); + dev =qdev_new (parent,"phb[*]" ,TYPE_SPAPR_PCI_HOST_BRIDGE );qdev_prop_set_uint32 (dev,"index" ,0 ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);return PCI_HOST_BRIDGE (dev); }
@@ -3030,7 +3030,7 @@ static void spapr_machine_init(MachineState *machine)spapr_rtc_create (spapr);/* Set up VIO bus */ - spapr->vio_bus =spapr_vio_bus_init (); + spapr->vio_bus =spapr_vio_bus_init (OBJECT (machine));for (i =0 ;serial_hd (i); i++) {spapr_vty_create (OBJECT (machine), spapr->vio_bus,serial_hd (i));
@@ -3053,7 +3053,7 @@ static void spapr_machine_init(MachineState *machine)/* Set up PCI */ spapr_pci_rtas_init (); - phb =spapr_create_default_phb (); + phb =spapr_create_default_phb (OBJECT (machine));while ((nd =qemu_find_nic_info ("spapr-vlan" , true,"ibmveth" ))) {spapr_vlan_create (OBJECT (spapr), spapr->vio_bus, nd);
@@ -3075,15 +3075,16 @@ static void spapr_machine_init(MachineState *machine) }if (machine->usb) { -pci_create_simple_orphan (phb->bus,-1 ,"nec-usb-xhci" ); +pci_create_simple (OBJECT (machine),"xhci" , phb->bus,-1 , +"nec-usb-xhci" );if (has_vga) {USBBus *usb_bus; usb_bus =USB_BUS (object_resolve_type_unambiguous (TYPE_USB_BUS , &error_abort)); -usb_create_simple_orphan (usb_bus,"usb-kbd" ); -usb_create_simple_orphan (usb_bus,"usb-mouse" ); +usb_create_simple (OBJECT (machine),"usb-kbd" , usb_bus,"usb-kbd" ); +usb_create_simple (OBJECT (machine),"usb-mouse" , usb_bus,"usb-mouse" ); } }
hw/ppc/spapr_irq.c +2 -2
@@ -312,7 +312,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)DeviceState *dev;int i; - dev =qdev_new_orphan (TYPE_SPAPR_XIVE ); + dev =qdev_new (OBJECT (spapr),"xive" ,TYPE_SPAPR_XIVE );qdev_prop_set_uint32 (dev,"nr-irqs" ,SPAPR_NR_XIRQS +SPAPR_IRQ_NR_IPIS );/* * 8 XIVE END structures per CPU. One for each available
@@ -321,7 +321,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),"xive-fabric" ,OBJECT (spapr), &error_abort); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); spapr->xive =SPAPR_XIVE (dev);
hw/ppc/spapr_vio.c +3 -3
@@ -557,21 +557,21 @@ static target_ulong h_vio_signal(PowerPCCPU *cpu, SpaprMachineState *spapr,return H_SUCCESS ; } -SpaprVioBus *spapr_vio_bus_init (void ) +SpaprVioBus *spapr_vio_bus_init (Object *parent) {SpaprVioBus *bus;BusState *qbus;DeviceState *dev;/* Create bridge device */ - dev =qdev_new_orphan (TYPE_SPAPR_VIO_BRIDGE ); + dev =qdev_new (parent,"vio-bridge" ,TYPE_SPAPR_VIO_BRIDGE );/* Create bus on bridge device */ qbus =qbus_new (TYPE_SPAPR_VIO_BUS , dev,"spapr-vio" ); bus =SPAPR_VIO_BUS (qbus); bus->next_reg =SPAPR_VIO_REG_BASE ; -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);/* hcall-vio */ spapr_register_hypercall (H_VIO_SIGNAL , h_vio_signal);
hw/ppc/virtex_ml507.c +9 -9
@@ -69,14 +69,15 @@ static struct boot_infovoid *vfdt; } boot_info; -static PowerPCCPU *ppc440_init_xilinx (const char *cpu_type,uint32_t sysclk) +static PowerPCCPU *ppc440_init_xilinx (Object *parent,const char *cpu_type, +uint32_t sysclk) {PowerPCCPU *cpu;CPUPPCState *env;DeviceState *uicdev;SysBusDevice *uicsbd; - cpu =POWERPC_CPU (cpu_create_orphan (cpu_type)); + cpu =POWERPC_CPU (cpu_create (parent,"cpu" , cpu_type)); env = &cpu->env;ppc_booke_timers_init (cpu, sysclk,0 /* no flags */ );
@@ -84,9 +85,8 @@ static PowerPCCPU *ppc440_init_xilinx(const char *cpu_type, uint32_t sysclk)ppc_dcr_init (env,NULL ,NULL );/* interrupt controller */ - uicdev =qdev_new_orphan (TYPE_PPC_UIC ); + uicdev =qdev_new (parent,"uic" ,TYPE_PPC_UIC );ppc4xx_dcr_realize (PPC4xx_DCR_DEVICE (uicdev), cpu, &error_fatal); -object_unref (OBJECT (uicdev)); uicsbd =SYS_BUS_DEVICE (uicdev);sysbus_connect_irq (uicsbd,PPCUIC_OUTPUT_INT ,qdev_get_gpio_in (DEVICE (cpu), PPC40x_INPUT_INT));
@@ -199,7 +199,7 @@ static void virtex_init(MachineState *machine)int i;/* init CPUs */ - cpu =ppc440_init_xilinx (machine->cpu_type,400000000 ); + cpu =ppc440_init_xilinx (OBJECT (machine), machine->cpu_type,400000000 ); env = &cpu->env;if (env->mmu_model !=POWERPC_MMU_BOOKE ) {
@@ -218,10 +218,10 @@ static void virtex_init(MachineState *machine) 64 * KiB, 1, 0x89, 0x18, 0x0000, 0x0, 1); cpu_irq =qdev_get_gpio_in (DEVICE (cpu), PPC40x_INPUT_INT); - dev =qdev_new_orphan ("xlnx.xps-intc" ); + dev =qdev_new (OBJECT (machine),"intc" ,"xlnx.xps-intc" );qdev_prop_set_enum (dev,"endianness" ,ENDIAN_MODE_BIG );qdev_prop_set_uint32 (dev,"kind-of-intr" ,0 ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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);for (i =0 ; i <32 ; i++) {
@@ -233,11 +233,11 @@ static void virtex_init(MachineState *machine) 115200, serial_hd(0), DEVICE_LITTLE_ENDIAN);/* 2 timers at irq 2 @ 62 Mhz. */ - dev =qdev_new_orphan ("xlnx.xps-timer" ); + dev =qdev_new (OBJECT (machine),"timer" ,"xlnx.xps-timer" );qdev_prop_set_enum (dev,"endianness" ,ENDIAN_MODE_BIG );qdev_prop_set_uint32 (dev,"one-timer-only" ,0 );qdev_prop_set_uint32 (dev,"clock-frequency" ,62 *1000000 ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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 ]);
include/hw/ppc/pnv.h +1 -1
@@ -122,7 +122,7 @@ void pnv_cpu_do_nmi_resume(CPUState *cs);*/ void pnv_dt_bmc_sensors (IPMIBmc *bmc,void *fdt);void pnv_bmc_powerdown (IPMIBmc *bmc); -IPMIBmc *pnv_bmc_create (PnvPnor *pnor); +IPMIBmc *pnv_bmc_create (Object *parent,PnvPnor *pnor);IPMIBmc *pnv_bmc_find (Error **errp);void pnv_bmc_set_pnor (IPMIBmc *bmc,PnvPnor *pnor);
include/hw/ppc/spapr_vio.h +1 -1
@@ -76,7 +76,7 @@ struct SpaprVioBus {uint32_t next_reg; }; -SpaprVioBus *spapr_vio_bus_init (void ); +SpaprVioBus *spapr_vio_bus_init (Object *parent);SpaprVioDevice *spapr_vio_find_by_reg (SpaprVioBus *bus,uint32_t reg);void spapr_dt_vdevice (SpaprVioBus *bus,void *fdt);gchar *spapr_vio_stdout_path (SpaprVioBus *bus);
Signature · 1 line
2.47.1
RFC PATCH 55/134 hw/pci, hw/isa: Give VGA and slot-NIC helpers a QOM parent
In reply to Alexander GrafNow that all callers of pci_vga_init(), pci_init_nic_in_slot() and isa_vga_init() live in already-converted board files, thread an Object *parent through these three convenience helpers so that the default VGA and default NIC created via -vga and -net become proper children of their machine instead of landing under /machine/unattached.
pc_vga_init() and the two static network_init() helpers in hw/mips/{fuloong2e,malta}.c gain the parent argument as well and pass it through.
--- hw/alpha/dp264.c | 2 +- hw/i386/isapc.c | 2 +- hw/i386/pc.c | 6 +++--- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- hw/isa/isa-bus.c | 6 +++--- hw/mips/fuloong2e.c | 6 +++--- hw/mips/loongson3_virt.c | 2 +- hw/mips/malta.c | 8 ++++---- hw/pci/pci.c | 18 +++++++++--------- hw/ppc/amigaone.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/pegasos.c | 2 +- hw/ppc/prep.c | 4 ++-- hw/ppc/spapr.c | 6 +++--- hw/riscv/boston-aia.c | 3 ++- hw/sh4/r2d.c | 2 +- include/hw/i386/pc.h | 2 +- include/hw/isa/isa.h | 2 +- include/hw/pci/pci.h | 4 ++-- 21 files changed, 43 insertions(+), 42 deletions(-)
hw/alpha/dp264.c +1 -1
@@ -122,7 +122,7 @@ static void clipper_init(MachineState *machine)mc146818_rtc_init (mo, isa_bus,1900 , rtc_irq);/* VGA setup. Don't bother loading the bios. */ -pci_vga_init (pci_bus); +pci_vga_init (OBJECT (machine), pci_bus);/* Network setup. e1000 is good enough, failing Tulip support. */ pci_init_nic_devices (pci_bus, mc->default_nic);
hw/i386/isapc.c +1 -1
@@ -130,7 +130,7 @@ static void pc_init_isa(MachineState *machine)x86_register_ferr_irq (x86ms->gsi[13 ]); } -pc_vga_init (isa_bus,NULL ); +pc_vga_init (OBJECT (machine), isa_bus,NULL );/* init basic PC hardware */ pc_basic_device_init(pcms, isa_bus, x86ms->gsi, x86ms->rtc,
hw/i386/pc.c +3 -3
@@ -946,15 +946,15 @@ uint64_t pc_pci_hole64_start(void)return ROUND_UP (hole64_start,1 * GiB); } -DeviceState *pc_vga_init (ISABus *isa_bus,PCIBus *pci_bus) +DeviceState *pc_vga_init (Object *parent,ISABus *isa_bus,PCIBus *pci_bus) {DeviceState *dev =NULL ;if (pci_bus) { -PCIDevice *pcidev =pci_vga_init (pci_bus); +PCIDevice *pcidev =pci_vga_init (parent, pci_bus); dev = pcidev ? &pcidev->qdev :NULL ; }else if (isa_bus) { -ISADevice *isadev =isa_vga_init (isa_bus); +ISADevice *isadev =isa_vga_init (parent, isa_bus); dev = isadev ?DEVICE (isadev) :NULL ; }
hw/i386/pc_piix.c +1 -1
@@ -290,7 +290,7 @@ static void pc_init1(MachineState *machine, const char *pci_type)x86_register_ferr_irq (x86ms->gsi[13 ]); } -pc_vga_init (isa_bus, pcms->pcibus); +pc_vga_init (OBJECT (machine), isa_bus, pcms->pcibus);/* init basic PC hardware */ pc_basic_device_init(pcms, isa_bus, x86ms->gsi, x86ms->rtc,
hw/i386/pc_q35.c +1 -1
@@ -325,7 +325,7 @@ static void pc_q35_init(MachineState *machine) }/* the rest devices to which pci devfn is automatically assigned */ -pc_vga_init (isa_bus, pcms->pcibus); +pc_vga_init (OBJECT (machine), isa_bus, pcms->pcibus);pc_nic_init (pcmc, isa_bus, pcms->pcibus);if (machine->nvdimms_state->is_enabled) {
hw/isa/isa-bus.c +3 -3
@@ -200,17 +200,17 @@ ISABus *isa_bus_from_device(ISADevice *dev)return ISA_BUS (qdev_get_parent_bus (DEVICE (dev))); } -ISADevice *isa_vga_init (ISABus *bus) +ISADevice *isa_vga_init (Object *parent,ISABus *bus) { vga_interface_created = true;switch (vga_interface_type) {case VGA_CIRRUS : -return isa_create_simple_orphan (bus,"isa-cirrus-vga" ); +return isa_create_simple (parent,"vga" , bus,"isa-cirrus-vga" );case VGA_QXL :error_report ("%s: qxl: no PCI bus" , __func__);return NULL ;case VGA_STD : -return isa_create_simple_orphan (bus,"isa-vga" ); +return isa_create_simple (parent,"vga" , bus,"isa-vga" );case VGA_VMWARE :error_report ("%s: vmware_vga: no PCI bus" , __func__);return NULL ;
hw/mips/fuloong2e.c +3 -3
@@ -201,10 +201,10 @@ static void main_cpu_reset(void *opaque) }/* Network support */ -static void network_init (PCIBus *pci_bus) +static void network_init (Object *parent,PCIBus *pci_bus) {/* The Fuloong board has a RTL8139 card using PCI SLOT 7 */ -pci_init_nic_in_slot (pci_bus,"rtl8139" ,NULL ,"07" ); +pci_init_nic_in_slot (parent, pci_bus,"rtl8139" ,NULL ,"07" );pci_init_nic_devices (pci_bus,"rtl8139" ); }
@@ -326,7 +326,7 @@ static void mips_fuloong2e_init(MachineState *machine)smbus_eeprom_init_one (OBJECT (machine), smbus,0x50 , spd_data);/* Network card: RTL8139D */ -network_init (pci_bus); +network_init (OBJECT (machine), pci_bus); }static void mips_fuloong2e_machine_init (MachineClass *mc)
hw/mips/loongson3_virt.c +1 -1
@@ -460,7 +460,7 @@ static inline void loongson3_virt_devices_init(MachineState *machine, } msi_nonbroken = true; -pci_vga_init (pci_bus); +pci_vga_init (OBJECT (machine), pci_bus);if (defaults_enabled () &&object_class_by_name ("pci-ohci" )) {USBBus *usb_bus;
hw/mips/malta.c +4 -4
@@ -602,10 +602,10 @@ static MaltaFPGAState *malta_fpga_init(Object *parent, MemoryRegion *address_spa }/* Network support */ -static void network_init (PCIBus *pci_bus) +static void network_init (Object *parent,PCIBus *pci_bus) {/* The malta board has a PCNet card using PCI SLOT 11 */ -pci_init_nic_in_slot (pci_bus,"pcnet" ,NULL ,"0b" ); +pci_init_nic_in_slot (parent, pci_bus,"pcnet" ,NULL ,"0b" );pci_init_nic_devices (pci_bus,"pcnet" ); }
@@ -1259,10 +1259,10 @@ void mips_malta_init(MachineState *machine) TYPE_FDC37M81X_SUPERIO);/* Network card */ -network_init (pci_bus); +network_init (OBJECT (machine), pci_bus);/* Optional PCI video card */ -pci_vga_init (pci_bus); +pci_vga_init (OBJECT (machine), pci_bus); }static void mips_malta_instance_init (Object *obj)
hw/pci/pci.c +9 -9
@@ -2083,7 +2083,7 @@ void pci_init_nic_devices(PCIBus *bus, const char *default_model) "virtio", "virtio-net-pci"); } -bool pci_init_nic_in_slot (PCIBus *rootbus,const char *model, +bool pci_init_nic_in_slot (Object *parent,PCIBus *rootbus,const char *model,const char *alias,const char *devaddr) {NICInfo *nd =qemu_find_nic_info (model, true, alias);
@@ -2118,26 +2118,26 @@ bool pci_init_nic_in_slot(PCIBus *rootbus, const char *model,exit (1 ); } - pci_dev =pci_new_orphan (devfn, model); + pci_dev =pci_new (parent,"nic[*]" , devfn, model);qdev_set_nic_properties (&pci_dev->qdev, nd); -pci_realize_and_unref (pci_dev, bus, &error_fatal); +qdev_realize (DEVICE (pci_dev),BUS (bus), &error_fatal);return true; } -PCIDevice *pci_vga_init (PCIBus *bus) +PCIDevice *pci_vga_init (Object *parent,PCIBus *bus) { vga_interface_created = true;switch (vga_interface_type) {case VGA_CIRRUS : -return pci_create_simple_orphan (bus,-1 ,"cirrus-vga" ); +return pci_create_simple (parent,"vga" , bus,-1 ,"cirrus-vga" );case VGA_QXL : -return pci_create_simple_orphan (bus,-1 ,"qxl-vga" ); +return pci_create_simple (parent,"vga" , bus,-1 ,"qxl-vga" );case VGA_STD : -return pci_create_simple_orphan (bus,-1 ,"VGA" ); +return pci_create_simple (parent,"vga" , bus,-1 ,"VGA" );case VGA_VMWARE : -return pci_create_simple_orphan (bus,-1 ,"vmware-svga" ); +return pci_create_simple (parent,"vga" , bus,-1 ,"vmware-svga" );case VGA_VIRTIO : -return pci_create_simple_orphan (bus,-1 ,"virtio-vga" ); +return pci_create_simple (parent,"vga" , bus,-1 ,"virtio-vga" );case VGA_NONE :default :/* Other non-PCI types. Checking for unsupported types is already done in vl.c. */
hw/ppc/amigaone.c +1 -1
@@ -370,7 +370,7 @@ static void amigaone_init(MachineState *machine) "pirq", i)); }pci_ide_create_devs (PCI_DEVICE (object_resolve_path_component (via,"ide" ))); -pci_vga_init (pci_bus); +pci_vga_init (OBJECT (machine), pci_bus);if (!machine->kernel_filename) {return ;
hw/ppc/mac_newworld.c +1 -1
@@ -435,7 +435,7 @@ static void ppc_core99_init(MachineState *machine) } } -pci_vga_init (pci_bus); +pci_vga_init (OBJECT (machine), pci_bus);if (!graphic_width) { graphic_width =800 ;
hw/ppc/mac_oldworld.c +1 -1
@@ -267,7 +267,7 @@ static void ppc_heathrow_init(MachineState *machine) } } -pci_vga_init (pci_bus); +pci_vga_init (OBJECT (machine), pci_bus);pci_init_nic_devices (pci_bus, mc->default_nic);
hw/ppc/pegasos.c +1 -1
@@ -267,7 +267,7 @@ static void pegasos_init(MachineState *machine)smbus_eeprom_init_one (OBJECT (machine), i2c_bus,0x57 , spd_data);/* other PC hardware */ -pci_vga_init (pci_bus); +pci_vga_init (OBJECT (machine), pci_bus);/* pci interrupt routing */ switch (pm->type) {
hw/ppc/prep.c +2 -2
@@ -357,10 +357,10 @@ static void ibm_40p_init(MachineState *machine)qdev_connect_gpio_out (dev,0 ,qdev_get_gpio_in (i82378_dev,13 ));/* XXX: s3-trio at PCI_DEVFN(2, 0) */ -pci_vga_init (pci_bus); +pci_vga_init (OBJECT (machine), pci_bus);/* First PCNET device at PCI_DEVFN(3, 0) */ -pci_init_nic_in_slot (pci_bus, mc->default_nic,NULL ,"3" ); +pci_init_nic_in_slot (OBJECT (machine), pci_bus, mc->default_nic,NULL ,"3" );pci_init_nic_devices (pci_bus, mc->default_nic); }
hw/ppc/spapr.c +3 -3
@@ -1909,7 +1909,7 @@ static void spapr_rtc_create(SpaprMachineState *spapr) }/* Returns whether we want to use VGA or not */ -static bool spapr_vga_init (PCIBus *pci_bus,Error **errp) +static bool spapr_vga_init (Object *parent,PCIBus *pci_bus,Error **errp) { vga_interface_created = true;switch (vga_interface_type) {
@@ -1920,7 +1920,7 @@ static bool spapr_vga_init(PCIBus *pci_bus, Error **errp)case VGA_STD :case VGA_VIRTIO :case VGA_CIRRUS : -return pci_vga_init (pci_bus) !=NULL ; +return pci_vga_init (parent, pci_bus) !=NULL ;default :error_setg (errp,"Unsupported VGA mode, only -vga std or -vga virtio is supported" );
@@ -3066,7 +3066,7 @@ static void spapr_machine_init(MachineState *machine) }/* Graphics */ - has_vga =spapr_vga_init (phb->bus, &error_fatal); + has_vga =spapr_vga_init (OBJECT (machine), phb->bus, &error_fatal);if (has_vga) { spapr->want_stdout_path = !machine->enable_graphics; machine->usb |=defaults_enabled () && !machine->usb_disabled;
hw/riscv/boston-aia.c +2 -1
@@ -428,7 +428,8 @@ static void boston_mach_init(MachineState *machine)ahci_ide_create_devs (&ich9->ahci, hd);/* Create e1000e using slot 0 func 1 */ -pci_init_nic_in_slot (&PCI_BRIDGE (&pcie2->root)->sec_bus,"e1000e" ,NULL , +pci_init_nic_in_slot (OBJECT (machine), &PCI_BRIDGE (&pcie2->root)->sec_bus, +"e1000e" ,NULL ,"00.1" );pci_init_nic_devices (&PCI_BRIDGE (&pcie2->root)->sec_bus,"e1000e" );
hw/sh4/r2d.c +1 -1
@@ -315,7 +315,7 @@ static void r2d_init(MachineState *machine) 0x555, 0x2aa, 0);/* NIC: rtl8139 on-board, and 2 slots. */ -pci_init_nic_in_slot (pci_bus, mc->default_nic,NULL ,"2" ); +pci_init_nic_in_slot (OBJECT (machine), pci_bus, mc->default_nic,NULL ,"2" );pci_init_nic_devices (pci_bus, mc->default_nic);/* USB keyboard */
include/hw/i386/pc.h +1 -1
@@ -183,7 +183,7 @@ void pc_memory_init(PCMachineState *pcms,MemoryRegion *rom_memory, uint64_t pci_hole64_size);uint64_t pc_pci_hole64_start (void ); -DeviceState *pc_vga_init (ISABus *isa_bus,PCIBus *pci_bus); +DeviceState *pc_vga_init (Object *parent,ISABus *isa_bus,PCIBus *pci_bus); void pc_basic_device_init(struct PCMachineState *pcms, ISABus *isa_bus, qemu_irq *gsi, ISADevice *rtc_state,
include/hw/isa/isa.h +1 -1
@@ -89,7 +89,7 @@ ISADevice *isa_try_new_orphan(const char *name);bool isa_realize_and_unref (ISADevice *dev,ISABus *bus,Error **errp);ISADevice *isa_create_simple_orphan (ISABus *bus,const char *name); -ISADevice *isa_vga_init (ISABus *bus); +ISADevice *isa_vga_init (Object *parent,ISABus *bus);qemu_irq isa_get_irq (ISADevice *dev,unsigned isairq);void isa_connect_gpio_out (ISADevice *isadev,int gpioirq,unsigned isairq);
include/hw/pci/pci.h +2 -2
@@ -337,9 +337,9 @@ void pci_device_set_intx_routing_notifier(PCIDevice *dev,void pci_device_reset (PCIDevice *dev);void pci_init_nic_devices (PCIBus *bus,const char *default_model); -bool pci_init_nic_in_slot (PCIBus *rootbus,const char *default_model, +bool pci_init_nic_in_slot (Object *parent,PCIBus *rootbus,const char *default_model,const char *alias,const char *devaddr); -PCIDevice *pci_vga_init (PCIBus *bus); +PCIDevice *pci_vga_init (Object *parent,PCIBus *bus);static inline PCIBus *pci_get_bus (const PCIDevice *dev) {
Signature · 1 line
2.47.1
RFC PATCH 56/134 hw/arm/virt: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in hw/arm/virt.c to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing SoC device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/arm/virt.c:1085 | qdev_new | OBJECT(vms) | "acpi-ged" | helper receives VirtMachineState* board pointer hw/arm/virt.c:1123 | qdev_new | OBJECT(vms) | "its" | helper receives VirtMachineState* board pointer hw/arm/virt.c:1140 | qdev_new | OBJECT(vms) | "gicv2m" | helper receives VirtMachineState* board pointer hw/arm/virt.c:1228 | qdev_new | OBJECT(vms) | "gic" | helper receives VirtMachineState* board pointer hw/arm/virt.c:1359 | qdev_new | OBJECT(vms) | "gic" | helper receives VirtMachineState* board pointer; only one of gicv2/gicv3/gicv5 created hw/arm/virt.c:1415 | qdev_new | OBJECT(vms) | "gic" | helper receives VirtMachineState* board pointer; only one of gicv2/gicv3/gicv5 created hw/arm/virt.c:1512 | qdev_new | OBJECT(vms) | "uart[*]" | helper receives VirtMachineState*; called up to 2x -> auto-index; drop const hw/arm/virt.c:1564 | sysbus_create_simple | OBJECT(vms) | "rtc" | helper receives VirtMachineState* board pointer; drop const hw/arm/virt.c:1609 | sysbus_create_simple | parent | "gpio-key" | helper lacks parent pointer -> thread Object *parent from create_gpio_devices hw/arm/virt.c:1634 | sysbus_create_simple | parent | "gpio-pwr" | helper lacks parent pointer -> thread Object *parent from create_gpio_devices hw/arm/virt.c:1673 | qdev_new | OBJECT(vms) | "gpio[*]" | helper receives VirtMachineState*; called for VIRT_GPIO and VIRT_SECURE_GPIO -> auto-index; drop const hw/arm/virt.c:1749 | sysbus_create_simple | OBJECT(vms) | "virtio-mmio[*]" | loop over transports; drop const hw/arm/virt.c:1789 | qdev_new | OBJECT(vms) | name | collapse existing object_property_add_child(OBJECT(vms), name, ...) into qdev_new; keep existing name; virt_flash_map1 realize -> sysbus_realize hw/arm/virt.c:2072 | qdev_new | OBJECT(vms) | "smmuv3" | helper receives VirtMachineState* board pointer; drop const hw/arm/virt.c:2165 | qdev_new | OBJECT(vms) | "pcie" | helper receives VirtMachineState* board pointer hw/arm/virt.c:2293 | qdev_new | OBJECT(vms) | "platform-bus" | helper receives VirtMachineState* board pointer
--- hw/arm/virt.c | 80 +++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 40 deletions(-)
hw/arm/virt.c +40 -40
@@ -1082,11 +1082,11 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms) event |=ACPI_GED_NVDIMM_HOTPLUG_EVT ; } - dev =qdev_new_orphan (TYPE_ACPI_GED ); + dev =qdev_new (OBJECT (vms),"acpi-ged" ,TYPE_ACPI_GED );qdev_prop_set_uint32 (dev,"ged-event" , event);object_property_set_link (OBJECT (dev),"bus" ,OBJECT (vms->bus), &error_abort); sbdev =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (sbdev, &error_fatal); +sysbus_realize (sbdev, &error_fatal);sysbus_mmio_map_name (sbdev,TYPE_ACPI_GED , vms->memmap[VIRT_ACPI_GED ].base); sysbus_mmio_map_name(sbdev, ACPI_MEMHP_REGION_NAME,
@@ -1120,11 +1120,11 @@ static void create_its(VirtMachineState *vms)return ; } - dev =qdev_new_orphan (its_class_name ()); + dev =qdev_new (OBJECT (vms),"gic-its" ,its_class_name ());object_property_set_link (OBJECT (dev),"parent-gicv3" ,OBJECT (vms->gic), &error_abort); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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);
@@ -1137,10 +1137,10 @@ static void create_v2m(VirtMachineState *vms)int irq = vms->irqmap[VIRT_GIC_V2M ];DeviceState *dev; - dev =qdev_new_orphan ("arm-gicv2m" ); + dev =qdev_new (OBJECT (vms),"gicv2m" ,"arm-gicv2m" );qdev_prop_set_uint32 (dev,"base-spi" , irq);qdev_prop_set_uint32 (dev,"num-spi" ,NUM_GICV2M_SPIS ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , vms->memmap[VIRT_GIC_V2M ].base);for (i =0 ; i <NUM_GICV2M_SPIS ; i++) {
@@ -1225,7 +1225,7 @@ static void create_gicv5(VirtMachineState *vms, MemoryRegion *mem)const char *gictype =gicv5_class_name ();QList *cpulist =qlist_new (), *iaffidlist =qlist_new (); - vms->gic =qdev_new_orphan (gictype); + vms->gic =qdev_new (OBJECT (vms),"gic" , gictype);qdev_prop_set_uint32 (vms->gic,"spi-range" ,NUM_IRQS ); object_property_set_link(OBJECT(vms->gic), "sysmem", OBJECT(mem),
@@ -1243,7 +1243,7 @@ static void create_gicv5(VirtMachineState *vms, MemoryRegion *mem)qdev_prop_set_array (vms->gic,"cpu-iaffids" , iaffidlist); gicbusdev =SYS_BUS_DEVICE (vms->gic); -sysbus_realize_and_unref (gicbusdev, &error_fatal); +sysbus_realize (gicbusdev, &error_fatal);/* * Map the IRS config frames for the interrupt domains.
@@ -1356,7 +1356,7 @@ static void create_gicv2(VirtMachineState *vms, MemoryRegion *mem)exit (1 ); } - vms->gic =qdev_new_orphan (gic_class_name ()); + vms->gic =qdev_new (OBJECT (vms),"gic" ,gic_class_name ());qdev_prop_set_uint32 (vms->gic,"revision" ,2 );qdev_prop_set_uint32 (vms->gic,"num-cpu" , smp_cpus);/*
@@ -1370,7 +1370,7 @@ static void create_gicv2(VirtMachineState *vms, MemoryRegion *mem) } gicbusdev =SYS_BUS_DEVICE (vms->gic); -sysbus_realize_and_unref (gicbusdev, &error_fatal); +sysbus_realize (gicbusdev, &error_fatal);sysbus_mmio_map (gicbusdev,0 , vms->memmap[VIRT_GIC_DIST ].base);sysbus_mmio_map (gicbusdev,1 , vms->memmap[VIRT_GIC_CPU ].base);if (vms->virt) {
@@ -1412,7 +1412,7 @@ static void create_gicv3(VirtMachineState *vms, MemoryRegion *mem)exit (1 ); } - vms->gic =qdev_new_orphan (gicv3_class_name ()); + vms->gic =qdev_new (OBJECT (vms),"gic" ,gicv3_class_name ());qdev_prop_set_uint32 (vms->gic,"revision" , revision);qdev_prop_set_uint32 (vms->gic,"num-cpu" , smp_cpus);/*
@@ -1454,7 +1454,7 @@ static void create_gicv3(VirtMachineState *vms, MemoryRegion *mem) } gicbusdev =SYS_BUS_DEVICE (vms->gic); -sysbus_realize_and_unref (gicbusdev, &error_fatal); +sysbus_realize (gicbusdev, &error_fatal);sysbus_mmio_map (gicbusdev,0 , vms->memmap[VIRT_GIC_DIST ].base);sysbus_mmio_map (gicbusdev,1 , vms->memmap[VIRT_GIC_REDIST ].base);if (nb_redist_regions ==2 ) {
@@ -1500,7 +1500,7 @@ static void create_msi_controller(VirtMachineState *vms) } } -static void create_uart (const VirtMachineState *vms,int uart, +static void create_uart (VirtMachineState *vms,int uart,MemoryRegion *mem,Chardev *chr,bool secure) {char *nodename;
@@ -1509,12 +1509,12 @@ static void create_uart(const VirtMachineState *vms, int uart,int irq = vms->irqmap[uart];const char compat[] ="arm,pl011\0arm,primecell" ;const char clocknames[] ="uartclk\0apb_pclk" ; -DeviceState *dev =qdev_new_orphan (TYPE_PL011 ); +DeviceState *dev =qdev_new (OBJECT (vms),"uart[*]" ,TYPE_PL011 );SysBusDevice *s =SYS_BUS_DEVICE (dev);MachineState *ms =MACHINE (vms);qdev_prop_set_chr (dev,"chardev" , chr); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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));
@@ -1552,7 +1552,7 @@ static void create_uart(const VirtMachineState *vms, int uart,g_free (nodename); } -static void create_rtc (const VirtMachineState *vms) +static void create_rtc (VirtMachineState *vms) {char *nodename;hwaddr base = vms->memmap[VIRT_RTC ].base;
@@ -1561,7 +1561,8 @@ static void create_rtc(const VirtMachineState *vms)const char compat[] ="arm,pl031\0arm,primecell" ;MachineState *ms =MACHINE (vms); -sysbus_create_simple_orphan ("pl031" , base,qdev_get_gpio_in (vms->gic, irq)); +sysbus_create_simple (OBJECT (vms),"rtc" ,"pl031" , base, +qdev_get_gpio_in (vms->gic, irq)); nodename =g_strdup_printf ("/pl031@%" PRIx64, base);qemu_fdt_add_subnode (ms->fdt, nodename);
@@ -1603,10 +1604,10 @@ static void virt_generic_error_req(Notifier *n, void *opaque)acpi_send_event (s->acpi_dev,ACPI_GENERIC_ERROR ); } -static void create_gpio_keys (char *fdt,DeviceState *pl061_dev, +static void create_gpio_keys (Object *parent,char *fdt,DeviceState *pl061_dev,uint32_t phandle) { - gpio_key_dev =sysbus_create_simple_orphan ("gpio-key" ,-1 , + gpio_key_dev =sysbus_create_simple (parent,"gpio-key" ,"gpio-key" ,-1 ,qdev_get_gpio_in (pl061_dev,GPIO_PIN_POWER_BUTTON ));
@@ -1625,13 +1626,13 @@ static void create_gpio_keys(char *fdt, DeviceState *pl061_dev,#define SECURE_GPIO_POWEROFF 0#define SECURE_GPIO_RESET 1 -static void create_secure_gpio_pwr (char *fdt,DeviceState *pl061_dev, -uint32_t phandle) +static void create_secure_gpio_pwr (Object *parent,char *fdt, +DeviceState *pl061_dev,uint32_t phandle) {DeviceState *gpio_pwr_dev;/* gpio-pwr */ - gpio_pwr_dev =sysbus_create_simple_orphan ("gpio-pwr" ,-1 ,NULL ); + gpio_pwr_dev =sysbus_create_simple (parent,"gpio-pwr" ,"gpio-pwr" ,-1 ,NULL );/* connect secure pl061 to gpio-pwr */ qdev_connect_gpio_out(pl061_dev, SECURE_GPIO_RESET,
@@ -1658,7 +1659,7 @@ static void create_secure_gpio_pwr(char *fdt, DeviceState *pl061_dev, "okay"); } -static void create_gpio_devices (const VirtMachineState *vms,int gpio, +static void create_gpio_devices (VirtMachineState *vms,int gpio,MemoryRegion *mem) {char *nodename;
@@ -1670,12 +1671,12 @@ static void create_gpio_devices(const VirtMachineState *vms, int gpio,SysBusDevice *s;MachineState *ms =MACHINE (vms); - pl061_dev =qdev_new_orphan ("pl061" ); + pl061_dev =qdev_new (OBJECT (vms),"gpio[*]" ,"pl061" );/* Pull lines down to 0 if not driven by the PL061 */ qdev_prop_set_uint8 (pl061_dev,"pullups" ,0 );qdev_prop_set_uint8 (pl061_dev,"pulldowns" ,0xff ); s =SYS_BUS_DEVICE (pl061_dev); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &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));
@@ -1703,13 +1704,13 @@ static void create_gpio_devices(const VirtMachineState *vms, int gpio,/* Child gpio devices */ if (gpio ==VIRT_GPIO ) { -create_gpio_keys (ms->fdt, pl061_dev, phandle); +create_gpio_keys (OBJECT (vms), ms->fdt, pl061_dev, phandle); }else { -create_secure_gpio_pwr (ms->fdt, pl061_dev, phandle); +create_secure_gpio_pwr (OBJECT (vms), ms->fdt, pl061_dev, phandle); } } -static void create_virtio_devices (const VirtMachineState *vms) +static void create_virtio_devices (VirtMachineState *vms) {int i;hwaddr size = vms->memmap[VIRT_MMIO ].size;
@@ -1746,8 +1747,8 @@ static void create_virtio_devices(const VirtMachineState *vms)int irq = vms->irqmap[VIRT_MMIO ] + i;hwaddr base = vms->memmap[VIRT_MMIO ].base + i * size; -sysbus_create_simple_orphan ("virtio-mmio" , base, -qdev_get_gpio_in (vms->gic, irq)); +sysbus_create_simple (OBJECT (vms),"virtio-mmio[*]" ,"virtio-mmio" , + base,qdev_get_gpio_in (vms->gic, irq)); }/* We add dtb nodes in reverse order so that they appear in the finished
@@ -1786,7 +1787,7 @@ static PFlashCFI01 *virt_flash_create1(VirtMachineState *vms,* Create a single flash device. We use the same parameters as * the flash devices on the Versatile Express board. */ -DeviceState *dev =qdev_new_orphan (TYPE_PFLASH_CFI01 ); +DeviceState *dev =qdev_new (OBJECT (vms), name,TYPE_PFLASH_CFI01 );qdev_prop_set_uint64 (dev,"sector-length" ,VIRT_FLASH_SECTOR_SIZE );qdev_prop_set_uint8 (dev,"width" ,4 );
@@ -1797,7 +1798,6 @@ static PFlashCFI01 *virt_flash_create1(VirtMachineState *vms,qdev_prop_set_uint16 (dev,"id2" ,0x00 );qdev_prop_set_uint16 (dev,"id3" ,0x00 );qdev_prop_set_string (dev,"name" , name); -object_property_add_child (OBJECT (vms), name,OBJECT (dev));object_property_add_alias (OBJECT (vms), alias_prop_name,OBJECT (dev),"drive" );return PFLASH_CFI01 (dev);
@@ -1818,7 +1818,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 ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); memory_region_add_subregion(sysmem, base, sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),
@@ -2056,7 +2056,7 @@ static void create_smmuv3_dev_dtb(VirtMachineState *vms, DeviceState *dev, 0x0, vms->iommu_phandle, 0x0, 0x10000); } -static void create_smmu (const VirtMachineState *vms,PCIBus *bus) +static void create_smmu (VirtMachineState *vms,PCIBus *bus) {VirtMachineClass *vmc =VIRT_MACHINE_GET_CLASS (vms);int irq = vms->irqmap[VIRT_SMMU ];
@@ -2069,7 +2069,7 @@ static void create_smmu(const VirtMachineState *vms, PCIBus *bus)return ; } - dev =qdev_new_orphan (TYPE_ARM_SMMUV3 ); + dev =qdev_new (OBJECT (vms),"smmuv3" ,TYPE_ARM_SMMUV3 );if (!vmc->no_nested_smmu) {object_property_set_str (OBJECT (dev),"stage" ,"nested" , &error_fatal);
@@ -2080,7 +2080,7 @@ static void create_smmu(const VirtMachineState *vms, PCIBus *bus) &error_abort);object_property_set_link (OBJECT (dev),"secure-memory" ,OBJECT (vms->secure_sysmem), &error_abort); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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,
@@ -2162,8 +2162,8 @@ static void create_pcie(VirtMachineState *vms)MachineState *ms =MACHINE (vms);MachineClass *mc =MACHINE_GET_CLASS (ms); - dev =qdev_new_orphan (TYPE_GPEX_HOST ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); + dev =qdev_new (OBJECT (vms),"pcie" ,TYPE_GPEX_HOST ); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); ecam_id =VIRT_ECAM_ID (vms->highmem_ecam); base_ecam = vms->memmap[ecam_id].base;
@@ -2290,11 +2290,11 @@ static void create_platform_bus(VirtMachineState *vms)int i;MemoryRegion *sysmem =get_system_memory (); - dev =qdev_new_orphan (TYPE_PLATFORM_BUS_DEVICE ); + dev =qdev_new (OBJECT (vms),"platform-bus" ,TYPE_PLATFORM_BUS_DEVICE ); dev->id =g_strdup (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); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); vms->platform_bus_dev = dev; s =SYS_BUS_DEVICE (dev);
Signature · 1 line
2.47.1
RFC PATCH 57/134 hw/arm/sbsa-ref: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in the hw/arm sbsa-ref board files to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing SoC device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/arm/sbsa-ref.c:299 | qdev_new | OBJECT(sms) | name | collapse existing object_property_add_child(OBJECT(sms), name, ...); keep existing name; sbsa_flash_map1 realize -> sysbus_realize hw/arm/sbsa-ref.c:424 | qdev_new | OBJECT(sms) | "its" | helper receives SBSAMachineState* board pointer hw/arm/sbsa-ref.c:443 | qdev_new | OBJECT(sms) | "gic" | helper receives SBSAMachineState* board pointer hw/arm/sbsa-ref.c:525 | qdev_new | OBJECT(sms) | "uart[*]" | helper called 3x from board init -> auto-index; drop const hw/arm/sbsa-ref.c:540 | sysbus_create_simple | OBJECT(sms) | "rtc" | helper receives SBSAMachineState*; drop const hw/arm/sbsa-ref.c:547 | qdev_new | OBJECT(sms) | "wdt" | helper receives SBSAMachineState*; drop const hw/arm/sbsa-ref.c:575 | sysbus_create_simple | OBJECT(sms) | "gpio" | helper receives SBSAMachineState*; drop const hw/arm/sbsa-ref.c:578 | sysbus_create_simple | OBJECT(sms) | "gpio-key" | helper receives SBSAMachineState* hw/arm/sbsa-ref.c:593 | qdev_new | OBJECT(sms) | "ahci" | helper receives SBSAMachineState*; drop const hw/arm/sbsa-ref.c:608 | qdev_new | OBJECT(sms) | "xhci" | helper receives SBSAMachineState*; drop const hw/arm/sbsa-ref.c:625 | qdev_new | OBJECT(sms) | "smmuv3" | helper receives SBSAMachineState*; drop const hw/arm/sbsa-ref.c:661 | qdev_new | OBJECT(sms) | "pcie" | helper receives SBSAMachineState* hw/arm/sbsa-ref.c:698 | pci_create_simple | OBJECT(sms) | "bochs-display" | board owns lifetime; bus is plug location not parent hw/arm/sbsa-ref.c:715 | qdev_new | parent | "sbsa-ec" | helper lacks parent-capable pointer -> thread Object *parent from sbsa_ref_init
--- hw/arm/sbsa-ref.c | 70 ++++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 34 deletions(-)
hw/arm/sbsa-ref.c +36 -34
@@ -296,7 +296,7 @@ static PFlashCFI01 *sbsa_flash_create1(SBSAMachineState *sms,* Create a single flash device. We use the same parameters as * the flash devices on the Versatile Express board. */ -DeviceState *dev =qdev_new_orphan (TYPE_PFLASH_CFI01 ); +DeviceState *dev =qdev_new (OBJECT (sms), name,TYPE_PFLASH_CFI01 );qdev_prop_set_uint64 (dev,"sector-length" ,SBSA_FLASH_SECTOR_SIZE );qdev_prop_set_uint8 (dev,"width" ,4 );
@@ -307,7 +307,6 @@ static PFlashCFI01 *sbsa_flash_create1(SBSAMachineState *sms,qdev_prop_set_uint16 (dev,"id2" ,0x00 );qdev_prop_set_uint16 (dev,"id3" ,0x00 );qdev_prop_set_string (dev,"name" , name); -object_property_add_child (OBJECT (sms), name,OBJECT (dev));object_property_add_alias (OBJECT (sms), alias_prop_name,OBJECT (dev),"drive" );return PFLASH_CFI01 (dev);
@@ -328,7 +327,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 ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); memory_region_add_subregion(sysmem, base, sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),
@@ -421,11 +420,11 @@ static void create_its(SBSAMachineState *sms)const char *itsclass =its_class_name ();DeviceState *dev; - dev =qdev_new_orphan (itsclass); + dev =qdev_new (OBJECT (sms),"its" , itsclass);object_property_set_link (OBJECT (dev),"parent-gicv3" ,OBJECT (sms->gic), &error_abort); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , sbsa_ref_memmap[SBSA_GIC_ITS ].base); }
@@ -440,7 +439,7 @@ static void create_gic(SBSAMachineState *sms, MemoryRegion *mem) gictype =gicv3_class_name (); - sms->gic =qdev_new_orphan (gictype); + sms->gic =qdev_new (OBJECT (sms),"gic" , gictype);qdev_prop_set_uint32 (sms->gic,"revision" ,3 );qdev_prop_set_uint32 (sms->gic,"num-cpu" , smp_cpus);/*
@@ -463,7 +462,7 @@ static void create_gic(SBSAMachineState *sms, MemoryRegion *mem)qdev_prop_set_bit (sms->gic,"has-lpi" , true); gicbusdev =SYS_BUS_DEVICE (sms->gic); -sysbus_realize_and_unref (gicbusdev, &error_fatal); +sysbus_realize (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);
@@ -517,39 +516,40 @@ static void create_gic(SBSAMachineState *sms, MemoryRegion *mem)create_its (sms); } -static void create_uart (const SBSAMachineState *sms,int uart, +static void create_uart (SBSAMachineState *sms,int uart,MemoryRegion *mem,Chardev *chr) {hwaddr base = sbsa_ref_memmap[uart].base;int irq = sbsa_ref_irqmap[uart]; -DeviceState *dev =qdev_new_orphan (TYPE_PL011 ); +DeviceState *dev =qdev_new (OBJECT (sms),"uart[*]" ,TYPE_PL011 );SysBusDevice *s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" , chr); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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)); } -static void create_rtc (const SBSAMachineState *sms) +static void create_rtc (SBSAMachineState *sms) {hwaddr base = sbsa_ref_memmap[SBSA_RTC ].base;int irq = sbsa_ref_irqmap[SBSA_RTC ]; -sysbus_create_simple_orphan ("pl031" , base,qdev_get_gpio_in (sms->gic, irq)); +sysbus_create_simple (OBJECT (sms),"rtc" ,"pl031" , base, +qdev_get_gpio_in (sms->gic, irq)); } -static void create_wdt (const SBSAMachineState *sms) +static void create_wdt (SBSAMachineState *sms) {hwaddr rbase = sbsa_ref_memmap[SBSA_GWDT_REFRESH ].base;hwaddr cbase = sbsa_ref_memmap[SBSA_GWDT_CONTROL ].base; -DeviceState *dev =qdev_new_orphan (TYPE_WDT_SBSA ); +DeviceState *dev =qdev_new (OBJECT (sms),"wdt" ,TYPE_WDT_SBSA );SysBusDevice *s =SYS_BUS_DEVICE (dev);int irq = sbsa_ref_irqmap[SBSA_GWDT_WS0 ];qdev_prop_set_uint64 (dev,"clock-frequency" ,SBSA_GTIMER_HZ ); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);sysbus_mmio_map (s,0 , rbase);sysbus_mmio_map (s,1 , cbase);sysbus_connect_irq (s,0 ,qdev_get_gpio_in (sms->gic, irq));
@@ -566,23 +566,23 @@ static Notifier sbsa_ref_powerdown_notifier = { .notify = sbsa_ref_powerdown_req }; -static void create_gpio (const SBSAMachineState *sms) +static void create_gpio (SBSAMachineState *sms) {DeviceState *pl061_dev;hwaddr base = sbsa_ref_memmap[SBSA_GPIO ].base;int irq = sbsa_ref_irqmap[SBSA_GPIO ]; - pl061_dev =sysbus_create_simple_orphan ("pl061" , base, + pl061_dev =sysbus_create_simple (OBJECT (sms),"gpio" ,"pl061" , base,qdev_get_gpio_in (sms->gic, irq)); - gpio_key_dev =sysbus_create_simple_orphan ("gpio-key" ,-1 , -qdev_get_gpio_in (pl061_dev,3 )); + gpio_key_dev =sysbus_create_simple (OBJECT (sms),"gpio-key" ,"gpio-key" , +-1 ,qdev_get_gpio_in (pl061_dev,3 ));/* connect powerdown request */ qemu_register_powerdown_notifier (&sbsa_ref_powerdown_notifier); } -static void create_ahci (const SBSAMachineState *sms) +static void create_ahci (SBSAMachineState *sms) {hwaddr base = sbsa_ref_memmap[SBSA_AHCI ].base;int irq = sbsa_ref_irqmap[SBSA_AHCI ];
@@ -590,9 +590,9 @@ static void create_ahci(const SBSAMachineState *sms)DriveInfo *hd[NUM_SATA_PORTS ];SysbusAHCIState *sysahci; - dev =qdev_new_orphan ("sysbus-ahci" ); + dev =qdev_new (OBJECT (sms),"ahci" ,"sysbus-ahci" );qdev_prop_set_uint32 (dev,"num-ports" ,NUM_SATA_PORTS ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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));
@@ -601,19 +601,19 @@ static void create_ahci(const SBSAMachineState *sms)ahci_ide_create_devs (&sysahci->ahci, hd); } -static void create_xhci (const SBSAMachineState *sms) +static void create_xhci (SBSAMachineState *sms) {hwaddr base = sbsa_ref_memmap[SBSA_XHCI ].base;int irq = sbsa_ref_irqmap[SBSA_XHCI ]; -DeviceState *dev =qdev_new_orphan (TYPE_XHCI_SYSBUS ); +DeviceState *dev =qdev_new (OBJECT (sms),"xhci" ,TYPE_XHCI_SYSBUS );qdev_prop_set_uint32 (dev,"slots" ,XHCI_MAXSLOTS ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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)); } -static void create_smmu (const SBSAMachineState *sms,PCIBus *bus, +static void create_smmu (SBSAMachineState *sms,PCIBus *bus,MemoryRegion *sysmem,MemoryRegion *secure_sysmem) {
@@ -622,7 +622,7 @@ static void create_smmu(const SBSAMachineState *sms, PCIBus *bus,DeviceState *dev;int i; - dev =qdev_new_orphan (TYPE_ARM_SMMUV3 ); + dev =qdev_new (OBJECT (sms),"smmuv3" ,TYPE_ARM_SMMUV3 );object_property_set_str (OBJECT (dev),"stage" ,"nested" , &error_abort); object_property_set_link(OBJECT(dev), "primary-bus", OBJECT(bus),
@@ -631,7 +631,7 @@ static void create_smmu(const SBSAMachineState *sms, PCIBus *bus, &error_abort);object_property_set_link (OBJECT (dev),"secure-memory" ,OBJECT (secure_sysmem), &error_abort); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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,
@@ -658,8 +658,8 @@ static void create_pcie(SBSAMachineState *sms,PCIHostState *pci;int i; - dev =qdev_new_orphan (TYPE_GPEX_HOST ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); + dev =qdev_new (OBJECT (sms),"pcie" ,TYPE_GPEX_HOST ); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);/* Map ECAM space */ ecam_alias =g_new0 (MemoryRegion,1 );
@@ -695,7 +695,7 @@ static void create_pcie(SBSAMachineState *sms,pci_init_nic_devices (pci->bus, mc->default_nic); -pci_create_simple_orphan (pci->bus,-1 ,"bochs-display" ); +pci_create_simple (OBJECT (sms),"bochs-display" , pci->bus,-1 ,"bochs-display" );create_smmu (sms, pci->bus, sysmem, secure_sysmem); }
@@ -709,12 +709,14 @@ static void *sbsa_ref_dtb(const struct arm_boot_info *binfo, int *fdt_size)return board->fdt; } -static void create_secure_ec (MemoryRegion *mem) +static void create_secure_ec (Object *parent,MemoryRegion *mem) {hwaddr base = sbsa_ref_memmap[SBSA_SECURE_EC ].base; -DeviceState *dev =qdev_new_orphan ("sbsa-ec" ); +DeviceState *dev =qdev_new (parent,"sbsa-ec" ,"sbsa-ec" );SysBusDevice *s =SYS_BUS_DEVICE (dev); +sysbus_realize (s, &error_fatal); +memory_region_add_subregion (mem, base,sysbus_mmio_get_region (s,0 )); }
@@ -835,7 +837,7 @@ static void sbsa_ref_init(MachineState *machine)create_pcie (sms, sysmem, secure_sysmem); -create_secure_ec (secure_sysmem); +create_secure_ec (OBJECT (sms), secure_sysmem); sms->bootinfo.ram_size = machine->ram_size; sms->bootinfo.board_id =-1 ;
Signature · 1 line
2.47.1
RFC PATCH 58/134 hw/arm/xilinx-zynq: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in the hw/arm xilinx-zynq board files to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing SoC device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/arm/xilinx_zynq.c:113 | qdev_new | parent | "gem[*]" | thread Object *parent into gem_init(); board init callers pass OBJECT(machine); sysbus_realize hw/arm/xilinx_zynq.c:134 | qdev_new | parent | is_qspi?"qspi":"spi[*]" | thread Object *parent into zynq_init_spi_flashes(); sysbus_realize hw/arm/xilinx_zynq.c:155 | qdev_new | OBJECT(dev) | "flash[*]" | flash owned by SPI controller; qdev_realize hw/arm/xilinx_zynq.c:198 | qdev_new | parent | "ddr-ctrl" | thread Object *parent into ddr_ctrl_init(); sysbus_realize hw/arm/xilinx_zynq.c:259 | qdev_new | OBJECT(machine) | "slcr" | board init; sysbus_realize hw/arm/xilinx_zynq.c:265 | qdev_new | OBJECT(machine) | "a9mpcore" | board init; sysbus_realize hw/arm/xilinx_zynq.c:272 | sysbus_create_varargs | OBJECT(machine) | "l2x0" | board init; create_simple realizes internally hw/arm/xilinx_zynq.c:290 | sysbus_create_simple | OBJECT(machine) | "usb[*]" | board init; two ChipIdea USB controllers hw/arm/xilinx_zynq.c:291 | sysbus_create_simple | OBJECT(machine) | "usb[*]" | board init hw/arm/xilinx_zynq.c:293 | qdev_new | OBJECT(machine) | "uart[*]" | board init; sysbus_realize hw/arm/xilinx_zynq.c:301 | qdev_new | OBJECT(machine) | "uart[*]" | board init; sysbus_realize hw/arm/xilinx_zynq.c:310 | sysbus_create_varargs | OBJECT(machine) | "ttc[*]" | board init; two Cadence TTCs hw/arm/xilinx_zynq.c:312 | sysbus_create_varargs | OBJECT(machine) | "ttc[*]" | board init hw/arm/xilinx_zynq.c:332 | qdev_new | OBJECT(machine) | "sdhci[*]" | board init loop; sysbus_realize hw/arm/xilinx_zynq.c:341 | qdev_new | OBJECT(dev) | "sd-card" | card owned by its SDHCI controller; qdev_realize hw/arm/xilinx_zynq.c:347 | qdev_new | OBJECT(machine) | "xadc" | board init; sysbus_realize hw/arm/xilinx_zynq.c:352 | qdev_new | OBJECT(machine) | "dma" | board init pl330 DMA; sysbus_realize hw/arm/xilinx_zynq.c:375 | qdev_new | OBJECT(machine) | "devcfg" | board init; sysbus_realize
--- hw/arm/xilinx_zynq.c | 92 ++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 42 deletions(-)
hw/arm/xilinx_zynq.c +50 -42
@@ -105,22 +105,23 @@ static void zynq_write_board_setup(ARMCPU *cpu,static struct arm_boot_info zynq_binfo = {}; -static void gem_init (uint32_t base,qemu_irq irq) +static void gem_init (Object *parent,uint32_t base,qemu_irq irq) {DeviceState *dev;SysBusDevice *s; - dev =qdev_new_orphan (TYPE_CADENCE_GEM ); + dev =qdev_new (parent,"gem[*]" ,TYPE_CADENCE_GEM );qemu_configure_nic_device (dev, true,NULL );object_property_set_int (OBJECT (dev),"phy-addr" ,7 , &error_abort); s =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);sysbus_mmio_map (s,0 , base);sysbus_connect_irq (s,0 , irq); } -static inline int zynq_init_spi_flashes (uint32_t base_addr,qemu_irq irq, -bool is_qspi,int unit0) +static inline int zynq_init_spi_flashes (Object *parent,uint32_t base_addr, +qemu_irq irq,bool is_qspi, +int unit0) {int unit = unit0;DeviceState *dev;
@@ -131,12 +132,13 @@ static inline int zynq_init_spi_flashes(uint32_t base_addr, qemu_irq irq,int num_busses = is_qspi ?NUM_QSPI_BUSSES :1 ;int num_ss = is_qspi ?NUM_QSPI_FLASHES :NUM_SPI_FLASHES ; - dev =qdev_new_orphan (is_qspi ?"xlnx.ps7-qspi" :"xlnx.ps7-spi" ); + dev =qdev_new (parent, is_qspi ?"qspi" :"spi[*]" , + is_qspi ?"xlnx.ps7-qspi" :"xlnx.ps7-spi" );qdev_prop_set_uint8 (dev,"num-txrx-bytes" , is_qspi ?4 :1 );qdev_prop_set_uint8 (dev,"num-ss-bits" , num_ss);qdev_prop_set_uint8 (dev,"num-busses" , num_busses); busdev =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_realize (busdev, &error_fatal);sysbus_mmio_map (busdev,0 , base_addr);if (is_qspi) {sysbus_mmio_map (busdev,1 ,0xFC000000 );
@@ -152,14 +154,14 @@ static inline int zynq_init_spi_flashes(uint32_t base_addr, qemu_irq irq,for (j =0 ; j < num_ss; ++j) {DriveInfo *dinfo =drive_get (IF_MTD ,0 , unit++); - flash_dev =qdev_new_orphan ("n25q128" ); + flash_dev =qdev_new (OBJECT (dev),"flash[*]" ,"n25q128" );if (dinfo) {qdev_prop_set_drive_err (flash_dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); }qdev_prop_set_uint8 (flash_dev,"cs" , j); -qdev_realize_and_unref (flash_dev,BUS (spi), &error_fatal); +qdev_realize (flash_dev,BUS (spi), &error_fatal); cs_line =qdev_get_gpio_in_named (flash_dev,SSI_GPIO_CS ,0 );sysbus_connect_irq (busdev, i * num_ss + j +1 , cs_line);
@@ -190,14 +192,14 @@ static void zynq_set_boot_mode(Object *obj, const char *str, m->boot_mode = mode; } -static void ddr_ctrl_init (uint32_t base) +static void ddr_ctrl_init (Object *parent,uint32_t base) {DeviceState *dev;SysBusDevice *busdev; - dev =qdev_new_orphan ("zynq.ddr-ctlr" ); + dev =qdev_new (parent,"ddr-ctrl" ,"zynq.ddr-ctlr" ); busdev =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_realize (busdev, &error_fatal);sysbus_mmio_map (busdev,0 , base); }
@@ -256,20 +258,21 @@ static void zynq_init(MachineState *machine)clock_set_hz (zynq_machine->ps_clk,PS_CLK_FREQUENCY );/* Create slcr, keep a pointer to connect clocks */ - slcr =qdev_new_orphan ("xilinx-zynq_slcr" ); + slcr =qdev_new (OBJECT (machine),"slcr" ,"xilinx-zynq_slcr" );qdev_connect_clock_in (slcr,"ps_clk" , zynq_machine->ps_clk);qdev_prop_set_uint8 (slcr,"boot-mode" , zynq_machine->boot_mode); -sysbus_realize_and_unref (SYS_BUS_DEVICE (slcr), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (slcr), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (slcr),0 ,0xF8000000 ); - dev =qdev_new_orphan (TYPE_A9MPCORE_PRIV ); + dev =qdev_new (OBJECT (machine),"a9mpcore" ,TYPE_A9MPCORE_PRIV );qdev_prop_set_uint32 (dev,"num-cpu" , smp_cpus);qdev_prop_set_uint32 (dev,"num-irq" ,GIC_EXT_IRQS +GIC_INTERNAL ); busdev =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_realize (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,MPCORE_PERIPHBASE ); zynq_binfo.gic_cpu_if_addr =MPCORE_PERIPHBASE +0x100 ; -sysbus_create_varargs_orphan ("l2x0" ,MPCORE_PERIPHBASE +0x2000 ,NULL ); +sysbus_create_varargs (OBJECT (machine),"l2x0" ,"l2x0" , +MPCORE_PERIPHBASE +0x2000 ,NULL );for (n =0 ; n < smp_cpus; n++) {/* See "hw/intc/arm_gic.h" for the IRQ line association */ DeviceState *cpudev =DEVICE (zynq_machine->cpu[n]);
@@ -283,39 +286,44 @@ static void zynq_init(MachineState *machine) pic[n] =qdev_get_gpio_in (dev, n); } - n =zynq_init_spi_flashes (0xE0006000 , pic[58 -GIC_INTERNAL ], false,0 ); - n =zynq_init_spi_flashes (0xE0007000 , pic[81 -GIC_INTERNAL ], false, n); - n =zynq_init_spi_flashes (0xE000D000 , pic[51 -GIC_INTERNAL ], true, n); + n =zynq_init_spi_flashes (OBJECT (machine),0xE0006000 , + pic[58 -GIC_INTERNAL ], false,0 ); + n =zynq_init_spi_flashes (OBJECT (machine),0xE0007000 , + pic[81 -GIC_INTERNAL ], false, n); + n =zynq_init_spi_flashes (OBJECT (machine),0xE000D000 , + pic[51 -GIC_INTERNAL ], true, n); -sysbus_create_simple_orphan (TYPE_CHIPIDEA ,0xE0002000 , pic[53 -GIC_INTERNAL ]); -sysbus_create_simple_orphan (TYPE_CHIPIDEA ,0xE0003000 , pic[76 -GIC_INTERNAL ]); +sysbus_create_simple (OBJECT (machine),"usb[*]" ,TYPE_CHIPIDEA , +0xE0002000 , pic[53 -GIC_INTERNAL ]); +sysbus_create_simple (OBJECT (machine),"usb[*]" ,TYPE_CHIPIDEA , +0xE0003000 , pic[76 -GIC_INTERNAL ]); - dev =qdev_new_orphan (TYPE_CADENCE_UART ); + dev =qdev_new (OBJECT (machine),"uart[*]" ,TYPE_CADENCE_UART ); busdev =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" ,serial_hd (0 ));qdev_connect_clock_in (dev,"refclk" ,qdev_get_clock_out (slcr,"uart0_ref_clk" )); -sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_realize (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,0xE0000000 );sysbus_connect_irq (busdev,0 , pic[59 -GIC_INTERNAL ]); - dev =qdev_new_orphan (TYPE_CADENCE_UART ); + dev =qdev_new (OBJECT (machine),"uart[*]" ,TYPE_CADENCE_UART ); busdev =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" ,serial_hd (1 ));qdev_connect_clock_in (dev,"refclk" ,qdev_get_clock_out (slcr,"uart1_ref_clk" )); -sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_realize (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,0xE0001000 );sysbus_connect_irq (busdev,0 , pic[82 -GIC_INTERNAL ]); -sysbus_create_varargs_orphan ("cadence_ttc" ,0xF8001000 , +sysbus_create_varargs (OBJECT (machine),"ttc[*]" ,"cadence_ttc" ,0xF8001000 , pic[42 -GIC_INTERNAL ], pic[43 -GIC_INTERNAL ], pic[44 -GIC_INTERNAL ],NULL ); -sysbus_create_varargs_orphan ("cadence_ttc" ,0xF8002000 , +sysbus_create_varargs (OBJECT (machine),"ttc[*]" ,"cadence_ttc" ,0xF8002000 , pic[69 -GIC_INTERNAL ], pic[70 -GIC_INTERNAL ], pic[71 -GIC_INTERNAL ],NULL ); -ddr_ctrl_init (0xF8006000 ); +ddr_ctrl_init (OBJECT (machine),0xF8006000 ); -gem_init (0xE000B000 , pic[54 -GIC_INTERNAL ]); -gem_init (0xE000C000 , pic[77 -GIC_INTERNAL ]); +gem_init (OBJECT (machine),0xE000B000 , pic[54 -GIC_INTERNAL ]); +gem_init (OBJECT (machine),0xE000C000 , pic[77 -GIC_INTERNAL ]);for (n =0 ; n <2 ; n++) {int hci_irq = n ?79 :56 ;
@@ -329,27 +337,27 @@ static void zynq_init(MachineState *machine)* - SDIO Specification Version 2.0 * - MMC Specification Version 3.31 */ - dev =qdev_new_orphan (TYPE_SYSBUS_SDHCI ); + dev =qdev_new (OBJECT (machine),"sdhci[*]" ,TYPE_SYSBUS_SDHCI );qdev_prop_set_uint8 (dev,"sd-spec-version" ,2 );qdev_prop_set_uint64 (dev,"capareg" ,ZYNQ_SDHCI_CAPABILITIES ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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 -GIC_INTERNAL ]); di =drive_get (IF_SD ,0 , n); blk = di ?blk_by_legacy_dinfo (di) :NULL ; - carddev =qdev_new_orphan (TYPE_SD_CARD ); + carddev =qdev_new (OBJECT (dev),"sd-card" ,TYPE_SD_CARD );qdev_prop_set_drive_err (carddev,"drive" , blk, &error_fatal); -qdev_realize_and_unref (carddev,qdev_get_child_bus (dev,"sd-bus" ), - &error_fatal); +qdev_realize (carddev,qdev_get_child_bus (dev,"sd-bus" ), + &error_fatal); } - dev =qdev_new_orphan (TYPE_ZYNQ_XADC ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); + dev =qdev_new (OBJECT (machine),"xadc" ,TYPE_ZYNQ_XADC ); +sysbus_realize (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 -GIC_INTERNAL ]); - dev =qdev_new_orphan ("pl330" ); + dev =qdev_new (OBJECT (machine),"dma" ,"pl330" );object_property_set_link (OBJECT (dev),"memory" ,OBJECT (address_space_mem), &error_fatal);
@@ -365,16 +373,16 @@ static void zynq_init(MachineState *machine)qdev_prop_set_uint16 (dev,"data_buffer_dep" ,256 ); busdev =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_realize (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,0xF8003000 );sysbus_connect_irq (busdev,0 , pic[45 -GIC_INTERNAL ]);/* abort irq line */ for (n =0 ; n <ARRAY_SIZE (dma_irqs); ++n) {/* event irqs */ sysbus_connect_irq (busdev, n +1 , pic[dma_irqs[n] -GIC_INTERNAL ]); } - dev =qdev_new_orphan ("xlnx.ps7-dev-cfg" ); + dev =qdev_new (OBJECT (machine),"devcfg" ,"xlnx.ps7-dev-cfg" ); busdev =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_realize (busdev, &error_fatal);sysbus_connect_irq (busdev,0 , pic[40 -GIC_INTERNAL ]);sysbus_mmio_map (busdev,0 ,0xF8007000 );
Signature · 1 line
2.47.1
RFC PATCH 59/134 hw/arm/xlnx-versal, xlnx-zynqmp: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in the hw/arm xlnx-versal, xlnx-zynqmp board files to the new parented API introduced earlier in this
series, so every onboard device gets a stable path in the
composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing SoC device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/arm/xlnx-versal.c:517 | qdev_new | container | name | SoC realize helper; collapse existing add_child(container,name); drop _and_unref hw/arm/xlnx-versal.c:565 | qdev_new | container | name | SoC realize helper; collapse existing add_child(container,name); drop _and_unref hw/arm/xlnx-versal.c:667 | qdev_new | parent | name | helper already receives parent+name; collapse add_child; drop _and_unref hw/arm/xlnx-versal.c:716 | qdev_new | OBJECT(gic) | "its" | collapse existing add_child(gic,"its"); sysbus_realize hw/arm/xlnx-versal.c:758 | qdev_new | OBJECT(s) | name | SoC realize; hoist name printf, collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:762 | qdev_new | OBJECT(s) | name | SoC realize; hoist name printf, collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:912 | qdev_new | OBJECT(qemu_cluster) | name | hoist name printf; collapse add_child; qdev_realize hw/arm/xlnx-versal.c:963 | qdev_new | OBJECT(s) | name | hoist name printf; collapse add_child; qdev_realize hw/arm/xlnx-versal.c:1031 | qdev_new | OBJECT(s) | "uart[*]" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1070 | qdev_new | OBJECT(s) | "canfd[*]" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1110 | qdev_new | OBJECT(s) | "usb[*]" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1170 | qdev_new | OBJECT(s) | "gem[*]" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1254 | qdev_new | OBJECT(s) | name | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1289 | qdev_new | OBJECT(s) | "sdhci[*]" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1323 | qdev_new | OBJECT(s) | "rtc" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1352 | qdev_new | OBJECT(s) | "trng" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1373 | qdev_new | OBJECT(s) | "xram[*]" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1395 | qdev_new | OBJECT(s) | "bbram" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1418 | qdev_new | OBJECT(s) | "efuse-ctrl" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1419 | qdev_new | OBJECT(s) | "efuse-cache" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1420 | qdev_new | OBJECT(s) | "efuse" | collapse add_child; qdev_realize hw/arm/xlnx-versal.c:1454 | qdev_new | OBJECT(s) | "pmc-iou-slcr" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1476 | qdev_new | OBJECT(s) | "ospi" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1485 | qdev_new | OBJECT(dev) | "dma-dst-dev" | collapse add_child under ospi; sysbus_realize hw/arm/xlnx-versal.c:1497 | qdev_new | OBJECT(dev) | "dma-src-dev" | collapse add_child under ospi; sysbus_realize hw/arm/xlnx-versal.c:1551 | qdev_new | container | "cfu-fdro" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1560 | qdev_new | container | "cframe-bcast" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1564 | qdev_new | container | "cfu-apb" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1568 | qdev_new | container | "cframe-irq-or-gate" | collapse add_child; qdev_realize hw/arm/xlnx-versal.c:1583 | qdev_new | container | "cframe[*]" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1635 | qdev_new | container | "cfu-sfr" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1679 | qdev_new | OBJECT(s) | "crl" | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1764 | qdev_new | OBJECT(s) | name | collapse add_child; sysbus_realize hw/arm/xlnx-versal.c:1975 | qdev_new | OBJECT(sdhci) | "card[*]" | collapse add_child; qdev_realize hw/arm/xlnx-versal.c:2018 | qdev_new | OBJECT(ospi) | "flash[*]" | flash on OSPI SPI bus; parent under ospi; qdev_realize hw/arm/xlnx-versal-virt.c:146 | qdev_new | OBJECT(s) | "virtio-mmio[*]" | machine init helper; collapse add_child; sysbus_realize hw/arm/xlnx-zcu102.c:190 | qdev_new | OBJECT(machine) | "sd-card[*]" | board init; qdev_realize hw/arm/xlnx-zcu102.c:205 | qdev_new | OBJECT(machine) | "spi-flash[*]" | board init; qdev_realize hw/arm/xlnx-zcu102.c:229 | qdev_new | OBJECT(machine) | "qspi-flash[*]" | board init; qdev_realize hw/arm/xlnx-zynqmp.c:368 | qdev_new | OBJECT(s) | info->name | SoC realize; collapse add_child; sysbus_realize
--- hw/arm/xlnx-versal-virt.c | 5 +- hw/arm/xlnx-versal.c | 197 ++++++++++++++++---------------------- hw/arm/xlnx-zcu102.c | 14 +-- hw/arm/xlnx-zynqmp.c | 6 +- 4 files changed, 98 insertions(+), 124 deletions(-)
hw/arm/xlnx-versal-virt.c +2 -3
@@ -143,9 +143,8 @@ static void create_virtio_regions(VersalVirt *s)qemu_irq pic_irq; pic_irq =versal_get_reserved_irq (&s->soc, i, &dtb_irq); - dev =qdev_new_orphan ("virtio-mmio" ); -object_property_add_child (OBJECT (s),"virtio-mmio[*]" ,OBJECT (dev)); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); + dev =qdev_new (OBJECT (s),"virtio-mmio[*]" ,"virtio-mmio" ); +sysbus_realize (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 +85 -112
529 lines not on this page · raw message
hw/arm/xlnx-zcu102.c +8 -6
@@ -187,9 +187,9 @@ static void xlnx_zcu102_init(MachineState *machine)error_report ("No SD bus found for SD card %d" , i);exit (1 ); } - carddev =qdev_new_orphan (TYPE_SD_CARD ); + carddev =qdev_new (OBJECT (machine),"sd-card[*]" ,TYPE_SD_CARD );qdev_prop_set_drive_err (carddev,"drive" , blk, &error_fatal); -qdev_realize_and_unref (carddev, bus, &error_fatal); +qdev_realize (carddev, bus, &error_fatal); }for (i =0 ; i <XLNX_ZYNQMP_NUM_SPIS ; i++) {
@@ -202,13 +202,14 @@ static void xlnx_zcu102_init(MachineState *machine) spi_bus =qdev_get_child_bus (DEVICE (&s->soc), bus_name);g_free (bus_name); - flash_dev =qdev_new_orphan ("sst25wf080" ); + flash_dev =qdev_new (OBJECT (machine),"spi-flash[*]" , +"sst25wf080" );if (dinfo) {qdev_prop_set_drive_err (flash_dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); }qdev_prop_set_uint8 (flash_dev,"cs" , i); -qdev_realize_and_unref (flash_dev, spi_bus, &error_fatal); +qdev_realize (flash_dev, spi_bus, &error_fatal); cs_line =qdev_get_gpio_in_named (flash_dev,SSI_GPIO_CS ,0 );
@@ -226,13 +227,14 @@ static void xlnx_zcu102_init(MachineState *machine) spi_bus =qdev_get_child_bus (DEVICE (&s->soc), bus_name);g_free (bus_name); - flash_dev =qdev_new_orphan ("n25q512a11" ); + flash_dev =qdev_new (OBJECT (machine),"qspi-flash[*]" , +"n25q512a11" );if (dinfo) {qdev_prop_set_drive_err (flash_dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); }qdev_prop_set_uint8 (flash_dev,"cs" , i); -qdev_realize_and_unref (flash_dev, spi_bus, &error_fatal); +qdev_realize (flash_dev, spi_bus, &error_fatal); cs_line =qdev_get_gpio_in_named (flash_dev,SSI_GPIO_CS ,0 );
hw/arm/xlnx-zynqmp.c +3 -3
@@ -365,15 +365,15 @@ static void xlnx_zynqmp_create_unimp_mmio(XlnxZynqMPState *s)for (nr =0 ; nr <ARRAY_SIZE (unimp_areas); nr++) {const struct UnimpInfo *info = &unimp_areas[nr]; -DeviceState *dev =qdev_new_orphan (TYPE_UNIMPLEMENTED_DEVICE ); +DeviceState *dev =qdev_new (OBJECT (s), info->name, +TYPE_UNIMPLEMENTED_DEVICE );SysBusDevice *sbd =SYS_BUS_DEVICE (dev);assert (info->name && info->base && info->size >0 );qdev_prop_set_string (dev,"name" , info->name);qdev_prop_set_uint64 (dev,"size" , info->size); -object_property_add_child (OBJECT (s), info->name,OBJECT (dev)); -sysbus_realize_and_unref (sbd, &error_fatal); +sysbus_realize (sbd, &error_fatal);sysbus_mmio_map (sbd,0 , info->base); } }
Signature · 1 line
2.47.1
RFC PATCH 60/134 hw/arm/realview, integratorcp: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in the hw/arm realview, integratorcp board files to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing SoC device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/arm/integratorcp.c:624 | qdev_new | OBJECT(machine) | "core" | board init; single core module hw/arm/integratorcp.c:629 | sysbus_create_varargs | OBJECT(machine) | "pic" | board init; primary PIC hw/arm/integratorcp.c:636 | sysbus_create_simple | OBJECT(machine) | "sic" | board init; secondary PIC hw/arm/integratorcp.c:637 | sysbus_create_varargs | OBJECT(machine) | "pit" | board init; single PIT hw/arm/integratorcp.c:639 | sysbus_create_simple | OBJECT(machine) | "rtc" | board init; single pl031 RTC hw/arm/integratorcp.c:642 | sysbus_create_simple | OBJECT(machine) | "icp" | board init; ICP control regs hw/arm/integratorcp.c:644 | sysbus_create_simple | OBJECT(machine) | "keyboard" | board init; pl050 KMI0 hw/arm/integratorcp.c:645 | sysbus_create_simple | OBJECT(machine) | "mouse" | board init; pl050 KMI1 hw/arm/integratorcp.c:646 | sysbus_create_simple | OBJECT(machine) | "debug" | board init; single debug LEDs hw/arm/integratorcp.c:648 | sysbus_create_varargs | OBJECT(machine) | "mmc" | board init; single pl181 MMC hw/arm/integratorcp.c:657 | qdev_new | OBJECT(machine) | "sd-card" | board init; single SD card hw/arm/integratorcp.c:664 | qdev_new | OBJECT(machine) | "aaci" | board init; single pl041 audio hw/arm/integratorcp.c:676 | qdev_new | OBJECT(machine) | "clcd" | board init; single pl110 CLCD hw/arm/realview.c:64 | qdev_new | parent | "split-irq[*]" | helper: threaded Object *parent from board init; called twice → auto-index hw/arm/realview.c:183 | qdev_new | OBJECT(machine) | "sysctl" | board init; single sysctl hw/arm/realview.c:191 | qdev_new | OBJECT(machine) | "mpcore" | board init; A9 mpcore (excl. w/ 194,209) hw/arm/realview.c:194 | qdev_new | OBJECT(machine) | "mpcore" | board init; 11MP mpcore (excl. w/ 191,209) hw/arm/realview.c:203 | sysbus_create_varargs | OBJECT(machine) | "l2x0" | board init; single L2 cache ctlr hw/arm/realview.c:209 | sysbus_create_simple | OBJECT(machine) | "gic" | board init; single GIC (excl. w/ 191,194) hw/arm/realview.c:215 | qdev_new | OBJECT(machine) | "aaci" | board init; single pl041 audio hw/arm/realview.c:224 | sysbus_create_simple | OBJECT(machine) | "keyboard" | board init; pl050 KMI0 hw/arm/realview.c:225 | sysbus_create_simple | OBJECT(machine) | "mouse" | board init; pl050 KMI1 hw/arm/realview.c:233 | qdev_new | OBJECT(machine) | "dma" | board init; single pl081 DMA hw/arm/realview.c:241 | sysbus_create_simple | OBJECT(machine) | "timer[*]" | board init; 2× sp804 → auto-index hw/arm/realview.c:242 | sysbus_create_simple | OBJECT(machine) | "timer[*]" | board init; 2× sp804 → auto-index hw/arm/realview.c:244 | sysbus_create_simple | OBJECT(machine) | "gpio[*]" | board init; 3× pl061 → auto-index hw/arm/realview.c:245 | sysbus_create_simple | OBJECT(machine) | "gpio[*]" | board init; 3× pl061 → auto-index hw/arm/realview.c:246 | sysbus_create_simple | OBJECT(machine) | "gpio[*]" | board init; 3× pl061 → auto-index hw/arm/realview.c:248 | qdev_new | OBJECT(machine) | "clcd" | board init; single pl111 CLCD hw/arm/realview.c:255 | sysbus_create_varargs | OBJECT(machine) | "mmc" | board init; single pl181 MMC hw/arm/realview.c:274 | qdev_new | OBJECT(machine) | "sd-card" | board init; single SD card hw/arm/realview.c:281 | sysbus_create_simple | OBJECT(machine) | "rtc" | board init; single pl031 RTC hw/arm/realview.c:284 | qdev_new | OBJECT(machine) | "pci-host" | board init; single PCI host bridge hw/arm/realview.c:300 | pci_create_simple | OBJECT(machine) | "ohci" | board init; single OHCI USB hw/arm/realview.c:304 | pci_create_simple | OBJECT(machine) | "scsi[*]" | board init; loop → auto-index hw/arm/realview.c:322 | sysbus_create_simple | OBJECT(machine) | "i2c" | board init; single SBCon I2C hw/arm/realview.c:324 | i2c_slave_create_simple | OBJECT(machine) | "ds1338" | board init; single DS1338 RTC
--- hw/arm/integratorcp.c | 45 ++++++++++++---------- hw/arm/realview.c | 87 +++++++++++++++++++++++++------------------ 2 files changed, 76 insertions(+), 56 deletions(-)
hw/arm/integratorcp.c +26 -19
@@ -621,31 +621,38 @@ static void integratorcp_init(MachineState *machine) 0, ram_size);memory_region_add_subregion (address_space_mem,0x80000000 , ram_alias); - dev =qdev_new_orphan (TYPE_INTEGRATOR_CM ); + dev =qdev_new (OBJECT (machine),"core" ,TYPE_INTEGRATOR_CM );qdev_prop_set_uint32 (dev,"memsz" , ram_size >>20 ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map ((SysBusDevice *)dev,0 ,0x10000000 ); - dev =sysbus_create_varargs_orphan (TYPE_INTEGRATOR_PIC ,0x14000000 , + dev =sysbus_create_varargs (OBJECT (machine),"pic" , +TYPE_INTEGRATOR_PIC ,0x14000000 ,qdev_get_gpio_in (DEVICE (cpu),ARM_CPU_IRQ ),qdev_get_gpio_in (DEVICE (cpu),ARM_CPU_FIQ ),NULL );for (i =0 ; i <32 ; i++) { pic[i] =qdev_get_gpio_in (dev, i); } - sic =sysbus_create_simple_orphan (TYPE_INTEGRATOR_PIC ,0xca000000 , pic[26 ]); -sysbus_create_varargs_orphan ("integrator_pit" ,0x13000000 , + sic =sysbus_create_simple (OBJECT (machine),"sic" , +TYPE_INTEGRATOR_PIC ,0xca000000 , pic[26 ]); +sysbus_create_varargs (OBJECT (machine),"pit" ,"integrator_pit" ,0x13000000 , pic[5 ], pic[6 ], pic[7 ],NULL ); -sysbus_create_simple_orphan ("pl031" ,0x15000000 , pic[8 ]); +sysbus_create_simple (OBJECT (machine),"rtc" ,"pl031" ,0x15000000 , pic[8 ]);pl011_create (OBJECT (machine),0x16000000 , pic[1 ],serial_hd (0 ));pl011_create (OBJECT (machine),0x17000000 , pic[2 ],serial_hd (1 )); - icp =sysbus_create_simple_orphan (TYPE_ICP_CONTROL_REGS ,0xcb000000 , + icp =sysbus_create_simple (OBJECT (machine),"icp" , +TYPE_ICP_CONTROL_REGS ,0xcb000000 ,qdev_get_gpio_in (sic,3 )); -sysbus_create_simple_orphan ("pl050_keyboard" ,0x18000000 , pic[3 ]); -sysbus_create_simple_orphan ("pl050_mouse" ,0x19000000 , pic[4 ]); -sysbus_create_simple_orphan (TYPE_INTEGRATOR_DEBUG ,0x1a000000 ,0 ); - - dev =sysbus_create_varargs_orphan ("pl181" ,0x1c000000 , pic[23 ], pic[24 ],NULL ); +sysbus_create_simple (OBJECT (machine),"keyboard" , +"pl050_keyboard" ,0x18000000 , pic[3 ]); +sysbus_create_simple (OBJECT (machine),"mouse" , +"pl050_mouse" ,0x19000000 , pic[4 ]); +sysbus_create_simple (OBJECT (machine),"debug" , +TYPE_INTEGRATOR_DEBUG ,0x1a000000 ,0 ); + + dev =sysbus_create_varargs (OBJECT (machine),"mmc" ,"pl181" , +0x1c000000 , pic[23 ], pic[24 ],NULL );qdev_connect_gpio_out_named (dev,"card-read-only" ,0 ,qdev_get_gpio_in_named (icp,ICP_GPIO_MMC_WPROT ,0 )); qdev_connect_gpio_out_named(dev, "card-inserted", 0,
@@ -654,18 +661,18 @@ static void integratorcp_init(MachineState *machine)if (dinfo) {DeviceState *card; - card =qdev_new_orphan (TYPE_SD_CARD ); + card =qdev_new (OBJECT (machine),"sd-card" ,TYPE_SD_CARD );qdev_prop_set_drive_err (card,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); -qdev_realize_and_unref (card,qdev_get_child_bus (dev,"sd-bus" ), - &error_fatal); +qdev_realize (card,qdev_get_child_bus (dev,"sd-bus" ), + &error_fatal); } - dev =qdev_new_orphan ("pl041" ); + dev =qdev_new (OBJECT (machine),"aaci" ,"pl041" );if (machine->audiodev) {qdev_prop_set_string (dev,"audiodev" , machine->audiodev); } -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0x1d000000 );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[25 ]);
@@ -673,10 +680,10 @@ static void integratorcp_init(MachineState *machine)smc91c111_init (OBJECT (machine),0xc8000000 , pic[27 ]); } - dev =qdev_new_orphan ("pl110" ); + dev =qdev_new (OBJECT (machine),"clcd" ,"pl110" );object_property_set_link (OBJECT (dev),"framebuffer-memory" ,OBJECT (address_space_mem), &error_fatal); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0xc0000000 );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[22 ]);
hw/arm/realview.c +50 -37
191 lines not on this page · raw message
Signature · 1 line
2.47.1
RFC PATCH 61/134 hw/arm/npcm: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in the hw/arm npcm board files to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing SoC device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/arm/npcm7xx_boards.c:87 | qdev_new | parent | "flash[*]" | helper: threaded Object *parent from board init; multiple callers/CS → auto-index
hw/arm/npcm7xx_boards.c:116 | qdev_new | parent | "sd-card[*]" | helper: threaded Object *parent from board init; per-unit → auto-index hw/arm/npcm7xx_boards.c:201 | i2c_slave_create_simple | parent | "tmp105[*]" | helper: threaded Object *parent from board init; 4× tmp105 → auto-index hw/arm/npcm7xx_boards.c:203 | i2c_slave_create_simple | parent | "tmp105[*]" | helper from board init; auto-index hw/arm/npcm7xx_boards.c:205 | i2c_slave_create_simple | parent | "tmp105[*]" | helper from board init; auto-index hw/arm/npcm7xx_boards.c:207 | i2c_slave_create_simple | parent | "tmp105[*]" | helper from board init; auto-index hw/arm/npcm7xx_boards.c:237 | i2c_slave_create_simple | parent | "tmp105[*]" | helper: threaded Object *parent from board init; 4× tmp105 → auto-index hw/arm/npcm7xx_boards.c:238 | i2c_slave_create_simple | parent | "tmp105[*]" | helper from board init; auto-index hw/arm/npcm7xx_boards.c:239 | i2c_slave_create_simple | parent | "tmp105[*]" | helper from board init; auto-index hw/arm/npcm7xx_boards.c:240 | i2c_slave_create_simple | parent | "tmp105[*]" | helper from board init; auto-index hw/arm/npcm7xx_boards.c:256 | i2c_slave_create_simple | parent | "pca9548" | helper from board init; single mux hw/arm/npcm7xx_boards.c:336 | i2c_slave_create_simple | parent | "pca9548[*]" | helper: threaded Object *parent from board init; 4× pca9548 → auto-index hw/arm/npcm7xx_boards.c:340 | i2c_slave_create_simple | parent | "tmp105[*]" | helper from board init; 8× tmp105 → auto-index hw/arm/npcm7xx_boards.c:341 | i2c_slave_create_simple | parent | "tmp105[*]" | helper from board init; auto-index hw/arm/npcm7xx_boards.c:342 | i2c_slave_create_simple | parent | "tmp105[*]" | helper from board init; auto-index hw/arm/npcm7xx_boards.c:343 | i2c_slave_create_simple | parent | "tmp105[*]" | helper from board init; auto-index hw/arm/npcm7xx_boards.c:345 | i2c_slave_create_simple | parent | "pca9548[*]" | helper from board init; auto-index hw/arm/npcm7xx_boards.c:347 | i2c_slave_create_simple | parent | "pca9548[*]" | helper from board init; auto-index hw/arm/npcm7xx_boards.c:351 | i2c_slave_create_simple | parent | "pca9548[*]" | helper from board init; auto-index hw/arm/npcm7xx_boards.c:355 | i2c_slave_create_simple | parent | "tmp105[*]" | helper from board init; auto-index hw/arm/npcm7xx_boards.c:356 | i2c_slave_create_simple | parent | "tmp105[*]" | helper from board init; auto-index hw/arm/npcm7xx_boards.c:357 | i2c_slave_create_simple | parent | "tmp105[*]" | helper from board init; auto-index hw/arm/npcm7xx_boards.c:358 | i2c_slave_create_simple | parent | "tmp105[*]" | helper from board init; auto-index
hw/arm/npcm7xx.c:524 | sysbus_create_simple | OBJECT(dev) | "l2x0" | SoC DeviceClass.realize(dev); single L2 cache ctlr hw/arm/npcm8xx_boards.c:64 | qdev_new | parent | "flash[*]" | helper: threaded Object *parent from board init; auto-index hw/arm/npcm8xx_boards.c:162 | i2c_slave_create_simple | parent | "tmp105" | helper: threaded Object *parent from board init; single tmp105
--- hw/arm/npcm7xx.c | 2 +- hw/arm/npcm7xx_boards.c | 107 ++++++++++++++++++++++++---------------- hw/arm/npcm8xx_boards.c | 19 ++++--- 3 files changed, 77 insertions(+), 51 deletions(-)
hw/arm/npcm7xx.c +1 -1
@@ -521,7 +521,7 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp) }/* L2 cache controller */ -sysbus_create_simple_orphan ("l2x0" ,NPCM7XX_L2C_BA ,NULL ); +sysbus_create_simple (OBJECT (dev),"l2x0" ,"l2x0" ,NPCM7XX_L2C_BA ,NULL );/* System Global Control Registers (GCR). Can fail due to user input. */ object_property_set_int(OBJECT(&s->gcr), "disabled-modules",
hw/arm/npcm7xx_boards.c +65 -42
215 lines not on this page · raw message
hw/arm/npcm8xx_boards.c +11 -8
@@ -55,17 +55,18 @@ static void npcm8xx_load_bootrom(MachineState *machine, NPCM8xxState *soc) } } -static void npcm8xx_connect_flash (NPCM7xxFIUState *fiu,int cs_no, -const char *flash_type,DriveInfo *dinfo) +static void npcm8xx_connect_flash (Object *parent,NPCM7xxFIUState *fiu, +int cs_no,const char *flash_type, +DriveInfo *dinfo) {DeviceState *flash;qemu_irq flash_cs; - flash =qdev_new_orphan (flash_type); + flash =qdev_new (parent,"flash[*]" , flash_type);if (dinfo) {qdev_prop_set_drive (flash,"drive" ,blk_by_legacy_dinfo (dinfo)); } -qdev_realize_and_unref (flash,BUS (fiu->spi), &error_fatal); +qdev_realize (flash,BUS (fiu->spi), &error_fatal); flash_cs =qdev_get_gpio_in_named (flash,SSI_GPIO_CS ,0 );qdev_connect_gpio_out_named (DEVICE (fiu),"cs" , cs_no, flash_cs);
@@ -156,10 +157,11 @@ static void npcm8xx_connect_pwm_fan(NPCM8xxState *soc, SplitIRQ *splitter,qdev_connect_gpio_out (DEVICE (splitter), output_no, fan_duty_gpio); } -static void npcm845_evb_i2c_init (NPCM8xxState *soc) +static void npcm845_evb_i2c_init (Object *parent,NPCM8xxState *soc) {/* tmp100 temperature sensor on SVB, tmp105 is compatible */ -i2c_slave_create_simple_orphan (npcm8xx_i2c_get_bus (soc,6 ),"tmp105" ,0x48 ); +i2c_slave_create_simple (parent,"tmp105" , +npcm8xx_i2c_get_bus (soc,6 ),"tmp105" ,0x48 ); }static void npcm845_evb_fan_init (NPCM8xxMachine *machine,NPCM8xxState *soc)
@@ -195,8 +197,9 @@ static void npcm845_evb_init(MachineState *machine)qdev_realize (DEVICE (soc),NULL , &error_fatal);npcm8xx_load_bootrom (machine, soc); -npcm8xx_connect_flash (&soc->fiu[0 ],0 ,"w25q256" ,drive_get (IF_MTD ,0 ,0 )); -npcm845_evb_i2c_init (soc); +npcm8xx_connect_flash (OBJECT (machine), &soc->fiu[0 ],0 ,"w25q256" , +drive_get (IF_MTD ,0 ,0 )); +npcm845_evb_i2c_init (OBJECT (machine), soc);npcm845_evb_fan_init (NPCM8XX_MACHINE (machine), soc);npcm8xx_load_kernel (machine, soc); }
Signature · 1 line
2.47.1
RFC PATCH 62/134 hw/arm/versatile, vexpress: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in the hw/arm versatile, vexpress board files to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing SoC device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/arm/versatilepb.c:229 | qdev_new | OBJECT(machine) | "sysctl" | board init(); machine owns onboard sysctl hw/arm/versatilepb.c:235 | sysbus_create_varargs | OBJECT(machine) | "vic" | board init(); PL190 primary intc hw/arm/versatilepb.c:242 | sysbus_create_simple | OBJECT(machine) | "sic" | board init(); secondary intc hw/arm/versatilepb.c:248 | sysbus_create_simple | OBJECT(machine) | "keyboard" | board init(); single KMI kbd hw/arm/versatilepb.c:249 | sysbus_create_simple | OBJECT(machine) | "mouse" | board init(); single KMI mouse hw/arm/versatilepb.c:251 | qdev_new | OBJECT(machine) | "pci-host" | board init(); versatile PCI host bridge hw/arm/versatilepb.c:273 | pci_create_simple | OBJECT(machine) | "usb" | board init(); optional OHCI on PCI bus hw/arm/versatilepb.c:277 | pci_create_simple | OBJECT(machine) | "scsi[*]" | board init(); loop over IF_SCSI buses hw/arm/versatilepb.c:287 | qdev_new | OBJECT(machine) | "dma" | board init(); PL080 DMA hw/arm/versatilepb.c:295 | sysbus_create_simple | OBJECT(machine) | "timer[*]" | board init(); two SP804 blocks hw/arm/versatilepb.c:296 | sysbus_create_simple | OBJECT(machine) | "timer[*]" | board init(); auto-index sibling hw/arm/versatilepb.c:298 | sysbus_create_simple | OBJECT(machine) | "gpio[*]" | board init(); four PL061 ports hw/arm/versatilepb.c:299 | sysbus_create_simple | OBJECT(machine) | "gpio[*]" | board init(); auto-index sibling hw/arm/versatilepb.c:300 | sysbus_create_simple | OBJECT(machine) | "gpio[*]" | board init(); auto-index sibling hw/arm/versatilepb.c:301 | sysbus_create_simple | OBJECT(machine) | "gpio[*]" | board init(); auto-index sibling hw/arm/versatilepb.c:305 | qdev_new | OBJECT(machine) | "clcd" | board init(); PL110 display hw/arm/versatilepb.c:315 | sysbus_create_varargs | OBJECT(machine) | "mmci[*]" | board init(); two PL181 MMCI hw/arm/versatilepb.c:320 | qdev_new | OBJECT(machine) | "sd-card[*]" | board init(); removable card owned by machine hw/arm/versatilepb.c:327 | sysbus_create_varargs | OBJECT(machine) | "mmci[*]" | board init(); auto-index sibling hw/arm/versatilepb.c:332 | qdev_new | OBJECT(machine) | "sd-card[*]" | board init(); auto-index sibling hw/arm/versatilepb.c:340 | sysbus_create_simple | OBJECT(machine) | "rtc" | board init(); PL031 RTC hw/arm/versatilepb.c:342 | sysbus_create_simple | OBJECT(machine) | "i2c" | board init(); SBCon I2C bridge hw/arm/versatilepb.c:344 | i2c_slave_create_simple | OBJECT(machine) | "ds1338" | board init(); onboard I2C RTC chip hw/arm/versatilepb.c:347 | qdev_new | OBJECT(machine) | "aaci" | board init(); PL041 audio hw/arm/vexpress.c:244 | qdev_new | OBJECT(ms) | "mpcore" | init_cpus() takes MachineState *ms; A9/A15 priv block hw/arm/vexpress.c:304 | qdev_new | OBJECT(vms) | "db-clcd" | a9_daughterboard_init() has vms; distinct from motherboard clcd hw/arm/vexpress.c:316 | sysbus_create_simple | OBJECT(vms) | "timer[*]" | a9 daughterboard SP804; auto-index shared with motherboard timers hw/arm/vexpress.c:324 | sysbus_create_varargs | OBJECT(vms) | "l2x0" | a9 daughterboard L2 cache ctrl hw/arm/vexpress.c:520 | qdev_new | parent | "flash[*]" | helper: thread Object *parent as first arg; two callers pass OBJECT(machine) hw/arm/vexpress.c:595 | qdev_new | OBJECT(machine) | "sysctl" | vexpress_common_init(MachineState *machine) hw/arm/vexpress.c:617 | qdev_new | OBJECT(machine) | "aaci" | board init(); PL041 audio hw/arm/vexpress.c:626 | sysbus_create_varargs | OBJECT(machine) | "mmci" | board init(); single PL181 hw/arm/vexpress.c:636 | qdev_new | OBJECT(machine) | "sd-card" | board init(); single removable SD hw/arm/vexpress.c:643 | sysbus_create_simple | OBJECT(machine) | "keyboard" | board init(); KMI0 hw/arm/vexpress.c:644 | sysbus_create_simple | OBJECT(machine) | "mouse" | board init(); KMI1 hw/arm/vexpress.c:651 | sysbus_create_simple | OBJECT(machine) | "timer[*]" | board init(); motherboard SP804 hw/arm/vexpress.c:652 | sysbus_create_simple | OBJECT(machine) | "timer[*]" | board init(); auto-index sibling hw/arm/vexpress.c:654 | sysbus_create_simple | OBJECT(machine) | "i2c" | board init(); SBCon serial DVI I2C hw/arm/vexpress.c:656 | i2c_slave_create_simple | OBJECT(machine) | "sii9022" | board init(); HDMI transmitter chip hw/arm/vexpress.c:658 | sysbus_create_simple | OBJECT(machine) | "rtc" | board init(); PL031 hw/arm/vexpress.c:662 | qdev_new | OBJECT(machine) | "clcd" | board init(); motherboard PL111 hw/arm/vexpress.c:709 | sysbus_create_simple | OBJECT(machine) | "virtio-mmio[*]" | board init(); loop of transports
--- hw/arm/versatilepb.c | 70 +++++++++++++++++++++++--------------------- hw/arm/vexpress.c | 66 +++++++++++++++++++++-------------------- 2 files changed, 72 insertions(+), 64 deletions(-)
hw/arm/versatilepb.c +37 -33
@@ -226,31 +226,33 @@ static void versatile_init(MachineState *machine, int board_id)/* SDRAM at address zero. */ memory_region_add_subregion (sysmem,0 , machine->ram); - sysctl =qdev_new_orphan ("realview_sysctl" ); + sysctl =qdev_new (OBJECT (machine),"sysctl" ,"realview_sysctl" );qdev_prop_set_uint32 (sysctl,"sys_id" ,0x41007004 );qdev_prop_set_uint32 (sysctl,"proc_id" ,0x02000000 ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (sysctl), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (sysctl), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (sysctl),0 ,0x10000000 ); - dev =sysbus_create_varargs_orphan ("pl190" ,0x10140000 , + dev =sysbus_create_varargs (OBJECT (machine),"vic" ,"pl190" ,0x10140000 ,qdev_get_gpio_in (DEVICE (cpu),ARM_CPU_IRQ ),qdev_get_gpio_in (DEVICE (cpu),ARM_CPU_FIQ ),NULL );for (n =0 ; n <32 ; n++) { pic[n] =qdev_get_gpio_in (dev, n); } - dev =sysbus_create_simple_orphan (TYPE_VERSATILE_PB_SIC ,0x10003000 ,NULL ); + dev =sysbus_create_simple (OBJECT (machine),"sic" , +TYPE_VERSATILE_PB_SIC ,0x10003000 ,NULL );for (n =0 ; n <32 ; n++) {sysbus_connect_irq (SYS_BUS_DEVICE (dev), n, pic[n]); sic[n] =qdev_get_gpio_in (dev, n); } -sysbus_create_simple_orphan ("pl050_keyboard" ,0x10006000 , sic[3 ]); -sysbus_create_simple_orphan ("pl050_mouse" ,0x10007000 , sic[4 ]); +sysbus_create_simple (OBJECT (machine),"keyboard" ,"pl050_keyboard" , +0x10006000 , sic[3 ]); +sysbus_create_simple (OBJECT (machine),"mouse" ,"pl050_mouse" ,0x10007000 , sic[4 ]); - dev =qdev_new_orphan ("versatile_pci" ); + dev =qdev_new (OBJECT (machine),"pci-host" ,"versatile_pci" ); busdev =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_realize (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 */
@@ -270,11 +272,12 @@ static void versatile_init(MachineState *machine, int board_id)pci_init_nic_devices (pci_bus,"rtl8139" );if (machine_usb (machine)) { -pci_create_simple_orphan (pci_bus,-1 ,"pci-ohci" ); +pci_create_simple (OBJECT (machine),"usb" , pci_bus,-1 ,"pci-ohci" ); } n =drive_get_max_bus (IF_SCSI );while (n >=0 ) { - dev =DEVICE (pci_create_simple_orphan (pci_bus,-1 ,"lsi53c895a" )); + dev =DEVICE (pci_create_simple (OBJECT (machine),"scsi[*]" , + pci_bus,-1 ,"lsi53c895a" ));lsi53c8xx_handle_legacy_cmdline (dev); n--; }
@@ -284,72 +287,73 @@ static void versatile_init(MachineState *machine, int board_id)pl011_create (OBJECT (machine),0x101f3000 , pic[14 ],serial_hd (2 ));pl011_create (OBJECT (machine),0x10009000 , sic[6 ],serial_hd (3 )); - dev =qdev_new_orphan ("pl080" ); + dev =qdev_new (OBJECT (machine),"dma" ,"pl080" );object_property_set_link (OBJECT (dev),"downstream" ,OBJECT (sysmem), &error_fatal); busdev =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_realize (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,0x10130000 );sysbus_connect_irq (busdev,0 , pic[17 ]); -sysbus_create_simple_orphan ("sp804" ,0x101e2000 , pic[4 ]); -sysbus_create_simple_orphan ("sp804" ,0x101e3000 , pic[5 ]); +sysbus_create_simple (OBJECT (machine),"timer[*]" ,"sp804" ,0x101e2000 , pic[4 ]); +sysbus_create_simple (OBJECT (machine),"timer[*]" ,"sp804" ,0x101e3000 , pic[5 ]); -sysbus_create_simple_orphan ("pl061" ,0x101e4000 , pic[6 ]); -sysbus_create_simple_orphan ("pl061" ,0x101e5000 , pic[7 ]); -sysbus_create_simple_orphan ("pl061" ,0x101e6000 , pic[8 ]); -sysbus_create_simple_orphan ("pl061" ,0x101e7000 , pic[9 ]); +sysbus_create_simple (OBJECT (machine),"gpio[*]" ,"pl061" ,0x101e4000 , pic[6 ]); +sysbus_create_simple (OBJECT (machine),"gpio[*]" ,"pl061" ,0x101e5000 , pic[7 ]); +sysbus_create_simple (OBJECT (machine),"gpio[*]" ,"pl061" ,0x101e6000 , pic[8 ]); +sysbus_create_simple (OBJECT (machine),"gpio[*]" ,"pl061" ,0x101e7000 , pic[9 ]);/* The versatile/PB actually has a modified Color LCD controller that includes hardware cursor support from the PL111. */ - dev =qdev_new_orphan ("pl110_versatile" ); + dev =qdev_new (OBJECT (machine),"clcd" ,"pl110_versatile" );object_property_set_link (OBJECT (dev),"framebuffer-memory" ,OBJECT (sysmem), &error_fatal); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0x10120000 );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[16 ]);/* Wire up the mux control signals from the SYS_CLCD register */ qdev_connect_gpio_out (sysctl,0 ,qdev_get_gpio_in (dev,0 )); - dev =sysbus_create_varargs_orphan ("pl181" ,0x10005000 , sic[22 ], sic[1 ],NULL ); + dev =sysbus_create_varargs (OBJECT (machine),"mmci[*]" ,"pl181" , +0x10005000 , sic[22 ], sic[1 ],NULL ); dinfo =drive_get (IF_SD ,0 ,0 );if (dinfo) {DeviceState *card; - card =qdev_new_orphan (TYPE_SD_CARD ); + card =qdev_new (OBJECT (machine),"sd-card[*]" ,TYPE_SD_CARD );qdev_prop_set_drive_err (card,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); -qdev_realize_and_unref (card,qdev_get_child_bus (dev,"sd-bus" ), - &error_fatal); +qdev_realize (card,qdev_get_child_bus (dev,"sd-bus" ), &error_fatal); } - dev =sysbus_create_varargs_orphan ("pl181" ,0x1000b000 , sic[23 ], sic[2 ],NULL ); + dev =sysbus_create_varargs (OBJECT (machine),"mmci[*]" ,"pl181" , +0x1000b000 , sic[23 ], sic[2 ],NULL ); dinfo =drive_get (IF_SD ,0 ,1 );if (dinfo) {DeviceState *card; - card =qdev_new_orphan (TYPE_SD_CARD ); + card =qdev_new (OBJECT (machine),"sd-card[*]" ,TYPE_SD_CARD );qdev_prop_set_drive_err (card,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); -qdev_realize_and_unref (card,qdev_get_child_bus (dev,"sd-bus" ), - &error_fatal); +qdev_realize (card,qdev_get_child_bus (dev,"sd-bus" ), &error_fatal); }/* Add PL031 Real Time Clock. */ -sysbus_create_simple_orphan ("pl031" ,0x101e8000 , pic[10 ]); +sysbus_create_simple (OBJECT (machine),"rtc" ,"pl031" ,0x101e8000 , pic[10 ]); - dev =sysbus_create_simple_orphan (TYPE_ARM_SBCON_I2C ,0x10002000 ,NULL ); + dev =sysbus_create_simple (OBJECT (machine),"i2c" , +TYPE_ARM_SBCON_I2C ,0x10002000 ,NULL ); i2c = (I2CBus *)qdev_get_child_bus (dev,"i2c" ); -i2c_slave_create_simple_orphan (i2c,"ds1338" ,0x68 ); +i2c_slave_create_simple (OBJECT (machine),"ds1338" , i2c,"ds1338" ,0x68 );/* Add PL041 AACI Interface to the LM4549 codec */ - pl041 =qdev_new_orphan ("pl041" ); + pl041 =qdev_new (OBJECT (machine),"aaci" ,"pl041" );qdev_prop_set_uint32 (pl041,"nc_fifo_depth" ,512 );if (machine->audiodev) {qdev_prop_set_string (pl041,"audiodev" , machine->audiodev); } -sysbus_realize_and_unref (SYS_BUS_DEVICE (pl041), &error_fatal); +sysbus_realize (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 +35 -31
173 lines not on this page · raw message
Signature · 1 line
2.47.1
RFC PATCH 63/134 hw/arm/stellaris, musicpal: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in the hw/arm stellaris, musicpal board files to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing SoC device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/arm/musicpal.c:1235 | cpu_create | OBJECT(machine) | "cpu" | musicpal_init(MachineState *machine); single CPU hw/arm/musicpal.c:1243 | sysbus_create_simple | OBJECT(machine) | "pic" | board init(); primary intc hw/arm/musicpal.c:1245 | sysbus_create_varargs | OBJECT(machine) | "pit" | board init(); MV88W8618 timer block hw/arm/musicpal.c:1252 | qdev_new | OBJECT(machine) | "uart-orgate" | board init(); OR-IRQ combiner hw/arm/musicpal.c:1290 | sysbus_create_simple | OBJECT(machine) | "flashcfg" | board init(); flash config regs hw/arm/musicpal.c:1292 | qdev_new | OBJECT(machine) | "eth" | board init(); on-chip ethernet hw/arm/musicpal.c:1301 | sysbus_create_simple | OBJECT(machine) | "wlan" | board init(); WLAN stub hw/arm/musicpal.c:1303 | sysbus_create_simple | OBJECT(machine) | "misc" | board init(); misc regs hw/arm/musicpal.c:1305 | sysbus_create_simple | OBJECT(machine) | "gpio" | board init(); GPIO block hw/arm/musicpal.c:1307 | sysbus_create_simple | OBJECT(machine) | "i2c" | board init(); bit-bang GPIO I2C hw/arm/musicpal.c:1310 | sysbus_create_simple | OBJECT(machine) | "lcd" | board init(); front-panel LCD hw/arm/musicpal.c:1311 | sysbus_create_simple | OBJECT(machine) | "keys" | board init(); front-panel buttons hw/arm/musicpal.c:1331 | i2c_slave_new | OBJECT(machine) | "wm8750" | board init(); audio codec on I2C bus hw/arm/musicpal.c:1337 | qdev_new | OBJECT(machine) | "audio" | board init(); audio DMA controller hw/arm/stellaris.c:1099 | qdev_new | soc_container | "sys" | collapse existing add_child; keep name hw/arm/stellaris.c:1126 | qdev_new | soc_container | "v7m" | collapse existing add_child; keep name hw/arm/stellaris.c:1146 | sysbus_create_varargs | soc_container | "adc" | board init(); on-SoC ADC hw/arm/stellaris.c:1160 | qdev_new | soc_container | "gptm[*]" | collapse existing add_child; keep name hw/arm/stellaris.c:1175 | qdev_new | soc_container | "wdg" | collapse existing add_child; keep name hw/arm/stellaris.c:1192 | sysbus_create_simple | soc_container | "gpio[*]" | board init(); loop over PL061 ports hw/arm/stellaris.c:1204 | sysbus_create_simple | soc_container | "i2c[*]" | board init(); loop over I2C blocks hw/arm/stellaris.c:1212 | i2c_slave_create_simple | OBJECT(ms) | "oled-i2c" | board init(); external I2C OLED panel hw/arm/stellaris.c:1219 | qdev_new | soc_container | "uart[*]" | collapse existing add_child; keep name hw/arm/stellaris.c:1229 | sysbus_create_simple | soc_container | "ssi" | board init(); PL022 SPI hw/arm/stellaris.c:1303 | ssi_create_peripheral | OBJECT(ms) | "ssi-sd" | board init(); external SD adapter on SSI bus hw/arm/stellaris.c:1307 | qdev_new | OBJECT(ms) | "sd-card" | board init(); removable SD card hw/arm/stellaris.c:1313 | qdev_new | OBJECT(ms) | "oled" | collapse existing add_child; keep name hw/arm/stellaris.c:1318 | qdev_new | OBJECT(ms) | "splitter" | collapse existing add_child; keep name hw/arm/stellaris.c:1340 | qdev_new | soc_container | "enet" | collapse existing add_child; keep name hw/arm/stellaris.c:1360 | qdev_new | OBJECT(ms) | "gamepad" | collapse existing add_child; keep name
--- hw/arm/musicpal.c | 41 ++++++++++++++++------------ hw/arm/stellaris.c | 68 ++++++++++++++++++++-------------------------- 2 files changed, 53 insertions(+), 56 deletions(-)
hw/arm/musicpal.c +23 -18
@@ -1232,7 +1232,7 @@ static void musicpal_init(MachineState *machine)exit (EXIT_FAILURE ); } - cpu =ARM_CPU (cpu_create_orphan (machine->cpu_type)); + cpu =ARM_CPU (cpu_create (OBJECT (machine),"cpu" , machine->cpu_type));memory_region_add_subregion (address_space_mem,0 , machine->ram);
@@ -1240,18 +1240,20 @@ static void musicpal_init(MachineState *machine) &error_fatal);memory_region_add_subregion (address_space_mem,MP_SRAM_BASE , sram); - pic =sysbus_create_simple_orphan (TYPE_MV88W8618_PIC ,MP_PIC_BASE , + pic =sysbus_create_simple (OBJECT (machine),"pic" , +TYPE_MV88W8618_PIC ,MP_PIC_BASE ,qdev_get_gpio_in (DEVICE (cpu),ARM_CPU_IRQ )); -sysbus_create_varargs_orphan (TYPE_MV88W8618_PIT ,MP_PIT_BASE , +sysbus_create_varargs (OBJECT (machine),"pit" , +TYPE_MV88W8618_PIT ,MP_PIT_BASE ,qdev_get_gpio_in (pic,MP_TIMER1_IRQ ),qdev_get_gpio_in (pic,MP_TIMER2_IRQ ),qdev_get_gpio_in (pic,MP_TIMER3_IRQ ),qdev_get_gpio_in (pic,MP_TIMER4_IRQ ),NULL );/* Logically OR both UART IRQs together */ - uart_orgate =qdev_new_orphan (TYPE_OR_IRQ ); + uart_orgate =qdev_new (OBJECT (machine),"uart-orgate" ,TYPE_OR_IRQ );object_property_set_int (OBJECT (uart_orgate),"num-lines" ,2 , &error_fatal); -qdev_realize_and_unref (uart_orgate,NULL , &error_fatal); +qdev_realize (uart_orgate,NULL , &error_fatal);qdev_connect_gpio_out (uart_orgate,0 ,qdev_get_gpio_in (pic,MP_UART_SHARED_IRQ ));
@@ -1287,28 +1289,31 @@ static void musicpal_init(MachineState *machine)2 ,0x00BF ,0x236D ,0x0000 ,0x0000 , 0x5555, 0x2AAA, 0); } -sysbus_create_simple_orphan (TYPE_MV88W8618_FLASHCFG ,MP_FLASHCFG_BASE ,NULL ); +sysbus_create_simple (OBJECT (machine),"flashcfg" , +TYPE_MV88W8618_FLASHCFG ,MP_FLASHCFG_BASE ,NULL ); - dev =qdev_new_orphan (TYPE_MV88W8618_ETH ); + dev =qdev_new (OBJECT (machine),"eth" ,TYPE_MV88W8618_ETH );qemu_configure_nic_device (dev, true,"mv88w8618" );object_property_set_link (OBJECT (dev),"dma-memory" ,OBJECT (get_system_memory ()), &error_fatal); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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 ,qdev_get_gpio_in (pic,MP_ETH_IRQ )); -sysbus_create_simple_orphan ("mv88w8618_wlan" ,MP_WLAN_BASE ,NULL ); +sysbus_create_simple (OBJECT (machine),"wlan" ,"mv88w8618_wlan" ,MP_WLAN_BASE ,NULL ); -sysbus_create_simple_orphan (TYPE_MUSICPAL_MISC ,MP_MISC_BASE ,NULL ); +sysbus_create_simple (OBJECT (machine),"misc" ,TYPE_MUSICPAL_MISC ,MP_MISC_BASE ,NULL ); - dev =sysbus_create_simple_orphan (TYPE_MUSICPAL_GPIO ,MP_GPIO_BASE , + dev =sysbus_create_simple (OBJECT (machine),"gpio" , +TYPE_MUSICPAL_GPIO ,MP_GPIO_BASE ,qdev_get_gpio_in (pic,MP_GPIO_IRQ )); - i2c_dev =sysbus_create_simple_orphan (TYPE_GPIO_I2C ,-1 ,NULL ); + i2c_dev =sysbus_create_simple (OBJECT (machine),"i2c" ,TYPE_GPIO_I2C ,-1 ,NULL ); i2c = (I2CBus *)qdev_get_child_bus (i2c_dev,"i2c" ); - lcd_dev =sysbus_create_simple_orphan (TYPE_MUSICPAL_LCD ,MP_LCD_BASE ,NULL ); - key_dev =sysbus_create_simple_orphan (TYPE_MUSICPAL_KEY ,-1 ,NULL ); + lcd_dev =sysbus_create_simple (OBJECT (machine),"lcd" , +TYPE_MUSICPAL_LCD ,MP_LCD_BASE ,NULL ); + key_dev =sysbus_create_simple (OBJECT (machine),"keys" ,TYPE_MUSICPAL_KEY ,-1 ,NULL );/* I2C read data */ qdev_connect_gpio_out(i2c_dev, 0,
@@ -1328,17 +1333,17 @@ static void musicpal_init(MachineState *machine)qdev_connect_gpio_out (key_dev, i,qdev_get_gpio_in (dev, i +15 )); } - wm8750_dev =i2c_slave_new_orphan (TYPE_WM8750 ,MP_WM_ADDR ); + wm8750_dev =i2c_slave_new (OBJECT (machine),"wm8750" ,TYPE_WM8750 ,MP_WM_ADDR );if (machine->audiodev) {qdev_prop_set_string (DEVICE (wm8750_dev),"audiodev" , machine->audiodev); } -i2c_slave_realize_and_unref (wm8750_dev, i2c, &error_abort); +qdev_realize (DEVICE (wm8750_dev),BUS (i2c), &error_abort); - dev =qdev_new_orphan (TYPE_MV88W8618_AUDIO ); + dev =qdev_new (OBJECT (machine),"audio" ,TYPE_MV88W8618_AUDIO ); s =SYS_BUS_DEVICE (dev);object_property_set_link (OBJECT (dev),"wm8750" ,OBJECT (wm8750_dev),NULL ); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);sysbus_mmio_map (s,0 ,MP_AUDIO_BASE );sysbus_connect_irq (s,0 ,qdev_get_gpio_in (pic,MP_AUDIO_IRQ ));
hw/arm/stellaris.c +30 -38
178 lines not on this page · raw message
Signature · 1 line
2.47.1
RFC PATCH 64/134 hw/arm/exynos: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in the hw/arm exynos board files to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing SoC device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/arm/exynos4210.c:522 | qdev_new | parent (threaded) | "pl330[*]" | pl330_create() static helper: added Object *parent as first arg, threaded from exynos4210_realize() with OBJECT(s). Paired sysbus_realize_and_unref -> sysbus_realize. hw/arm/exynos4210.c:603 | sysbus_create_simple | OBJECT(s) | "l2x0" | SoC realize(); s = Exynos4210State being realized. hw/arm/exynos4210.c:670 | sysbus_create_simple | OBJECT(s) | "pmu" | SoC realize(); single instance. hw/arm/exynos4210.c:672 | sysbus_create_simple | OBJECT(s) | "clk" | SoC realize(); single instance. hw/arm/exynos4210.c:673 | sysbus_create_simple | OBJECT(s) | "rng" | SoC realize(); single instance. hw/arm/exynos4210.c:676 | sysbus_create_varargs | OBJECT(s) | "pwm" | SoC realize(); single instance. hw/arm/exynos4210.c:684 | sysbus_create_varargs | OBJECT(s) | "rtc" | SoC realize(); single instance. hw/arm/exynos4210.c:690 | qdev_new | OBJECT(s) | "mct" | SoC realize(); paired sysbus_realize_and_unref -> sysbus_realize. hw/arm/exynos4210.c:716 | qdev_new | OBJECT(s) | "i2c[*]" | SoC realize(); loop over EXYNOS4210_I2C_NUMBER, auto-index. Paired sysbus_realize_and_unref -> sysbus_realize. hw/arm/exynos4210.c:760 | qdev_new | OBJECT(s) | "sdhci[*]" | SoC realize(); loop over EXYNOS4210_SDHCI_NUMBER. Paired sysbus_realize_and_unref -> sysbus_realize. hw/arm/exynos4210.c:770 | qdev_new | OBJECT(s) | "sd-card[*]" | SoC realize(); SD cards owned by SoC (bus is not parent). Paired qdev_realize_and_unref -> qdev_realize. hw/arm/exynos4210.c:777 | qdev_new | OBJECT(s) | "fimd" | SoC realize(); single instance. Paired sysbus_realize_and_unref -> sysbus_realize. hw/arm/exynos4210.c:787 | sysbus_create_simple | OBJECT(s) | "ehci" | SoC realize(); single instance.
--- hw/arm/exynos4210.c | 60 +++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 26 deletions(-)
hw/arm/exynos4210.c +34 -26
@@ -512,14 +512,15 @@ static uint64_t exynos4210_calc_affinity(int cpu)return (0x9 <<ARM_AFF1_SHIFT ) | cpu; } -static DeviceState *pl330_create (uint32_t base,OrIRQState *orgate, -qemu_irq irq,int nreq,int nevents,int width) +static DeviceState *pl330_create (Object *parent,uint32_t base, +OrIRQState *orgate,qemu_irq irq, +int nreq,int nevents,int width) {SysBusDevice *busdev;DeviceState *dev;int i; - dev =qdev_new_orphan ("pl330" ); + dev =qdev_new (parent,"pl330[*]" ,"pl330" );object_property_set_link (OBJECT (dev),"memory" ,OBJECT (get_system_memory ()), &error_fatal);
@@ -534,7 +535,7 @@ static DeviceState *pl330_create(uint32_t base, OrIRQState *orgate,qdev_prop_set_uint8 (dev,"data_width" , width);qdev_prop_set_uint16 (dev,"data_buffer_dep" , width); busdev =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_realize (busdev, &error_fatal);sysbus_mmio_map (busdev,0 , base); object_property_set_int(OBJECT(orgate), "num-lines", nevents + 1,
@@ -600,7 +601,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) }/* Cache controller */ -sysbus_create_simple_orphan ("l2x0" ,EXYNOS4210_L2X0_BASE_ADDR ,NULL ); +sysbus_create_simple (OBJECT (s),"l2x0" ,"l2x0" , +EXYNOS4210_L2X0_BASE_ADDR ,NULL );/* External GIC */ qdev_prop_set_uint32 (DEVICE (&s->ext_gic),"num-cpu" ,EXYNOS4210_NCPUS );
@@ -667,13 +669,17 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp)* The only reason of existence at the moment is that secondary CPU boot * loader uses PMU INFORM5 register as a holding pen. */ -sysbus_create_simple_orphan ("exynos4210.pmu" ,EXYNOS4210_PMU_BASE_ADDR ,NULL ); +sysbus_create_simple (OBJECT (s),"pmu" ,"exynos4210.pmu" , +EXYNOS4210_PMU_BASE_ADDR ,NULL ); -sysbus_create_simple_orphan ("exynos4210.clk" ,EXYNOS4210_CLK_BASE_ADDR ,NULL ); -sysbus_create_simple_orphan ("exynos4210.rng" ,EXYNOS4210_RNG_BASE_ADDR ,NULL ); +sysbus_create_simple (OBJECT (s),"clk" ,"exynos4210.clk" , +EXYNOS4210_CLK_BASE_ADDR ,NULL ); +sysbus_create_simple (OBJECT (s),"rng" ,"exynos4210.rng" , +EXYNOS4210_RNG_BASE_ADDR ,NULL );/* PWM */ - sysbus_create_varargs_orphan("exynos4210.pwm", EXYNOS4210_PWM_BASE_ADDR, + sysbus_create_varargs(OBJECT(s), "pwm", "exynos4210.pwm", + EXYNOS4210_PWM_BASE_ADDR, s->irq_table[exynos4210_get_irq(22, 0)], s->irq_table[exynos4210_get_irq(22, 1)], s->irq_table[exynos4210_get_irq(22, 2)],
@@ -681,15 +687,16 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) s->irq_table[exynos4210_get_irq (22 ,4 )], NULL);/* RTC */ -sysbus_create_varargs_orphan ("exynos4210.rtc" ,EXYNOS4210_RTC_BASE_ADDR , +sysbus_create_varargs (OBJECT (s),"rtc" ,"exynos4210.rtc" , +EXYNOS4210_RTC_BASE_ADDR , s->irq_table[exynos4210_get_irq (23 ,0 )], s->irq_table[exynos4210_get_irq (23 ,1 )],NULL );/* Multi Core Timer */ - dev =qdev_new_orphan ("exynos4210.mct" ); + dev =qdev_new (OBJECT (s),"mct" ,"exynos4210.mct" ); busdev =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_realize (busdev, &error_fatal);for (n =0 ; n <4 ; n++) {/* Connect global timer interrupts to Combiner gpio_in */ sysbus_connect_irq(busdev, n,
@@ -713,9 +720,9 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) i2c_irq = s->irq_table[exynos4210_get_irq (EXYNOS4210_HDMI_INTG ,1 )]; } - dev =qdev_new_orphan ("exynos4210.i2c" ); + dev =qdev_new (OBJECT (s),"i2c[*]" ,"exynos4210.i2c" ); busdev =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_realize (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" );
@@ -757,46 +764,47 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp)* public datasheet which is very similar (implementing * MMC Specification Version 4.0 being the only difference noted) */ - dev =qdev_new_orphan (TYPE_S3C_SDHCI ); + dev =qdev_new (OBJECT (s),"sdhci[*]" ,TYPE_S3C_SDHCI );qdev_prop_set_uint64 (dev,"capareg" ,EXYNOS4210_SDHCI_CAPABILITIES ); busdev =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_realize (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)]); di =drive_get (IF_SD ,0 , n); blk = di ?blk_by_legacy_dinfo (di) :NULL ; - carddev =qdev_new_orphan (TYPE_SD_CARD ); + carddev =qdev_new (OBJECT (s),"sd-card[*]" ,TYPE_SD_CARD );qdev_prop_set_drive (carddev,"drive" , blk); -qdev_realize_and_unref (carddev,qdev_get_child_bus (dev,"sd-bus" ), - &error_fatal); +qdev_realize (carddev,qdev_get_child_bus (dev,"sd-bus" ), + &error_fatal); }/*** Display controller (FIMD) ***/ - dev =qdev_new_orphan ("exynos4210.fimd" ); + dev =qdev_new (OBJECT (s),"fimd" ,"exynos4210.fimd" );object_property_set_link (OBJECT (dev),"framebuffer-memory" ,OBJECT (system_mem), &error_fatal); busdev =SYS_BUS_DEVICE (dev); -sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_realize (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,EXYNOS4210_FIMD0_BASE_ADDR );for (n =0 ; n <3 ; n++) {sysbus_connect_irq (busdev, n, s->irq_table[exynos4210_get_irq (11 , n)]); } -sysbus_create_simple_orphan (TYPE_EXYNOS4210_EHCI ,EXYNOS4210_EHCI_BASE_ADDR , - s->irq_table[exynos4210_get_irq (28 ,3 )]); +sysbus_create_simple (OBJECT (s),"ehci" ,TYPE_EXYNOS4210_EHCI , +EXYNOS4210_EHCI_BASE_ADDR , + s->irq_table[exynos4210_get_irq (28 ,3 )]);/*** DMA controllers ***/ - pl330[0 ] =pl330_create (EXYNOS4210_PL330_BASE0_ADDR , + pl330[0 ] =pl330_create (OBJECT (s),EXYNOS4210_PL330_BASE0_ADDR , &s->pl330_irq_orgate[0 ], s->irq_table[exynos4210_get_irq (21 ,0 )],32 ,32 ,32 ); - pl330[1 ] =pl330_create (EXYNOS4210_PL330_BASE1_ADDR , + pl330[1 ] =pl330_create (OBJECT (s),EXYNOS4210_PL330_BASE1_ADDR , &s->pl330_irq_orgate[1 ], s->irq_table[exynos4210_get_irq (21 ,1 )],32 ,32 ,32 ); - pl330[2 ] =pl330_create (EXYNOS4210_PL330_BASE2_ADDR , + pl330[2 ] =pl330_create (OBJECT (s),EXYNOS4210_PL330_BASE2_ADDR , &s->pl330_irq_orgate[2 ], s->irq_table[exynos4210_get_irq (20 ,1 )],1 ,31 ,64 );
Signature · 1 line
2.47.1
RFC PATCH 65/134 hw/arm/allwinner: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in the hw/arm allwinner board files to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing SoC device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/arm/allwinner-h3.c:382 | sysbus_create_simple | OBJECT(s) | "ehci[*]" | allwinner_h3_realize() SoC realize; 4 instances, auto-index. hw/arm/allwinner-h3.c:385 | sysbus_create_simple | OBJECT(s) | "ehci[*]" | SoC realize; auto-index. hw/arm/allwinner-h3.c:388 | sysbus_create_simple | OBJECT(s) | "ehci[*]" | SoC realize; auto-index. hw/arm/allwinner-h3.c:391 | sysbus_create_simple | OBJECT(s) | "ehci[*]" | SoC realize; auto-index. hw/arm/allwinner-h3.c:395 | sysbus_create_simple | OBJECT(s) | "ohci[*]" | SoC realize; 4 instances, auto-index. hw/arm/allwinner-h3.c:398 | sysbus_create_simple | OBJECT(s) | "ohci[*]" | SoC realize; auto-index. hw/arm/allwinner-h3.c:401 | sysbus_create_simple | OBJECT(s) | "ohci[*]" | SoC realize; auto-index. hw/arm/allwinner-h3.c:404 | sysbus_create_simple | OBJECT(s) | "ohci[*]" | SoC realize; auto-index.
hw/arm/bananapi_m2u.c:53 | qdev_new | OBJECT(s) | "sd-card[*]" | mmc_attach_drive() helper receives AwR40State *s (SoC, itself child of machine); use it as parent. Multiple units -> auto-index. Paired qdev_realize_and_unref -> qdev_realize. hw/arm/bananapi_m2u.c:117 | i2c_slave_create_simple | OBJECT(machine) | "axp221" | Board init(); PMU is board-level peripheral on i2c bus.hw/arm/cubieboard.c:84 | i2c_slave_create_simple | OBJECT(machine) | "axp209" | Board init(); PMU is board-level peripheral.hw/arm/cubieboard.c:92 | qdev_new | OBJECT(machine) | "sd-card" | Board init(); single SD card. Paired qdev_realize_and_unref -> qdev_realize.hw/arm/orangepi.c:88 | qdev_new | OBJECT(machine) | "sd-card" | Board init(); single SD card. Paired qdev_realize_and_unref -> qdev_realize.
--- hw/arm/allwinner-h3.c | 24 ++++++++++++++++-------- hw/arm/bananapi_m2u.c | 6 +++--- hw/arm/cubieboard.c | 6 +++--- hw/arm/orangepi.c | 4 ++-- 4 files changed, 24 insertions(+), 16 deletions(-)
hw/arm/allwinner-h3.c +16 -8
@@ -379,29 +379,37 @@ static void allwinner_h3_realize(DeviceState *dev, Error **errp) qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_EMAC));/* Universal Serial Bus */ -sysbus_create_simple_orphan (TYPE_AW_H3_EHCI , s->memmap[AW_H3_DEV_EHCI0 ], +sysbus_create_simple (OBJECT (s),"ehci[*]" ,TYPE_AW_H3_EHCI , + s->memmap[AW_H3_DEV_EHCI0 ],qdev_get_gpio_in (DEVICE (&s->gic),AW_H3_GIC_SPI_EHCI0 )); -sysbus_create_simple_orphan (TYPE_AW_H3_EHCI , s->memmap[AW_H3_DEV_EHCI1 ], +sysbus_create_simple (OBJECT (s),"ehci[*]" ,TYPE_AW_H3_EHCI , + s->memmap[AW_H3_DEV_EHCI1 ],qdev_get_gpio_in (DEVICE (&s->gic),AW_H3_GIC_SPI_EHCI1 )); -sysbus_create_simple_orphan (TYPE_AW_H3_EHCI , s->memmap[AW_H3_DEV_EHCI2 ], +sysbus_create_simple (OBJECT (s),"ehci[*]" ,TYPE_AW_H3_EHCI , + s->memmap[AW_H3_DEV_EHCI2 ],qdev_get_gpio_in (DEVICE (&s->gic),AW_H3_GIC_SPI_EHCI2 )); -sysbus_create_simple_orphan (TYPE_AW_H3_EHCI , s->memmap[AW_H3_DEV_EHCI3 ], +sysbus_create_simple (OBJECT (s),"ehci[*]" ,TYPE_AW_H3_EHCI , + s->memmap[AW_H3_DEV_EHCI3 ],qdev_get_gpio_in (DEVICE (&s->gic),AW_H3_GIC_SPI_EHCI3 )); -sysbus_create_simple_orphan ("sysbus-ohci" , s->memmap[AW_H3_DEV_OHCI0 ], +sysbus_create_simple (OBJECT (s),"ohci[*]" ,"sysbus-ohci" , + s->memmap[AW_H3_DEV_OHCI0 ],qdev_get_gpio_in (DEVICE (&s->gic),AW_H3_GIC_SPI_OHCI0 )); -sysbus_create_simple_orphan ("sysbus-ohci" , s->memmap[AW_H3_DEV_OHCI1 ], +sysbus_create_simple (OBJECT (s),"ohci[*]" ,"sysbus-ohci" , + s->memmap[AW_H3_DEV_OHCI1 ],qdev_get_gpio_in (DEVICE (&s->gic),AW_H3_GIC_SPI_OHCI1 )); -sysbus_create_simple_orphan ("sysbus-ohci" , s->memmap[AW_H3_DEV_OHCI2 ], +sysbus_create_simple (OBJECT (s),"ohci[*]" ,"sysbus-ohci" , + s->memmap[AW_H3_DEV_OHCI2 ],qdev_get_gpio_in (DEVICE (&s->gic),AW_H3_GIC_SPI_OHCI2 )); -sysbus_create_simple_orphan ("sysbus-ohci" , s->memmap[AW_H3_DEV_OHCI3 ], +sysbus_create_simple (OBJECT (s),"ohci[*]" ,"sysbus-ohci" , + s->memmap[AW_H3_DEV_OHCI3 ],qdev_get_gpio_in (DEVICE (&s->gic),AW_H3_GIC_SPI_OHCI3 ));
hw/arm/bananapi_m2u.c +3 -3
@@ -50,9 +50,9 @@ static void mmc_attach_drive(AwR40State *s, AwSdHostState *mmc, int unit,exit (1 ); } - carddev =qdev_new_orphan (TYPE_SD_CARD ); + carddev =qdev_new (OBJECT (s),"sd-card[*]" ,TYPE_SD_CARD );qdev_prop_set_drive_err (carddev,"drive" , blk, &error_fatal); -qdev_realize_and_unref (carddev, bus, &error_fatal); +qdev_realize (carddev, bus, &error_fatal);if (load_bootroom && blk &&blk_is_available (blk)) {/* Use Boot ROM to copy data from SD card to SRAM */
@@ -114,7 +114,7 @@ static void bpim2u_init(MachineState *machine)/* Connect AXP221 */ i2c =I2C_BUS (qdev_get_child_bus (DEVICE (&r40->i2c0),"i2c" )); -i2c_slave_create_simple_orphan (i2c,"axp221_pmu" ,0x34 ); +i2c_slave_create_simple (OBJECT (machine),"axp221" , i2c,"axp221_pmu" ,0x34 );/* SDRAM */ memory_region_add_subregion(get_system_memory(),
hw/arm/cubieboard.c +3 -3
@@ -81,7 +81,7 @@ static void cubieboard_init(MachineState *machine)/* Connect AXP 209 */ i2c =I2C_BUS (qdev_get_child_bus (DEVICE (&a10->i2c0),"i2c" )); -i2c_slave_create_simple_orphan (i2c,"axp209_pmu" ,0x34 ); +i2c_slave_create_simple (OBJECT (machine),"axp209" , i2c,"axp209_pmu" ,0x34 );/* Retrieve SD bus */ di =drive_get (IF_SD ,0 ,0 );
@@ -89,9 +89,9 @@ static void cubieboard_init(MachineState *machine) bus =qdev_get_child_bus (DEVICE (a10),"sd-bus" );/* Plug in SD card */ - carddev =qdev_new_orphan (TYPE_SD_CARD ); + carddev =qdev_new (OBJECT (machine),"sd-card" ,TYPE_SD_CARD );qdev_prop_set_drive_err (carddev,"drive" , blk, &error_fatal); -qdev_realize_and_unref (carddev, bus, &error_fatal); +qdev_realize (carddev, bus, &error_fatal);memory_region_add_subregion (get_system_memory (),AW_A10_SDRAM_BASE , machine->ram);
hw/arm/orangepi.c +2 -2
@@ -85,9 +85,9 @@ static void orangepi_init(MachineState *machine) bus =qdev_get_child_bus (DEVICE (h3),"sd-bus" );/* Plug in SD card */ - carddev =qdev_new_orphan (TYPE_SD_CARD ); + carddev =qdev_new (OBJECT (machine),"sd-card" ,TYPE_SD_CARD );qdev_prop_set_drive_err (carddev,"drive" , blk, &error_fatal); -qdev_realize_and_unref (carddev, bus, &error_fatal); +qdev_realize (carddev, bus, &error_fatal);/* SDRAM */ memory_region_add_subregion(get_system_memory(), h3->memmap[AW_H3_DEV_SDRAM],
Signature · 1 line
2.47.1
RFC PATCH 66/134 hw/arm/strongarm: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in the hw/arm strongarm board files to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing SoC device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/arm/collie.c:67 | sysbus_create_simple | OBJECT(machine) | "scoop" | Board .init(MachineState *machine); single instance.hw/arm/strongarm.c:649 | qdev_new | parent (threaded) | "gpio" | strongarm_gpio_init() static helper: added Object *parent as first arg, threaded from sa1110_init(). Paired sysbus_realize_and_unref -> sysbus_realize.
hw/arm/strongarm.c:1623 | cpu_create | parent (threaded) | "cpu" | sa1110_init() has no parent-capable pointer; added Object *parent as first arg (prototype in strongarm.h updated), threaded from collie_init() with OBJECT(machine). hw/arm/strongarm.c:1625 | sysbus_create_varargs | parent | "pic" | sa1110_init(); single PIC. hw/arm/strongarm.c:1630 | sysbus_create_varargs | parent | "timer" | sa1110_init(); single timer. hw/arm/strongarm.c:1637 | sysbus_create_simple | parent | "rtc" | sa1110_init(); single RTC. hw/arm/strongarm.c:1642 | sysbus_create_varargs | parent | "ppc" | sa1110_init(); single PPC. hw/arm/strongarm.c:1645 | qdev_new | parent | "uart[*]" | sa1110_init(); loop over sa_serial[]. Paired sysbus_realize_and_unref -> sysbus_realize. hw/arm/strongarm.c:1654 | sysbus_create_varargs | parent | "ssp" | sa1110_init(); single SSP.
--- hw/arm/collie.c | 4 ++-- hw/arm/strongarm.c | 27 ++++++++++++++------------- hw/arm/strongarm.h | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-)
hw/arm/collie.c +2 -2
@@ -52,7 +52,7 @@ static void collie_init(MachineState *machine)exit (EXIT_FAILURE ); } - cms->sa1110 =sa1110_init (machine->cpu_type); + cms->sa1110 =sa1110_init (OBJECT (machine), machine->cpu_type);memory_region_add_subregion (get_system_memory (),SA_SDCS0 , machine->ram);
@@ -64,7 +64,7 @@ static void collie_init(MachineState *machine) FLASH_SECTOR_SIZE, 4, 0x00, 0x00, 0x00, 0x00, 0); } -sysbus_create_simple_orphan ("scoop" ,0x40800000 ,NULL ); +sysbus_create_simple (OBJECT (machine),"scoop" ,"scoop" ,0x40800000 ,NULL ); collie_binfo.board_id =0x208 ;arm_load_kernel (cms->sa1110->cpu, machine, &collie_binfo);
hw/arm/strongarm.c +14 -13
@@ -640,14 +640,14 @@ static const MemoryRegionOps strongarm_gpio_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static DeviceState *strongarm_gpio_init (hwaddr base, +static DeviceState *strongarm_gpio_init (Object *parent,hwaddr base,DeviceState *pic) {DeviceState *dev;int i; - dev =qdev_new_orphan (TYPE_STRONGARM_GPIO ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); + dev =qdev_new (parent,"gpio" ,TYPE_STRONGARM_GPIO ); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base);for (i =0 ; i <12 ; i++)
@@ -1608,7 +1608,7 @@ static const TypeInfo strongarm_ssp_info = { };/* Main CPU functions */ -StrongARMState *sa1110_init (const char *cpu_type) +StrongARMState *sa1110_init (Object *parent,const char *cpu_type) {StrongARMState *s;int i;
@@ -1620,38 +1620,39 @@ StrongARMState *sa1110_init(const char *cpu_type)exit (1 ); } - s->cpu =ARM_CPU (cpu_create_orphan (cpu_type)); + s->cpu =ARM_CPU (cpu_create (parent,"cpu" , cpu_type)); - s->pic =sysbus_create_varargs_orphan ("strongarm_pic" ,0x90050000 , + s->pic =sysbus_create_varargs (parent,"pic" ,"strongarm_pic" ,0x90050000 ,qdev_get_gpio_in (DEVICE (s->cpu),ARM_CPU_IRQ ),qdev_get_gpio_in (DEVICE (s->cpu),ARM_CPU_FIQ ),NULL ); -sysbus_create_varargs_orphan ("pxa25x-timer" ,0x90000000 , +sysbus_create_varargs (parent,"timer" ,"pxa25x-timer" ,0x90000000 ,qdev_get_gpio_in (s->pic,SA_PIC_OSTC0 ),qdev_get_gpio_in (s->pic,SA_PIC_OSTC1 ),qdev_get_gpio_in (s->pic,SA_PIC_OSTC2 ),qdev_get_gpio_in (s->pic,SA_PIC_OSTC3 ),NULL ); -sysbus_create_simple_orphan (TYPE_STRONGARM_RTC ,0x90010000 , +sysbus_create_simple (parent,"rtc" ,TYPE_STRONGARM_RTC ,0x90010000 ,qdev_get_gpio_in (s->pic,SA_PIC_RTC_ALARM )); - s->gpio =strongarm_gpio_init (0x90040000 , s->pic); + s->gpio =strongarm_gpio_init (parent,0x90040000 , s->pic); - s->ppc =sysbus_create_varargs_orphan (TYPE_STRONGARM_PPC ,0x90060000 ,NULL ); + s->ppc =sysbus_create_varargs (parent,"ppc" ,TYPE_STRONGARM_PPC , +0x90060000 ,NULL );for (i =0 ; sa_serial[i].io_base; i++) { -DeviceState *dev =qdev_new_orphan (TYPE_STRONGARM_UART ); +DeviceState *dev =qdev_new (parent,"uart[*]" ,TYPE_STRONGARM_UART );qdev_prop_set_chr (dev,"chardev" ,serial_hd (i)); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (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 ,qdev_get_gpio_in (s->pic, sa_serial[i].irq)); } - s->ssp =sysbus_create_varargs_orphan (TYPE_STRONGARM_SSP ,0x80070000 , + s->ssp =sysbus_create_varargs (parent,"ssp" ,TYPE_STRONGARM_SSP ,0x80070000 ,qdev_get_gpio_in (s->pic,SA_PIC_SSP ),NULL ); s->ssp_bus = (SSIBus *)qdev_get_child_bus (s->ssp,"ssi" );
hw/arm/strongarm.h +1 -1
@@ -62,6 +62,6 @@ typedef struct { SSIBus *ssp_bus; } StrongARMState; -StrongARMState *sa1110_init (const char *cpu_type); +StrongARMState *sa1110_init (Object *parent,const char *cpu_type);#endif
Signature · 1 line
2.47.1
RFC PATCH 67/134 hw/arm/omap: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in the hw/arm omap board files to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing SoC device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/arm/omap1.c:3752 | cpu_create | parent | "cpu" | omap310_mpu_init() already receives Object *parent; use it directly. hw/arm/omap1.c:3766 | qdev_new | parent | "intc[0]" | Two interrupt controllers, explicit index. Paired sysbus_realize_and_unref -> sysbus_realize. hw/arm/omap1.c:3776 | qdev_new | parent | "intc[1]" | Second intc. Paired sysbus_realize_and_unref -> sysbus_realize. hw/arm/omap1.c:3879 | qdev_new | parent | "mmc" | Single MMC. Paired sysbus_realize_and_unref -> sysbus_realize. hw/arm/omap1.c:3891 | qdev_new | parent | "sd-card" | Single SD card (bus is not parent). Paired qdev_realize_and_unref -> qdev_realize. hw/arm/omap1.c:3903 | qdev_new | parent | "gpio" | Single GPIO. Paired sysbus_realize_and_unref -> sysbus_realize. hw/arm/omap1.c:3920 | qdev_new | parent | "i2c" | Single i2c (only i2c[0] populated on omap1). Paired sysbus_realize_and_unref -> sysbus_realize.
--- hw/arm/omap1.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
hw/arm/omap1.c +14 -14
@@ -3749,7 +3749,7 @@ struct omap_mpu_state_s *omap310_mpu_init(Object *parent, MemoryRegion *dram,MemoryRegion *system_memory =get_system_memory ();/* Core */ - s->cpu =ARM_CPU (cpu_create_orphan (cpu_type)); + s->cpu =ARM_CPU (cpu_create (parent,"cpu" , cpu_type)); s->sdram_size =memory_region_size (dram); s->sram_size =OMAP15XX_SRAM_SIZE ;
@@ -3763,21 +3763,21 @@ struct omap_mpu_state_s *omap310_mpu_init(Object *parent, MemoryRegion *dram,omap_clkm_init (system_memory,0xfffece00 ,0xe1008000 , s); - s->ih[0 ] =qdev_new_orphan ("omap-intc" ); + s->ih[0 ] =qdev_new (parent,"intc[0]" ,"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" )); busdev =SYS_BUS_DEVICE (s->ih[0 ]); -sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_realize (busdev, &error_fatal);sysbus_connect_irq (busdev,0 ,qdev_get_gpio_in (DEVICE (s->cpu),ARM_CPU_IRQ ));sysbus_connect_irq (busdev,1 ,qdev_get_gpio_in (DEVICE (s->cpu),ARM_CPU_FIQ ));sysbus_mmio_map (busdev,0 ,0xfffecb00 ); - s->ih[1 ] =qdev_new_orphan ("omap-intc" ); + s->ih[1 ] =qdev_new (parent,"intc[1]" ,"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" )); busdev =SYS_BUS_DEVICE (s->ih[1 ]); -sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_realize (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 */
@@ -3876,8 +3876,8 @@ struct omap_mpu_state_s *omap310_mpu_init(Object *parent, MemoryRegion *dram,warn_report ("missing SecureDigital device" ); } - s->mmc =qdev_new_orphan (TYPE_OMAP_MMC ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (s->mmc), &error_fatal); + s->mmc =qdev_new (parent,"mmc" ,TYPE_OMAP_MMC ); +sysbus_realize (SYS_BUS_DEVICE (s->mmc), &error_fatal);omap_mmc_set_clk (s->mmc,omap_findclk (s,"mmc_ck" )); memory_region_add_subregion(system_memory, 0xfffb7800,
@@ -3888,11 +3888,11 @@ struct omap_mpu_state_s *omap310_mpu_init(Object *parent, MemoryRegion *dram, qdev_get_gpio_in(s->ih[1], OMAP_INT_OQN));if (dinfo) { -DeviceState *card =qdev_new_orphan (TYPE_SD_CARD ); +DeviceState *card =qdev_new (parent,"sd-card" ,TYPE_SD_CARD );qdev_prop_set_drive_err (card,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); -qdev_realize_and_unref (card,qdev_get_child_bus (s->mmc,"sd-bus" ), - &error_fatal); +qdev_realize (card,qdev_get_child_bus (s->mmc,"sd-bus" ), + &error_fatal); } s->mpuio = omap_mpuio_init(system_memory, 0xfffb5000,
@@ -3900,9 +3900,9 @@ struct omap_mpu_state_s *omap310_mpu_init(Object *parent, MemoryRegion *dram,qdev_get_gpio_in (s->ih[1 ],OMAP_INT_MPUIO ), omap_findclk(s, "clk32-kHz")); - s->gpio =qdev_new_orphan ("omap-gpio" ); + s->gpio =qdev_new (parent,"gpio" ,"omap-gpio" );omap_gpio_set_clk (OMAP1_GPIO (s->gpio),omap_findclk (s,"arm_gpio_ck" )); -sysbus_realize_and_unref (SYS_BUS_DEVICE (s->gpio), &error_fatal); +sysbus_realize (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 );
@@ -3917,11 +3917,11 @@ struct omap_mpu_state_s *omap310_mpu_init(Object *parent, MemoryRegion *dram, s->pwt =omap_pwt_init (system_memory,0xfffb6000 ,omap_findclk (s,"armxor_ck" )); - s->i2c[0 ] =qdev_new_orphan ("omap_i2c" ); + s->i2c[0 ] =qdev_new (parent,"i2c" ,"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" )); busdev =SYS_BUS_DEVICE (s->i2c[0 ]); -sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_realize (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 ]);
Signature · 1 line
2.47.1
RFC PATCH 68/134 hw/arm/mps2: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in the hw/arm mps2 board files to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing SoC device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/arm/mps2.c:302 | qdev_new_orphan | OBJECT(mms) | "uart[*]" | board init (mps2_common_init), MPS2MachineState *mms is machine; indexed loop; drop _and_unref hw/arm/mps2.c:346 | qdev_new_orphan | OBJECT(mms) | "uart[*]" | board init, second FPGA variant loop; auto-index; drop _and_unref hw/arm/mps2.c:419 | sysbus_create_simple_orphan | OBJECT(mms) | "spi[*]" | board init; PL022 external ADC; auto-index shared with loop below hw/arm/mps2.c:438 | sysbus_create_simple_orphan | OBJECT(mms) | "spi[*]" | board init; PL022 in nested loop; auto-index hw/arm/mps2.c:449 | sysbus_create_simple_orphan | OBJECT(mms) | "i2c[*]" | board init; SBCON I2C in loop; auto-index hw/arm/mps2-tz.c:511 | qdev_new_orphan | OBJECT(mms) | "lan9118" | make_eth_dev helper receives MPS2TZMachineState *mms (board state); single instance; drop _and_unref hw/arm/mps2-tz.c:538 | qdev_new_orphan | OBJECT(mms) | "lan9118" | make_eth_usb helper receives mms; single instance (mutually exclusive with make_eth_dev per board); drop _and_unref
--- hw/arm/mps2-tz.c | 8 ++++---- hw/arm/mps2.c | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 12 deletions(-)
hw/arm/mps2-tz.c +4 -4
@@ -508,11 +508,11 @@ static MemoryRegion *make_eth_dev(MPS2TZMachineState *mms, void *opaque,/* In hardware this is a LAN9220; the LAN9118 is software compatible * except that it doesn't support the checksum-offload feature. */ - mms->lan9118 =qdev_new_orphan (TYPE_LAN9118 ); + mms->lan9118 =qdev_new (OBJECT (mms),"lan9118" ,TYPE_LAN9118 );qemu_configure_nic_device (mms->lan9118, true,NULL ); s =SYS_BUS_DEVICE (mms->lan9118); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);sysbus_connect_irq (s,0 ,get_sse_irq_in (mms, irqs[0 ]));return sysbus_mmio_get_region (s,0 ); }
@@ -535,11 +535,11 @@ static MemoryRegion *make_eth_usb(MPS2TZMachineState *mms, void *opaque,* In hardware this is a LAN9220; the LAN9118 is software compatible * except that it doesn't support the checksum-offload feature. */ - mms->lan9118 =qdev_new_orphan (TYPE_LAN9118 ); + mms->lan9118 =qdev_new (OBJECT (mms),"lan9118" ,TYPE_LAN9118 );qemu_configure_nic_device (mms->lan9118, true,NULL ); s =SYS_BUS_DEVICE (mms->lan9118); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);sysbus_connect_irq (s,0 ,get_sse_irq_in (mms, irqs[0 ])); memory_region_add_subregion(&mms->eth_usb_container,
hw/arm/mps2.c +10 -8
@@ -299,11 +299,11 @@ static void mps2_common_init(MachineState *machine) rxovrint =qdev_get_gpio_in (orgate_dev, i *2 +1 ); } - dev =qdev_new_orphan (TYPE_CMSDK_APB_UART ); + dev =qdev_new (OBJECT (mms),"uart[*]" ,TYPE_CMSDK_APB_UART ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" ,serial_hd (i));qdev_prop_set_uint32 (dev,"pclk-frq" ,SYSCLK_FRQ ); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);sysbus_mmio_map (s,0 , uartbase[i]);sysbus_connect_irq (s,0 ,qdev_get_gpio_in (armv7m, uartirq[i] +1 ));sysbus_connect_irq (s,1 ,qdev_get_gpio_in (armv7m, uartirq[i]));
@@ -343,11 +343,11 @@ static void mps2_common_init(MachineState *machine)qdev_connect_gpio_out (txrx_orgate_dev,0 ,qdev_get_gpio_in (armv7m, uart_txrx_irqno[i])); - dev =qdev_new_orphan (TYPE_CMSDK_APB_UART ); + dev =qdev_new (OBJECT (mms),"uart[*]" ,TYPE_CMSDK_APB_UART ); s =SYS_BUS_DEVICE (dev);qdev_prop_set_chr (dev,"chardev" ,serial_hd (i));qdev_prop_set_uint32 (dev,"pclk-frq" ,SYSCLK_FRQ ); -sysbus_realize_and_unref (s, &error_fatal); +sysbus_realize (s, &error_fatal);sysbus_mmio_map (s,0 , uartbase[i]);sysbus_connect_irq (s,0 ,qdev_get_gpio_in (txrx_orgate_dev,0 ));sysbus_connect_irq (s,1 ,qdev_get_gpio_in (txrx_orgate_dev,1 ));
@@ -416,8 +416,8 @@ static void mps2_common_init(MachineState *machine)qdev_prop_set_uint32 (DEVICE (&mms->fpgaio),"prescale-clk" ,25000000 );sysbus_realize (SYS_BUS_DEVICE (&mms->fpgaio), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (&mms->fpgaio),0 ,0x40028000 ); -sysbus_create_simple_orphan (TYPE_PL022 ,0x40025000 ,/* External ADC */ -qdev_get_gpio_in (armv7m,22 )); +sysbus_create_simple (OBJECT (mms),"spi[*]" ,TYPE_PL022 ,0x40025000 , +qdev_get_gpio_in (armv7m,22 ));/* External ADC */ for (i =0 ; i <2 ; i++) {static const int spi_irqno[] = {11 ,24 };static const hwaddr spibase[] = {0x40020000 ,/* APB */
@@ -435,7 +435,8 @@ static void mps2_common_init(MachineState *machine)qdev_connect_gpio_out (orgate_dev,0 ,qdev_get_gpio_in (armv7m, spi_irqno[i]));for (j =0 ; j <2 ; j++) { -sysbus_create_simple_orphan (TYPE_PL022 , spibase[2 * i + j], +sysbus_create_simple (OBJECT (mms),"spi[*]" ,TYPE_PL022 , + spibase[2 * i + j],qdev_get_gpio_in (orgate_dev, j)); } }
@@ -446,7 +447,8 @@ static void mps2_common_init(MachineState *machine) 0x4002a000}; /* Shield1 */DeviceState *dev; - dev =sysbus_create_simple_orphan (TYPE_ARM_SBCON_I2C , i2cbase[i],NULL ); + dev =sysbus_create_simple (OBJECT (mms),"i2c[*]" , +TYPE_ARM_SBCON_I2C , i2cbase[i],NULL );if (i <2 ) {/* * internal-only bus: mark it full to avoid user-created
Signature · 1 line
2.47.1
RFC PATCH 69/134 hw/arm/imx: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in the hw/arm imx board files to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing SoC device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/arm/fsl-imx6.c:171 | sysbus_create_simple_orphan | OBJECT(dev) | "l2x0" | SoC DeviceClass.realize(DeviceState *dev); parent is the SoC device being realized; single instance hw/arm/imx25_pdk.c:130 | qdev_new_orphan | OBJECT(machine) | "sd-card[*]" | board init(MachineState *machine); loop over ESDHC slots; auto-index; drop _and_unref
hw/arm/imx8mm-evk.c:100 | qdev_new_orphan | OBJECT(machine) | "sd-card[*]" | board init; loop over USDHC slots; auto-index; drop _and_unref hw/arm/imx8mp-evk.c:113 | qdev_new_orphan | OBJECT(machine) | "sd-card[*]" | board init; loop over USDHC slots; auto-index; drop _and_unref
hw/arm/mcimx6ul-evk.c:62 | qdev_new_orphan | OBJECT(machine) | "sd-card[*]" | board init; loop over USDHC slots; auto-index; drop _and_unref hw/arm/mcimx7d-sabre.c:62 | qdev_new_orphan | OBJECT(machine) | "sd-card[*]" | board init; loop over USDHC slots; auto-index; drop _and_unref hw/arm/sabrelite.c:99 | qdev_new_orphan | OBJECT(machine) | "spi-flash" | board init; single NOR flash on SPI bus; drop _and_unref
--- hw/arm/fsl-imx6.c | 3 ++- hw/arm/imx25_pdk.c | 4 ++-- hw/arm/imx8mm-evk.c | 4 ++-- hw/arm/imx8mp-evk.c | 4 ++-- hw/arm/mcimx6ul-evk.c | 4 ++-- hw/arm/mcimx7d-sabre.c | 4 ++-- hw/arm/sabrelite.c | 5 +++-- 7 files changed, 15 insertions(+), 13 deletions(-)
hw/arm/fsl-imx6.c +2 -1
@@ -168,7 +168,8 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) }/* L2 cache controller */ -sysbus_create_simple_orphan ("l2x0" ,FSL_IMX6_PL310_ADDR ,NULL ); +sysbus_create_simple (OBJECT (dev),"l2x0" ,"l2x0" ,FSL_IMX6_PL310_ADDR , +NULL );if (!sysbus_realize (SYS_BUS_DEVICE (&s->ccm), errp)) {return ;
hw/arm/imx25_pdk.c +2 -2
@@ -127,9 +127,9 @@ static void imx25_pdk_init(MachineState *machine) di =drive_get (IF_SD ,0 , i); blk = di ?blk_by_legacy_dinfo (di) :NULL ; bus =qdev_get_child_bus (DEVICE (&s->soc.esdhc[i]),"sd-bus" ); - carddev =qdev_new_orphan (TYPE_SD_CARD ); + carddev =qdev_new (OBJECT (machine),"sd-card[*]" ,TYPE_SD_CARD );qdev_prop_set_drive_err (carddev,"drive" , blk, &error_fatal); -qdev_realize_and_unref (carddev, bus, &error_fatal); +qdev_realize (carddev, bus, &error_fatal); }/*
hw/arm/imx8mm-evk.c +2 -2
@@ -97,9 +97,9 @@ static void imx8mm_evk_init(MachineState *machine) blk =blk_by_legacy_dinfo (di); bus =qdev_get_child_bus (DEVICE (&s->usdhc[i]),"sd-bus" ); - carddev =qdev_new_orphan (TYPE_SD_CARD ); + carddev =qdev_new (OBJECT (machine),"sd-card[*]" ,TYPE_SD_CARD );qdev_prop_set_drive_err (carddev,"drive" , blk, &error_fatal); -qdev_realize_and_unref (carddev, bus, &error_fatal); +qdev_realize (carddev, bus, &error_fatal); }if (!qtest_enabled ()) {
hw/arm/imx8mp-evk.c +2 -2
@@ -110,9 +110,9 @@ static void imx8mp_evk_init(MachineState *machine) blk =blk_by_legacy_dinfo (di); bus =qdev_get_child_bus (DEVICE (&s->soc.usdhc[i]),"sd-bus" ); - carddev =qdev_new_orphan (TYPE_SD_CARD ); + carddev =qdev_new (OBJECT (machine),"sd-card[*]" ,TYPE_SD_CARD );qdev_prop_set_drive_err (carddev,"drive" , blk, &error_fatal); -qdev_realize_and_unref (carddev, bus, &error_fatal); +qdev_realize (carddev, bus, &error_fatal); }if (!qtest_enabled ()) {
hw/arm/mcimx6ul-evk.c +2 -2
@@ -59,9 +59,9 @@ static void mcimx6ul_evk_init(MachineState *machine) di =drive_get (IF_SD ,0 , i); blk = di ?blk_by_legacy_dinfo (di) :NULL ; bus =qdev_get_child_bus (DEVICE (&s->usdhc[i]),"sd-bus" ); - carddev =qdev_new_orphan (TYPE_SD_CARD ); + carddev =qdev_new (OBJECT (machine),"sd-card[*]" ,TYPE_SD_CARD );qdev_prop_set_drive_err (carddev,"drive" , blk, &error_fatal); -qdev_realize_and_unref (carddev, bus, &error_fatal); +qdev_realize (carddev, bus, &error_fatal); }if (!qtest_enabled ()) {
hw/arm/mcimx7d-sabre.c +2 -2
@@ -59,9 +59,9 @@ static void mcimx7d_sabre_init(MachineState *machine) di =drive_get (IF_SD ,0 , i); blk = di ?blk_by_legacy_dinfo (di) :NULL ; bus =qdev_get_child_bus (DEVICE (&s->usdhc[i]),"sd-bus" ); - carddev =qdev_new_orphan (TYPE_SD_CARD ); + carddev =qdev_new (OBJECT (machine),"sd-card[*]" ,TYPE_SD_CARD );qdev_prop_set_drive_err (carddev,"drive" , blk, &error_fatal); -qdev_realize_and_unref (carddev, bus, &error_fatal); +qdev_realize (carddev, bus, &error_fatal); }if (!qtest_enabled ()) {
hw/arm/sabrelite.c +3 -2
@@ -96,13 +96,14 @@ static void sabrelite_init(MachineState *machine)qemu_irq cs_line;DriveInfo *dinfo =drive_get (IF_MTD ,0 ,0 ); - flash_dev =qdev_new_orphan ("sst25vf016b" ); + flash_dev =qdev_new (OBJECT (machine),"spi-flash" , +"sst25vf016b" );if (dinfo) {qdev_prop_set_drive_err (flash_dev,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); } -qdev_realize_and_unref (flash_dev,BUS (spi_bus), &error_fatal); +qdev_realize (flash_dev,BUS (spi_bus), &error_fatal); cs_line =qdev_get_gpio_in_named (flash_dev,SSI_GPIO_CS ,0 );qdev_connect_gpio_out (DEVICE (&s->soc.gpio[2 ]),19 , cs_line);
Signature · 1 line
2.47.1
RFC PATCH 70/134 hw/arm/misc: Give onboard devices a QOM parent
In reply to Alexander GrafConvert the *_orphan() device-creation calls in the hw/arm misc board files to the new parented API introduced earlier in this series, so every onboard device gets a stable path in the composition tree instead of landing in /machine/unattached with an unstable device[N] name.
The parent for each device is the object that owns its lifetime: the machine for board-created devices, the containing SoC device for composite children. Names follow existing QOM conventions.
Per-site rationale (reviewers: dispute the modeling here):
hw/arm/max78000fthr.c:29 | qdev_new_orphan | OBJECT(machine) | "soc" | board init; existing add_child(machine,"soc") collapsed; drop _and_unref
hw/arm/msf2-som.c:62 | qdev_new_orphan | OBJECT(machine) | "soc" | board init; existing add_child(machine,"soc") collapsed; drop _and_unref hw/arm/msf2-som.c:86 | qdev_new_orphan | OBJECT(machine) | "spi-flash" | board init; single m25p80 flash on SPI bus; drop _and_unref
hw/arm/netduino2.c:47 | qdev_new_orphan | OBJECT(machine) | "soc" | board init; existing add_child(machine,"soc") collapsed; drop _and_unref hw/arm/netduinoplus2.c:47 | qdev_new_orphan | OBJECT(machine) | "soc" | board init; existing add_child(machine,"soc") collapsed; drop _and_unref hw/arm/olimex-stm32-h405.c:50 | qdev_new_orphan | OBJECT(machine) | "soc" | board init; existing add_child(machine,"soc") collapsed; drop _and_unref hw/arm/raspi.c:286 | qdev_new_orphan | OBJECT(machine) | "sd-card" | raspi_base_machine_init(MachineState *machine); single SD card; drop _and_unref hw/arm/stm32vldiscovery.c:50 | qdev_new_orphan | OBJECT(machine) | "soc" | board init; existing add_child(machine,"soc") collapsed; drop _and_unref
--- hw/arm/max78000fthr.c | 5 ++--- hw/arm/msf2-som.c | 10 +++++----- hw/arm/netduino2.c | 5 ++--- hw/arm/netduinoplus2.c | 5 ++--- hw/arm/olimex-stm32-h405.c | 5 ++--- hw/arm/raspi.c | 4 ++-- hw/arm/stm32vldiscovery.c | 5 ++--- 7 files changed, 17 insertions(+), 22 deletions(-)
hw/arm/max78000fthr.c +2 -3
@@ -26,10 +26,9 @@ static void max78000_init(MachineState *machine) sysclk =clock_new (OBJECT (machine),"SYSCLK" );clock_set_hz (sysclk,SYSCLK_FRQ ); - dev =qdev_new_orphan (TYPE_MAX78000_SOC ); -object_property_add_child (OBJECT (machine),"soc" ,OBJECT (dev)); + dev =qdev_new (OBJECT (machine),"soc" ,TYPE_MAX78000_SOC );qdev_connect_clock_in (dev,"sysclk" , sysclk); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename,
hw/arm/msf2-som.c +5 -5
@@ -59,8 +59,7 @@ static void emcraft_sf2_s2s010_init(MachineState *machine) &error_fatal);memory_region_add_subregion (sysmem,DDR_BASE_ADDRESS , ddr); - dev =qdev_new_orphan (TYPE_MSF2_SOC ); -object_property_add_child (OBJECT (machine),"soc" ,OBJECT (dev)); + dev =qdev_new (OBJECT (machine),"soc" ,TYPE_MSF2_SOC );qdev_prop_set_string (dev,"part-name" ,"M2S010" );qdev_prop_set_uint64 (dev,"eNVM-size" ,M2S010_ENVM_SIZE );qdev_prop_set_uint64 (dev,"eSRAM-size" ,M2S010_ESRAM_SIZE );
@@ -77,19 +76,20 @@ static void emcraft_sf2_s2s010_init(MachineState *machine)qdev_prop_set_uint32 (dev,"apb0div" ,2 );qdev_prop_set_uint32 (dev,"apb1div" ,2 ); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); soc =MSF2_SOC (dev);/* Attach SPI flash to SPI0 controller */ spi_bus =qdev_get_child_bus (dev,"spi0" ); - spi_flash =qdev_new_orphan ("s25sl12801" );/* Spansion S25FL128SDPBHICO */ +/* Spansion S25FL128SDPBHICO */ + spi_flash =qdev_new (OBJECT (machine),"spi-flash" ,"s25sl12801" );qdev_prop_set_uint8 (spi_flash,"spansion-cr2nv" ,0x8 );if (dinfo) {qdev_prop_set_drive_err (spi_flash,"drive" ,blk_by_legacy_dinfo (dinfo), &error_fatal); } -qdev_realize_and_unref (spi_flash, spi_bus, &error_fatal); +qdev_realize (spi_flash, spi_bus, &error_fatal); cs_line =qdev_get_gpio_in_named (spi_flash,SSI_GPIO_CS ,0 );sysbus_connect_irq (SYS_BUS_DEVICE (&soc->spi[0 ]),1 , cs_line);
hw/arm/netduino2.c +2 -3
@@ -44,10 +44,9 @@ static void netduino2_init(MachineState *machine) sysclk =clock_new (OBJECT (machine),"SYSCLK" );clock_set_hz (sysclk,SYSCLK_FRQ ); - dev =qdev_new_orphan (TYPE_STM32F205_SOC ); -object_property_add_child (OBJECT (machine),"soc" ,OBJECT (dev)); + dev =qdev_new (OBJECT (machine),"soc" ,TYPE_STM32F205_SOC );qdev_connect_clock_in (dev,"sysclk" , sysclk); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal);armv7m_load_kernel (STM32F205_SOC (dev)->armv7m.cpu, machine->kernel_filename,0 ,FLASH_SIZE );
hw/arm/netduinoplus2.c +2 -3
@@ -44,10 +44,9 @@ static void netduinoplus2_init(MachineState *machine) sysclk =clock_new (OBJECT (machine),"SYSCLK" );clock_set_hz (sysclk,SYSCLK_FRQ ); - dev =qdev_new_orphan (TYPE_STM32F405_SOC ); -object_property_add_child (OBJECT (machine),"soc" ,OBJECT (dev)); + dev =qdev_new (OBJECT (machine),"soc" ,TYPE_STM32F405_SOC );qdev_connect_clock_in (dev,"sysclk" , sysclk); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); armv7m_load_kernel(STM32F405_SOC(dev)->armv7m.cpu, machine->kernel_filename,
hw/arm/olimex-stm32-h405.c +2 -3
@@ -47,10 +47,9 @@ static void olimex_stm32_h405_init(MachineState *machine) sysclk =clock_new (OBJECT (machine),"SYSCLK" );clock_set_hz (sysclk,SYSCLK_FRQ ); - dev =qdev_new_orphan (TYPE_STM32F405_SOC ); -object_property_add_child (OBJECT (machine),"soc" ,OBJECT (dev)); + dev =qdev_new (OBJECT (machine),"soc" ,TYPE_STM32F405_SOC );qdev_connect_clock_in (dev,"sysclk" , sysclk); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); armv7m_load_kernel(STM32F405_SOC(dev)->armv7m.cpu, machine->kernel_filename,
hw/arm/raspi.c +2 -2
@@ -283,9 +283,9 @@ void raspi_base_machine_init(MachineState *machine,error_report ("No SD bus found in SOC object" );exit (1 ); } - carddev =qdev_new_orphan (TYPE_SD_CARD ); + carddev =qdev_new (OBJECT (machine),"sd-card" ,TYPE_SD_CARD );qdev_prop_set_drive_err (carddev,"drive" , blk, &error_fatal); -qdev_realize_and_unref (carddev, bus, &error_fatal); +qdev_realize (carddev, bus, &error_fatal); vcram_size =object_property_get_uint (OBJECT (soc),"vcram-size" , &error_abort);
hw/arm/stm32vldiscovery.c +2 -3
@@ -47,10 +47,9 @@ static void stm32vldiscovery_init(MachineState *machine) sysclk =clock_new (OBJECT (machine),"SYSCLK" );clock_set_hz (sysclk,SYSCLK_FRQ ); - dev =qdev_new_orphan (TYPE_STM32F100_SOC ); -object_property_add_child (OBJECT (machine),"soc" ,OBJECT (dev)); + dev =qdev_new (OBJECT (machine),"soc" ,TYPE_STM32F100_SOC );qdev_connect_clock_in (dev,"sysclk" , sysclk); -sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_realize (SYS_BUS_DEVICE (dev), &error_fatal); armv7m_load_kernel(STM32F100_SOC(dev)->armv7m.cpu, machine->kernel_filename,
Signature · 1 line
2.47.1