From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B4E74C43458 for ; Sat, 11 Jul 2026 22:48:38 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wigUt-0002NF-Ks; Sat, 11 Jul 2026 18:48:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wigUr-0002GE-1F; Sat, 11 Jul 2026 18:48:34 -0400 Received: from pdx-out-004.esa.us-west-2.outbound.mail-perimeter.amazon.com ([44.246.77.92]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wigUi-0007gO-QS; Sat, 11 Jul 2026 18:48:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazoncorp2; t=1783810104; x=1815346104; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FXjE/hRaFa2yI71GeaXuwRikd5bLiG3cS4WmzavbRdM=; b=c7mzTEUN2+wnVhQMow1RvEbRKdws3naxtEfw5BcUNNtNyi8F/9nFJ9b2 53AhA3uD2EPBtrx+no30brH26lBuQlMfmR9tx5it1PPp2u/vGtoHy0sbS hT+cTiDE2eC90UauqmOkdcH/1NMnhnHEoVCYSX97Lc3PoYvm8poySI+vj lDhaAqa7b5MsVh3IVQV25BJnoZch++6iHwkU4OEkma9cvAURKDPNYd5hC Qx0vzzi5n+UEMPvTv2J0/b8xDVmgYWlGN+KbHFQwR0xjtQd54rcNKwesB 47u5QP7wmnJ0KFBVbrY1mFb3Op98ejy+T5Fs15vjYa/8Mkn88MHPbi2QR w==; X-CSE-ConnectionGUID: AyZcKrF4TQieb2VxlLribA== X-CSE-MsgGUID: r2zZoVuBSeSPsymuyFZ3BQ== X-IronPort-AV: E=Sophos;i="6.25,154,1779148800"; d="scan'208";a="23493103" Received: from ip-10-5-9-48.us-west-2.compute.internal (HELO smtpout.naws.us-west-2.prod.farcaster.email.amazon.dev) ([10.5.9.48]) by internal-pdx-out-004.esa.us-west-2.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2026 22:48:21 +0000 Received: from EX19MTAUWC002.ant.amazon.com [205.251.233.51:19095] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.31.54:2525] with esmtp (Farcaster) id 6adf3b76-8b95-4a14-845b-428338af65e3; Sat, 11 Jul 2026 22:48:20 +0000 (UTC) X-Farcaster-Flow-ID: 6adf3b76-8b95-4a14-845b-428338af65e3 Received: from EX19D001UWA001.ant.amazon.com (10.13.138.214) by EX19MTAUWC002.ant.amazon.com (10.250.64.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.43; Sat, 11 Jul 2026 22:48:20 +0000 Received: from ip-10-253-83-51.amazon.com (172.19.99.218) by EX19D001UWA001.ant.amazon.com (10.13.138.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.43; Sat, 11 Jul 2026 22:48:11 +0000 From: Alexander Graf To: CC: , , , , Song Gao <17746591750@163.com>, Aditya Gupta , Alexey Kardashevskiy , Farhan Ali , Alistair Francis , "Alistair Francis" , Antony Pavlov , Markus Armbruster , Artyom Tarasenko , BALATON Zoltan , Felipe Balbi , Christian Borntraeger , "Brian Cain" , Hendrik Brueckner , Chao Liu , "Huacai Chen" , =?UTF-8?q?Cl=C3=A9ment=20Chigot?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Helge Deller , Dorjoy Chowdhury , "Edgar E . Iglesias" , Alexandre Iooss , Eric Farman , Francisco Iglesias , Gaurav Sharma , "Gautam Gala" , Harsh Prateek Bora , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Jan Kiszka , Max Filippov , Joel Stanley , Jared Rossi , Tyrone Ting , Frederic Konrad , "Laurent Vivier" , Manos Pitsidianakis , Bibo Mao , "Mark Cave-Ayland" , Glenn Miles , Matthew Rosato , "Michael Rolnik" , "Michael S . Tsirkin" , "Niek Linnenbank" , Nicholas Piggin , Palmer Dabbelt , Halil Pasic , "Paolo Bonzini" , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Pierrick Bouvier" , Richard Henderson , Sai Pavan Boddu , Samuel Tardieu , Bernhard Beschow , Stafford Horne , Sergio Lopez , "Subbaraya Sundeep" , Thomas Huth , "Ran Wang" , Hao Wu , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [RFC PATCH 042/134] hw/sparc64: Give onboard devices a QOM parent Date: Sat, 11 Jul 2026 22:35:35 +0000 Message-ID: <20260711223707.42139-43-graf@amazon.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260711223707.42139-1-graf@amazon.com> References: <20260711223707.42139-1-graf@amazon.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.19.99.218] X-ClientProxiedBy: EX19D042UWB001.ant.amazon.com (10.13.139.160) To EX19D001UWA001.ant.amazon.com (10.13.138.214) Received-SPF: pass client-ip=44.246.77.92; envelope-from=prvs=645f258d4=graf@amazon.de; helo=pdx-out-004.esa.us-west-2.outbound.mail-perimeter.amazon.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=0.01, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Convert 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 Link: https://lore.kernel.org/qemu-devel/87jyr3w9tc.fsf@pond.sub.org/ Assisted-by: Kiro Signed-off-by: Alexander Graf --- hw/sparc64/sun4u.c | 60 ++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index b60588cf7d..19a54b1f8a 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -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); -- 2.47.1