From nobody Sun Apr 12 04:35:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1771311335; cv=none; d=zohomail.com; s=zohoarc; b=hoJUNyeV56NziXGQN9L0o/QD9wXYTsacu1YD+r0Yb2eE4EZXHUWhSSNsFYaNyp45t7IpN8FdKwB8B66DDcniZED36AZZ8dxtShk+xVMVxGWmyO4EvTRk9wa+Lgxg5GTkhrGpbZeVgjN3LEA+uCFRL3coR/A2sFIti+7eCxN/1ME= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771311335; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=xxuPDdw5TH9LEkj25eyU1DH0VmeW/6aAiddyvkFrVU4=; b=S6ewaNfp+vZ42SI528Q3Z3mxTwFyG53MQIm9qtKcCyTNazszvzRr16DTkRePXpkX2/4/wbWbdjW8MYXDpLqzzjCUA1bqfDoBEtf+kEzFcfRTrZQbWcW31DlGifEArQchSz7h7HWhWkCf1Hm+lKDNhTo17jNZ8q/D0b8aPQh3+RU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771311335886605.3177606469619; Mon, 16 Feb 2026 22:55:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsEzW-0002iB-1z; Tue, 17 Feb 2026 01:55:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vsEzU-0002i2-Cj for qemu-devel@nongnu.org; Tue, 17 Feb 2026 01:55:24 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vsEzR-0007nl-Gl for qemu-devel@nongnu.org; Tue, 17 Feb 2026 01:55:24 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-196-etKsC4ocNtSyeFSXLpr6VA-1; Tue, 17 Feb 2026 01:55:17 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6CC661800451; Tue, 17 Feb 2026 06:55:16 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.144]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8F049180058A; Tue, 17 Feb 2026 06:55:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1771311319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=xxuPDdw5TH9LEkj25eyU1DH0VmeW/6aAiddyvkFrVU4=; b=D02ObU+Z5yMEYuGFJAmslq5AQFUY28NtsbAQWV+HYCeiQRqCwGNY/tK6HwjHc5XRhDs0AH fEiUHk/Byn2faXoN8krxj58vxISd+/PiARSynKX3gVmMe38hXSazAOpHJUDU5yMYg/CuR7 6cH8FOiPJhkKRv+R5jtnG8aZ3XdhN/o= X-MC-Unique: etKsC4ocNtSyeFSXLpr6VA-1 X-Mimecast-MFC-AGG-ID: etKsC4ocNtSyeFSXLpr6VA_1771311316 From: Thomas Huth To: "Michael S. Tsirkin" , qemu-devel@nongnu.org, Markus Armbruster Cc: Marcel Apfelbaum Subject: [PATCH] hw/pci: Avoid adding PCI devices to the "unattached" QOM tree node Date: Tue, 17 Feb 2026 07:55:12 +0100 Message-ID: <20260217065512.245237-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1771311339369154100 Content-Type: text/plain; charset="utf-8" From: Thomas Huth PCI devices that are added via pci_create_simple_multifunction(), pci_create_simple() or pci_init_nic_in_slot() currently show up under "/machine/unattached" in the QOM tree. This is somewhat ugly, the parent should rather be the PCI bus node instead, so let's add the proper relation here. Signed-off-by: Thomas Huth --- hw/pci/pci.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 90d6d71efdc..2f4d2be50fd 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -2071,6 +2071,15 @@ const pci_class_desc *get_class_desc(int class) return desc; } =20 +static void pci_dev_property_add_child(PCIBus *bus, const char *name, + PCIDevice *dev) +{ + g_autofree char *childname =3D g_strdup_printf("%s[%d.%d]", name, + PCI_SLOT(dev->devfn), + PCI_FUNC(dev->devfn)); + object_property_add_child(OBJECT(bus), childname, OBJECT(dev)); +} + void pci_init_nic_devices(PCIBus *bus, const char *default_model) { qemu_create_nic_bus_devices(&bus->qbus, TYPE_PCI_DEVICE, default_model, @@ -2114,6 +2123,7 @@ bool pci_init_nic_in_slot(PCIBus *rootbus, const char= *model, =20 pci_dev =3D pci_new(devfn, model); qdev_set_nic_properties(&pci_dev->qdev, nd); + pci_dev_property_add_child(bus, model, pci_dev); pci_realize_and_unref(pci_dev, bus, &error_fatal); return true; } @@ -2412,6 +2422,8 @@ PCIDevice *pci_create_simple_multifunction(PCIBus *bu= s, int devfn, const char *name) { PCIDevice *dev =3D pci_new_multifunction(devfn, name); + + pci_dev_property_add_child(bus, name, dev); pci_realize_and_unref(dev, bus, &error_fatal); return dev; } @@ -2419,6 +2431,8 @@ PCIDevice *pci_create_simple_multifunction(PCIBus *bu= s, int devfn, PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name) { PCIDevice *dev =3D pci_new(devfn, name); + + pci_dev_property_add_child(bus, name, dev); pci_realize_and_unref(dev, bus, &error_fatal); return dev; } --=20 2.53.0