From nobody Sat Nov 15 01:20:41 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=reject dis=none) header.from=rsg.ci.i.u-tokyo.ac.jp Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1758114150459376.2787807305531; Wed, 17 Sep 2025 06:02:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uyrkF-0008En-LM; Wed, 17 Sep 2025 08:58:47 -0400 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 1uyrk2-00080w-Rj; Wed, 17 Sep 2025 08:58:34 -0400 Received: from www3579.sakura.ne.jp ([49.212.243.89]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uyrjz-00052T-GR; Wed, 17 Sep 2025 08:58:34 -0400 Received: from h205.csg.ci.i.u-tokyo.ac.jp (h205.csg.ci.i.u-tokyo.ac.jp [133.11.54.205]) (authenticated bits=0) by www3579.sakura.ne.jp (8.16.1/8.16.1) with ESMTPSA id 58HCuN7A008967 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 17 Sep 2025 21:56:55 +0900 (JST) (envelope-from odaki@rsg.ci.i.u-tokyo.ac.jp) DKIM-Signature: a=rsa-sha256; bh=gwBe2d1SPiEG7iGelhRfKdE35+7XHfMINRwT4MKXiLM=; c=relaxed/relaxed; d=rsg.ci.i.u-tokyo.ac.jp; h=From:Date:Subject:Message-Id:To; s=rs20250326; t=1758113816; v=1; b=IakF6xb1y6e3J++ELT8zmlhVoNMYHBM96451uoVilbwHdL9KQ+l3FBvVgicRvmGm 6xkwood2776jSaTOLnKLhkDEHFHeVh4DZYcV0lZBFtbjumcS3OrU1nbFoQ0pegnA 3FNRpQMnBN4CucKDdexGpxP0i3EjiedJQayy86a+Df2lZxwu8oJkUFkmCS1X7i2k eFERUKqRLCWqjZkE4LlmJJcApUYtqxNv0vJ+uV+ETn50NEosXa/nJugPNz1c2iwl fYyLQlZYfkVUf2FL96pYMoC/bNeGfjH/yyKvWhnSxDRGTjRGLxMWlIWD6meC5XzL ToV+oFyyI+cprwbWQIo4Sw== From: Akihiko Odaki Date: Wed, 17 Sep 2025 21:56:42 +0900 Subject: [PATCH 30/35] hw/virtio: QOM-ify AddressSpace MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250917-qom-v1-30-7262db7b0a84@rsg.ci.i.u-tokyo.ac.jp> References: <20250917-qom-v1-0-7262db7b0a84@rsg.ci.i.u-tokyo.ac.jp> In-Reply-To: <20250917-qom-v1-0-7262db7b0a84@rsg.ci.i.u-tokyo.ac.jp> To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Steven Lee , Troy Lee , Jamin Lin , Andrew Jeffery , Joel Stanley , Eric Auger , Helge Deller , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Herv=C3=A9_Poussineau?= , Aleksandar Rikalo , "Edgar E. Iglesias" , Alistair Francis , Ninad Palsule , Paolo Bonzini , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Jason Wang , Yi Liu , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Nicholas Piggin , Aditya Gupta , Gautam Menghani , Song Gao , Bibo Mao , Jiaxun Yang , Jonathan Cameron , Fan Ni , David Hildenbrand , Igor Mammedov , Xiao Guangrong , Beniamino Galvani , Strahinja Jankovic , Subbaraya Sundeep , Jan Kiszka , Laurent Vivier , Andrey Smirnov , Aurelien Jarno , BALATON Zoltan , Bernhard Beschow , Harsh Prateek Bora , Elena Ufimtseva , Jagannathan Raman , Palmer Dabbelt , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Matthew Rosato , Eric Farman , Thomas Huth , Halil Pasic , Christian Borntraeger , Ilya Leoshkevich , Fam Zheng , Bin Meng , Mark Cave-Ayland , Artyom Tarasenko , Peter Xu , Marcelo Tosatti , Max Filippov , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-s390x@nongnu.org, qemu-block@nongnu.org, kvm@vger.kernel.org, Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Stefano Garzarella , Alistair Francis , Akihiko Odaki X-Mailer: b4 0.15-dev-179e8 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=49.212.243.89; envelope-from=odaki@rsg.ci.i.u-tokyo.ac.jp; helo=www3579.sakura.ne.jp X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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-ZM-MESSAGEID: 1758114153383116600 Make AddressSpaces QOM objects to ensure that they are destroyed when their owners are finalized and also to get a unique path for debugging output. The name arguments were used to distinguish AddresSpaces in debugging output, but they will represent property names after QOM-ification and debugging output will show QOM paths. So change them to make them more concise and also avoid conflicts with other properties. Signed-off-by: Akihiko Odaki --- hw/virtio/virtio-iommu.c | 3 ++- hw/virtio/virtio-pci.c | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index d9713a38bfae..84c6076dc0e3 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -421,6 +421,7 @@ static AddressSpace *virtio_iommu_find_add_as(PCIBus *b= us, void *opaque, char *name =3D g_strdup_printf("%s-%d-%d", TYPE_VIRTIO_IOMMU_MEMORY_REGION, mr_index++, devfn); + g_autofree char *as_name =3D g_strconcat(name, "-as", NULL); sdev =3D sbus->pbdev[devfn] =3D g_new0(IOMMUDevice, 1); =20 sdev->viommu =3D s; @@ -430,7 +431,7 @@ static AddressSpace *virtio_iommu_find_add_as(PCIBus *b= us, void *opaque, trace_virtio_iommu_init_iommu_mr(name); =20 memory_region_init(&sdev->root, OBJECT(s), name, UINT64_MAX); - address_space_init(&sdev->as, NULL, &sdev->root, TYPE_VIRTIO_IOMMU= ); + address_space_init(&sdev->as, OBJECT(s), &sdev->root, as_name); add_prop_resv_regions(sdev); =20 /* diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index a3cd8f642706..7b63829c6c56 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2062,8 +2062,8 @@ static void virtio_pci_device_plugged(DeviceState *d,= Error **errp) if (modern_pio) { memory_region_init(&proxy->io_bar, OBJECT(proxy), "virtio-pci-io", 0x4); - address_space_init(&proxy->modern_cfg_io_as, NULL, &proxy->io_= bar, - "virtio-pci-cfg-io-as"); + address_space_init(&proxy->modern_cfg_io_as, OBJECT(proxy), + &proxy->io_bar, "io-as"); =20 pci_register_bar(&proxy->pci_dev, proxy->modern_io_bar_idx, PCI_BASE_ADDRESS_SPACE_IO, &proxy->io_bar); @@ -2199,8 +2199,8 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Er= ror **errp) /* PCI BAR regions must be powers of 2 */ pow2ceil(proxy->notify.offset + proxy->notify.size)= ); =20 - address_space_init(&proxy->modern_cfg_mem_as, NULL, &proxy->modern_bar, - "virtio-pci-cfg-mem-as"); + address_space_init(&proxy->modern_cfg_mem_as, OBJECT(proxy), + &proxy->modern_bar, "mem-as"); =20 if (proxy->disable_legacy =3D=3D ON_OFF_AUTO_AUTO) { proxy->disable_legacy =3D pcie_port ? ON_OFF_AUTO_ON : ON_OFF_AUTO= _OFF; @@ -2296,9 +2296,9 @@ static void virtio_pci_exit(PCIDevice *pci_dev) pci_is_express(pci_dev)) { pcie_aer_exit(pci_dev); } - address_space_destroy(&proxy->modern_cfg_mem_as); + object_unparent(OBJECT(&proxy->modern_cfg_mem_as)); if (modern_pio) { - address_space_destroy(&proxy->modern_cfg_io_as); + object_unparent(OBJECT(&proxy->modern_cfg_io_as)); } } =20 --=20 2.51.0