Convert the *_orphan() device-creation calls in hw/alpha 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): file:line | parent | name | rationale dp264.c:68 | OBJECT(machine) | "cpu[*]" | SMP CPUs created by board init() dp264.c:113 | OBJECT(machine) | "isa-bridge" | i82378 PCI-ISA bridge is a fixed onboard device; the machine owns it dp264.c:129 | OBJECT(machine) | "sio" | SMC37C669 Super-I/O is a fixed onboard device dp264.c:132 | OBJECT(machine) | "ide" | CMD646 IDE controller is a fixed onboard device typhoon.c:833 | OBJECT(machine) | "typhoon" | Typhoon PCI host bridge is a fixed chipset of the DP264 board; thread an Object *parent argument through typhoon_init() from clipper_init() Link: https://lore.kernel.org/qemu-devel/[email protected]/ AI-used-for: code (refactoring) Signed-off-by: Alexander Graf <[email protected]> --- hw/alpha/alpha_sys.h | 3 ++- hw/alpha/dp264.c | 12 +++++++----- hw/alpha/typhoon.c | 6 +++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/hw/alpha/alpha_sys.h b/hw/alpha/alpha_sys.h index 6e6691d116..f8aaf74933 100644 --- a/hw/alpha/alpha_sys.h +++ b/hw/alpha/alpha_sys.h @@ -9,7 +9,8 @@ #include "hw/intc/i8259.h" -PCIBus *typhoon_init(MemoryRegion *, qemu_irq *, qemu_irq *, AlphaCPU *[4], +PCIBus *typhoon_init(Object *parent, MemoryRegion *, + qemu_irq *, qemu_irq *, AlphaCPU *[4], pci_map_irq_fn, uint8_t devfn_min); /* alpha_pci.c. */ diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 512b270838..9cd448cff1 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -49,6 +49,7 @@ static void clipper_init(MachineState *machine) const char *kernel_cmdline = machine->kernel_cmdline; const char *initrd_filename = machine->initrd_filename; MachineClass *mc = MACHINE_GET_CLASS(machine); + Object *mo = OBJECT(machine); AlphaCPU *cpus[4]; PCIBus *pci_bus; PCIDevice *pci_dev; @@ -65,7 +66,7 @@ static void clipper_init(MachineState *machine) /* Create up to 4 cpus. */ memset(cpus, 0, sizeof(cpus)); for (i = 0; i < smp_cpus; ++i) { - cpus[i] = ALPHA_CPU(cpu_create_orphan(machine->cpu_type)); + cpus[i] = ALPHA_CPU(cpu_create(mo, "cpu[*]", machine->cpu_type)); } /* @@ -86,7 +87,7 @@ static void clipper_init(MachineState *machine) * Init the chipset. Because we're using CLIPPER IRQ mappings, * the minimum PCI device IdSel is 1. */ - pci_bus = typhoon_init(machine->ram, &isa_irq, &rtc_irq, cpus, + pci_bus = typhoon_init(mo, machine->ram, &isa_irq, &rtc_irq, cpus, clipper_pci_map_irq, PCI_DEVFN(1, 0)); /* @@ -110,7 +111,8 @@ static void clipper_init(MachineState *machine) * Importantly, we need to provide a PCI device node for it, otherwise * some operating systems won't notice there's an ISA bus to configure. */ - i82378_dev = DEVICE(pci_create_simple_orphan(pci_bus, PCI_DEVFN(7, 0), "i82378")); + i82378_dev = DEVICE(pci_create_simple(mo, "isa-bridge", pci_bus, + PCI_DEVFN(7, 0), "i82378")); isa_bus = ISA_BUS(qdev_get_child_bus(i82378_dev, "isa.0")); /* Connect the ISA PIC to the Typhoon IRQ used for ISA interrupts. */ @@ -126,10 +128,10 @@ static void clipper_init(MachineState *machine) pci_init_nic_devices(pci_bus, mc->default_nic); /* Super I/O */ - isa_create_simple_orphan(isa_bus, TYPE_SMC37C669_SUPERIO); + isa_create_simple(mo, "sio", isa_bus, TYPE_SMC37C669_SUPERIO); /* IDE disk setup. */ - pci_dev = pci_create_simple_orphan(pci_bus, -1, "cmd646-ide"); + pci_dev = pci_create_simple(mo, "ide", pci_bus, -1, "cmd646-ide"); pci_ide_create_devs(pci_dev); /* Load PALcode. Given that this is not "real" cpu palcode, diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index af40647ccd..af39f2659b 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -819,7 +819,7 @@ static void typhoon_alarm_timer(void *opaque) cpu_interrupt(CPU(s->cchip.cpu[cpu]), CPU_INTERRUPT_TIMER); } -PCIBus *typhoon_init(MemoryRegion *ram, qemu_irq *p_isa_irq, +PCIBus *typhoon_init(Object *parent, MemoryRegion *ram, qemu_irq *p_isa_irq, qemu_irq *p_rtc_irq, AlphaCPU *cpus[4], pci_map_irq_fn sys_map_irq, uint8_t devfn_min) { @@ -830,7 +830,7 @@ PCIBus *typhoon_init(MemoryRegion *ram, qemu_irq *p_isa_irq, PCIBus *b; int i; - dev = qdev_new_orphan(TYPE_TYPHOON_PCI_HOST_BRIDGE); + dev = qdev_new(parent, "typhoon", TYPE_TYPHOON_PCI_HOST_BRIDGE); s = TYPHOON_PCI_HOST_BRIDGE(dev); phb = PCI_HOST_BRIDGE(dev); @@ -894,7 +894,7 @@ PCIBus *typhoon_init(MemoryRegion *ram, qemu_irq *p_isa_irq, &s->pchip.reg_mem, &s->pchip.reg_io, devfn_min, 64, TYPE_PCI_BUS); phb->bus = b; - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal); /* Host memory as seen from the PCI side, via the IOMMU. */ memory_region_init_iommu(&s->pchip.iommu, sizeof(s->pchip.iommu), -- 2.47.1
