* [PATCH 00/35] memory: QOM-ify AddressSpace
@ 2025-09-17 12:56 Akihiko Odaki
2025-09-17 12:56 ` [PATCH 01/35] " Akihiko Odaki
` (35 more replies)
0 siblings, 36 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
Based-on: <20250917-subregion-v1-0-bef37d9b4f73@rsg.ci.i.u-tokyo.ac.jp>
("[PATCH 00/14] Fix memory region use-after-finalization")
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.
Suggested by BALATON Zoltan:
https://lore.kernel.org/qemu-devel/cd21698f-db77-eb75-6966-d559fdcab835@eik.bme.hu/
Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
Akihiko Odaki (35):
memory: QOM-ify AddressSpace
hw/core/loader: Use address_space_get_path()
vfio: Use address_space_get_path()
hw/alpha: QOM-ify AddressSpace
hw/arm: QOM-ify AddressSpace
hw/display: QOM-ify AddressSpace
hw/dma: QOM-ify AddressSpace
hw/fsi: QOM-ify AddressSpace
hw/i2c: QOM-ify AddressSpace
hw/i386: QOM-ify AddressSpace
hw/intc: QOM-ify AddressSpace
hw/loongarch: QOM-ify AddressSpace
hw/mem: QOM-ify AddressSpace
hw/misc: QOM-ify AddressSpace
hw/net: QOM-ify AddressSpace
hw/nubus: QOM-ify AddressSpace
hw/pci: QOM-ify AddressSpace
hw/pci-host: QOM-ify AddressSpace
hw/ppc: QOM-ify AddressSpace
hw/remote: QOM-ify AddressSpace
hw/riscv: QOM-ify AddressSpace
hw/s390x: QOM-ify AddressSpace
hw/scsi: QOM-ify AddressSpace
hw/sd: QOM-ify AddressSpace
hw/sparc: QOM-ify AddressSpace
hw/sparc64: QOM-ify AddressSpace
hw/ssi: QOM-ify AddressSpace
hw/usb: QOM-ify AddressSpace
hw/usb: QOM-ify AddressSpace
hw/virtio: QOM-ify AddressSpace
system/physmem: QOM-ify AddressSpace
target/i386: QOM-ify AddressSpace
target/mips: QOM-ify AddressSpace
target/xtensa: QOM-ify AddressSpace
memory: Drop non-QOM AddressSpace support
include/exec/cpu-common.h | 4 +--
include/system/memory.h | 20 +++++++++------
hw/alpha/typhoon.c | 4 +--
hw/arm/armv7m.c | 2 +-
hw/arm/aspeed_ast27x0.c | 2 +-
hw/arm/smmu-common.c | 5 ++--
hw/core/loader.c | 8 +++---
hw/display/artist.c | 2 +-
hw/display/bcm2835_fb.c | 2 +-
hw/dma/bcm2835_dma.c | 2 +-
hw/dma/pl080.c | 2 +-
hw/dma/pl330.c | 3 +--
hw/dma/rc4030.c | 4 +--
hw/dma/xilinx_axidma.c | 4 +--
hw/dma/xlnx-zdma.c | 2 +-
hw/dma/xlnx_csu_dma.c | 2 +-
hw/fsi/aspeed_apb2opb.c | 2 +-
hw/i2c/aspeed_i2c.c | 3 +--
hw/i386/amd_iommu.c | 5 ++--
hw/i386/intel_iommu.c | 5 +++-
hw/intc/arm_gicv3_common.c | 3 +--
hw/intc/pnv_xive.c | 4 +--
hw/loongarch/virt.c | 3 ++-
hw/mem/cxl_type3.c | 44 +++++++++------------------------
hw/mem/memory-device.c | 4 +--
hw/misc/aspeed_hace.c | 2 +-
hw/misc/auxbus.c | 2 +-
hw/misc/bcm2835_mbox.c | 2 +-
hw/misc/bcm2835_property.c | 2 +-
hw/misc/max78000_gcr.c | 2 +-
hw/misc/tz-mpc.c | 6 ++---
hw/misc/tz-msc.c | 2 +-
hw/misc/tz-ppc.c | 5 +++-
hw/net/allwinner-sun8i-emac.c | 2 +-
hw/net/cadence_gem.c | 4 +--
hw/net/dp8393x.c | 2 +-
hw/net/msf2-emac.c | 2 +-
hw/net/mv88w8618_eth.c | 2 +-
hw/nubus/nubus-bus.c | 4 +--
hw/pci-host/astro.c | 3 +--
hw/pci-host/designware.c | 5 ++--
hw/pci-host/dino.c | 4 +--
hw/pci-host/gt64120.c | 2 +-
hw/pci-host/pnv_phb3.c | 4 +--
hw/pci-host/pnv_phb4.c | 4 +--
hw/pci-host/ppc440_pcix.c | 2 +-
hw/pci-host/ppce500.c | 2 +-
hw/pci-host/raven.c | 2 +-
hw/pci/pci.c | 6 ++---
hw/pci/pci_bridge.c | 10 ++++----
hw/ppc/pnv_lpc.c | 2 +-
hw/ppc/pnv_xscom.c | 2 +-
hw/ppc/spapr_pci.c | 5 ++--
hw/ppc/spapr_vio.c | 2 +-
hw/remote/iommu.c | 4 +--
hw/riscv/riscv-iommu.c | 9 ++++---
hw/s390x/s390-pci-bus.c | 9 ++-----
hw/scsi/lsi53c895a.c | 5 ++--
hw/sd/allwinner-sdhost.c | 2 +-
hw/sd/sdhci.c | 4 +--
hw/sparc/sun4m_iommu.c | 2 +-
hw/sparc64/sun4u_iommu.c | 2 +-
hw/ssi/aspeed_smc.c | 6 ++---
hw/usb/hcd-dwc2.c | 2 +-
hw/usb/hcd-xhci-sysbus.c | 2 +-
hw/vfio/listener.c | 8 ++++--
hw/virtio/vhost-vdpa.c | 4 ++-
hw/virtio/virtio-iommu.c | 3 ++-
hw/virtio/virtio-pci.c | 12 ++++-----
system/memory.c | 57 ++++++++++++++++++++++++++++---------------
system/physmem.c | 24 ++++++++++--------
target/i386/kvm/kvm.c | 3 ++-
target/mips/cpu.c | 4 +--
target/xtensa/cpu.c | 2 +-
74 files changed, 204 insertions(+), 195 deletions(-)
---
base-commit: e101d33792530093fa0b0a6e5f43e4d8cfe4581e
change-id: 20250915-qom-e7fcca27d4db
prerequisite-change-id: 20250906-use-37ecc903a9e0:v2
prerequisite-patch-id: d464fda86a3c79ff8e6d7a2e623d979b2a47019b
prerequisite-patch-id: 17b153237f69c898b9c5b93aad0d5116d0bfe49f
prerequisite-patch-id: a323f67e01c672ab2958a237ea54b77f1443e2d1
prerequisite-patch-id: 822094864ad7a6a702fee098e4835621bd8092fe
prerequisite-patch-id: 5757efd81557b060257b5db6dec6fd189076ee77
prerequisite-patch-id: bd912830a326f13186bf38e916655ec980e11af8
prerequisite-patch-id: fe6b92112288829e60f10c305742a544f45e8984
prerequisite-patch-id: ac4ff0c11dcc1fc5d08b4fc480c14721fde574ad
prerequisite-patch-id: ff398fa97b5f2feee85372fdf108d82d8d5526b0
prerequisite-patch-id: 7ac446ae76e05dd267a63889ff775ac609712c31
prerequisite-patch-id: b49a74cd5f31348c3dc13dcfd1dad629e6b30387
prerequisite-patch-id: 8f61fe1b81cf3ec906ebbf61776573edd96c1e8c
prerequisite-patch-id: 01fb8ccbe7326021a94a8d7531189568d2e311a7
prerequisite-patch-id: 974b0fc6d7c8d6d56b8f44597260647e1a53cf38
prerequisite-patch-id: 55c4711a2a4e6b02b8b512e0283f8feaf7d3bfa3
prerequisite-message-id: <cover.1751493467.git.balaton@eik.bme.hu>
prerequisite-patch-id: f9c7e666c59cdc8a561d6d122e7937648da490e1
prerequisite-patch-id: 9b52629b6d9d32e71e5c416aead9aadb0e3c7ae2
prerequisite-patch-id: 16467219e7dd93204cec6ceb6d69577e3e86c03a
prerequisite-patch-id: 37a3ee3288d2cda8303c9c9e3d5ec9d813b05ef6
prerequisite-patch-id: b707ebf05289b55e8458b6b3515aa0fc559c7c88
prerequisite-patch-id: 721e733f06ce38375881520725177c9da9c22633
prerequisite-patch-id: 3cd399b599a9ff57066d820b1e6504b335be4f79
prerequisite-patch-id: 8a607cc6e52a6a6958a73cd1a1b824b52a4f4582
prerequisite-patch-id: af3976b1c4c3ef4859f2371a318214af5418e97d
prerequisite-patch-id: 76c6e115f8771f31c99f454fd3188ca49e283025
prerequisite-patch-id: 488b5dd5a90070331daae2e22f7c1f6419a7e428
prerequisite-patch-id: 53b85575018fecb94e208bdb5d3047b8d66fb4dd
prerequisite-patch-id: 0426e04bb68376f2d4fad6ade4ac641202172396
prerequisite-patch-id: 6ba40a4bf6e2b0ba3d4ecf9a1c4fed7f46e5730c
Best regards,
--
Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 01/35] memory: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 15:53 ` Richard Henderson
2025-09-17 12:56 ` [PATCH 02/35] hw/core/loader: Use address_space_get_path() Akihiko Odaki
` (34 subsequent siblings)
35 siblings, 1 reply; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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.
For incremental conversion, address_space_init() keeps the original
behavior when the owner parameter is NULL, and all callers are changed
to pass NULL as the owner parameter.
Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
include/system/memory.h | 19 +++++++++++-
hw/alpha/typhoon.c | 2 +-
hw/arm/armv7m.c | 2 +-
hw/arm/aspeed_ast27x0.c | 2 +-
hw/arm/smmu-common.c | 2 +-
hw/display/artist.c | 2 +-
hw/display/bcm2835_fb.c | 2 +-
hw/dma/bcm2835_dma.c | 2 +-
hw/dma/pl080.c | 3 +-
hw/dma/pl330.c | 2 +-
hw/dma/rc4030.c | 3 +-
hw/dma/xilinx_axidma.c | 2 +-
hw/dma/xlnx-zdma.c | 2 +-
hw/dma/xlnx_csu_dma.c | 2 +-
hw/fsi/aspeed_apb2opb.c | 2 +-
hw/i2c/aspeed_i2c.c | 2 +-
hw/i386/amd_iommu.c | 2 +-
hw/i386/intel_iommu.c | 3 +-
hw/intc/arm_gicv3_common.c | 2 +-
hw/intc/pnv_xive.c | 4 +--
hw/loongarch/virt.c | 2 +-
hw/mem/cxl_type3.c | 6 ++--
hw/mem/memory-device.c | 2 +-
hw/misc/aspeed_hace.c | 2 +-
hw/misc/auxbus.c | 2 +-
hw/misc/bcm2835_mbox.c | 3 +-
hw/misc/bcm2835_property.c | 3 +-
hw/misc/max78000_gcr.c | 2 +-
hw/misc/tz-mpc.c | 4 +--
hw/misc/tz-msc.c | 2 +-
hw/misc/tz-ppc.c | 2 +-
hw/net/allwinner-sun8i-emac.c | 2 +-
hw/net/cadence_gem.c | 2 +-
hw/net/dp8393x.c | 2 +-
hw/net/msf2-emac.c | 2 +-
hw/net/mv88w8618_eth.c | 2 +-
hw/nubus/nubus-bus.c | 2 +-
hw/pci-host/astro.c | 2 +-
hw/pci-host/designware.c | 2 +-
hw/pci-host/dino.c | 2 +-
hw/pci-host/gt64120.c | 2 +-
hw/pci-host/pnv_phb3.c | 2 +-
hw/pci-host/pnv_phb4.c | 2 +-
hw/pci-host/ppc440_pcix.c | 2 +-
hw/pci-host/ppce500.c | 2 +-
hw/pci-host/raven.c | 2 +-
hw/pci/pci.c | 2 +-
hw/pci/pci_bridge.c | 5 ++--
hw/ppc/pnv_lpc.c | 2 +-
hw/ppc/pnv_xscom.c | 2 +-
hw/ppc/spapr_pci.c | 2 +-
hw/ppc/spapr_vio.c | 2 +-
hw/remote/iommu.c | 2 +-
hw/riscv/riscv-iommu.c | 7 +++--
hw/s390x/s390-pci-bus.c | 2 +-
hw/scsi/lsi53c895a.c | 3 +-
hw/sd/allwinner-sdhost.c | 2 +-
hw/sd/sdhci.c | 2 +-
hw/sparc/sun4m_iommu.c | 3 +-
hw/sparc64/sun4u_iommu.c | 3 +-
hw/ssi/aspeed_smc.c | 4 +--
hw/usb/hcd-dwc2.c | 2 +-
hw/usb/hcd-xhci-sysbus.c | 2 +-
hw/virtio/virtio-iommu.c | 2 +-
hw/virtio/virtio-pci.c | 4 +--
system/memory.c | 67 ++++++++++++++++++++++++++++++++-----------
system/physmem.c | 13 ++++++---
target/i386/kvm/kvm.c | 2 +-
target/mips/cpu.c | 2 +-
target/xtensa/cpu.c | 2 +-
70 files changed, 163 insertions(+), 98 deletions(-)
diff --git a/include/system/memory.h b/include/system/memory.h
index e2cd6ed12614..5108e0fba339 100644
--- a/include/system/memory.h
+++ b/include/system/memory.h
@@ -47,6 +47,9 @@ typedef struct RamDiscardManager RamDiscardManager;
DECLARE_OBJ_CHECKERS(RamDiscardManager, RamDiscardManagerClass,
RAM_DISCARD_MANAGER, TYPE_RAM_DISCARD_MANAGER);
+#define TYPE_ADDRESS_SPACE "address-space"
+OBJECT_DECLARE_SIMPLE_TYPE(AddressSpace, ADDRESS_SPACE)
+
#ifdef CONFIG_FUZZ
void fuzz_dma_read_cb(size_t addr,
size_t len,
@@ -1158,7 +1161,9 @@ typedef struct AddressSpaceMapClient {
*/
struct AddressSpace {
/* private: */
+ Object parent_obj;
struct rcu_head rcu;
+ bool qom;
char *name;
MemoryRegion *root;
@@ -2706,11 +2711,13 @@ MemTxResult memory_region_dispatch_write(MemoryRegion *mr,
* address_space_init: initializes an address space
*
* @as: an uninitialized #AddressSpace
+ * @parent: parent object
* @root: a #MemoryRegion that routes addresses for the address space
* @name: an address space name. The name is only used for debugging
* output.
*/
-void address_space_init(AddressSpace *as, MemoryRegion *root, const char *name);
+void address_space_init(AddressSpace *as, Object *parent, MemoryRegion *root,
+ const char *name);
/**
* address_space_destroy: destroy an address space
@@ -2723,6 +2730,16 @@ void address_space_init(AddressSpace *as, MemoryRegion *root, const char *name);
*/
void address_space_destroy(AddressSpace *as);
+/**
+ * address_space_get_path: get the path to an address space
+ *
+ * @as: an initialized #AddressSpace
+ *
+ * Returns: The canonical path for an address space, newly allocated.
+ * Use g_free() to free it.
+ */
+char *address_space_get_path(AddressSpace *as);
+
/**
* address_space_remove_listeners: unregister all listeners of an address space
*
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 4c56f981d71c..d2307b076897 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -900,7 +900,7 @@ PCIBus *typhoon_init(MemoryRegion *ram, qemu_irq *p_isa_irq,
memory_region_init_iommu(&s->pchip.iommu, sizeof(s->pchip.iommu),
TYPE_TYPHOON_IOMMU_MEMORY_REGION, OBJECT(s),
"iommu-typhoon", UINT64_MAX);
- address_space_init(&s->pchip.iommu_as, MEMORY_REGION(&s->pchip.iommu),
+ address_space_init(&s->pchip.iommu_as, NULL, MEMORY_REGION(&s->pchip.iommu),
"pchip0-pci");
pci_setup_iommu(b, &typhoon_iommu_ops, s);
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index cea3eb49ee59..7fa854bc14df 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -117,7 +117,7 @@ static void bitband_realize(DeviceState *dev, Error **errp)
return;
}
- address_space_init(&s->source_as, s->source_memory, "bitband-source");
+ address_space_init(&s->source_as, NULL, s->source_memory, "bitband-source");
}
/* Board init. */
diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c
index 6aa3841b6911..f8c0ac5f87df 100644
--- a/hw/arm/aspeed_ast27x0.c
+++ b/hw/arm/aspeed_ast27x0.c
@@ -387,7 +387,7 @@ static bool aspeed_soc_ast2700_dram_init(DeviceState *dev, Error **errp)
memory_region_init(&s->dram_container, OBJECT(s), "ram-container",
ram_size);
memory_region_add_subregion(&s->dram_container, 0, s->dram_mr);
- address_space_init(&s->dram_as, s->dram_mr, "dram");
+ address_space_init(&s->dram_as, NULL, s->dram_mr, "dram");
/*
* Add a memory region beyond the RAM region to emulate
diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c
index 0dcaf2f58971..081c50750947 100644
--- a/hw/arm/smmu-common.c
+++ b/hw/arm/smmu-common.c
@@ -873,7 +873,7 @@ static AddressSpace *smmu_find_add_as(PCIBus *bus, void *opaque, int devfn)
memory_region_init_iommu(&sdev->iommu, sizeof(sdev->iommu),
s->mrtypename,
OBJECT(s), name, UINT64_MAX);
- address_space_init(&sdev->as,
+ address_space_init(&sdev->as, NULL,
MEMORY_REGION(&sdev->iommu), name);
trace_smmu_add_mr(name);
g_free(name);
diff --git a/hw/display/artist.c b/hw/display/artist.c
index 3c884c92437c..42905563ad49 100644
--- a/hw/display/artist.c
+++ b/hw/display/artist.c
@@ -1391,7 +1391,7 @@ static void artist_realizefn(DeviceState *dev, Error **errp)
}
memory_region_init(&s->mem_as_root, OBJECT(dev), "artist", ~0ull);
- address_space_init(&s->as, &s->mem_as_root, "artist");
+ address_space_init(&s->as, NULL, &s->mem_as_root, "artist");
artist_create_buffer(s, "cmap", &offset, ARTIST_BUFFER_CMAP, 2048, 4);
artist_create_buffer(s, "ap", &offset, ARTIST_BUFFER_AP,
diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c
index 820e67ac8bb4..c6710bdc0700 100644
--- a/hw/display/bcm2835_fb.c
+++ b/hw/display/bcm2835_fb.c
@@ -421,7 +421,7 @@ static void bcm2835_fb_realize(DeviceState *dev, Error **errp)
s->initial_config.base = s->vcram_base + BCM2835_FB_OFFSET;
s->dma_mr = MEMORY_REGION(obj);
- address_space_init(&s->dma_as, s->dma_mr, TYPE_BCM2835_FB "-memory");
+ address_space_init(&s->dma_as, NULL, s->dma_mr, TYPE_BCM2835_FB "-memory");
bcm2835_fb_reset(dev);
diff --git a/hw/dma/bcm2835_dma.c b/hw/dma/bcm2835_dma.c
index a2771ddcb523..ebef56d8d613 100644
--- a/hw/dma/bcm2835_dma.c
+++ b/hw/dma/bcm2835_dma.c
@@ -380,7 +380,7 @@ static void bcm2835_dma_realize(DeviceState *dev, Error **errp)
obj = object_property_get_link(OBJECT(dev), "dma-mr", &error_abort);
s->dma_mr = MEMORY_REGION(obj);
- address_space_init(&s->dma_as, s->dma_mr, TYPE_BCM2835_DMA "-memory");
+ address_space_init(&s->dma_as, NULL, s->dma_mr, TYPE_BCM2835_DMA "-memory");
bcm2835_dma_reset(dev);
}
diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c
index 277d9343223b..cf02a484d6a6 100644
--- a/hw/dma/pl080.c
+++ b/hw/dma/pl080.c
@@ -398,7 +398,8 @@ static void pl080_realize(DeviceState *dev, Error **errp)
return;
}
- address_space_init(&s->downstream_as, s->downstream, "pl080-downstream");
+ address_space_init(&s->downstream_as, NULL, s->downstream,
+ "pl080-downstream");
}
static void pl081_init(Object *obj)
diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
index a570bb08ec4c..4733799f4045 100644
--- a/hw/dma/pl330.c
+++ b/hw/dma/pl330.c
@@ -1569,7 +1569,7 @@ static void pl330_realize(DeviceState *dev, Error **errp)
s->mem_as = &address_space_memory;
} else {
s->mem_as = g_new0(AddressSpace, 1);
- address_space_init(s->mem_as, s->mem_mr,
+ address_space_init(s->mem_as, NULL, s->mem_mr,
memory_region_name(s->mem_mr));
}
diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c
index b6ed1d464336..cf76f90f4d3b 100644
--- a/hw/dma/rc4030.c
+++ b/hw/dma/rc4030.c
@@ -688,7 +688,8 @@ static void rc4030_realize(DeviceState *dev, Error **errp)
memory_region_init_iommu(&s->dma_mr, sizeof(s->dma_mr),
TYPE_RC4030_IOMMU_MEMORY_REGION,
o, "rc4030.dma", 4 * GiB);
- address_space_init(&s->dma_as, MEMORY_REGION(&s->dma_mr), "rc4030-dma");
+ address_space_init(&s->dma_as, NULL, MEMORY_REGION(&s->dma_mr),
+ "rc4030-dma");
}
static void rc4030_unrealize(DeviceState *dev)
diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index 2020399fd596..0f340abc2c6f 100644
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -588,7 +588,7 @@ static void xilinx_axidma_realize(DeviceState *dev, Error **errp)
ptimer_transaction_commit(st->ptimer);
}
- address_space_init(&s->as,
+ address_space_init(&s->as, NULL,
s->dma_mr ? s->dma_mr : get_system_memory(), "dma");
}
diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c
index 0c075e7d0d10..9b9ccd1e3c08 100644
--- a/hw/dma/xlnx-zdma.c
+++ b/hw/dma/xlnx-zdma.c
@@ -769,7 +769,7 @@ static void zdma_realize(DeviceState *dev, Error **errp)
error_setg(errp, TYPE_XLNX_ZDMA " 'dma' link not set");
return;
}
- address_space_init(&s->dma_as, s->dma_mr, "zdma-dma");
+ address_space_init(&s->dma_as, NULL, s->dma_mr, "zdma-dma");
for (i = 0; i < ARRAY_SIZE(zdma_regs_info); ++i) {
RegisterInfo *r = &s->regs_info[zdma_regs_info[i].addr / 4];
diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c
index d8c7da1a501c..8b88392bb92b 100644
--- a/hw/dma/xlnx_csu_dma.c
+++ b/hw/dma/xlnx_csu_dma.c
@@ -653,7 +653,7 @@ static void xlnx_csu_dma_realize(DeviceState *dev, Error **errp)
error_setg(errp, TYPE_XLNX_CSU_DMA " 'dma' link not set");
return;
}
- address_space_init(&s->dma_as, s->dma_mr, "csu-dma");
+ address_space_init(&s->dma_as, NULL, s->dma_mr, "csu-dma");
reg_array =
register_init_block32(dev, xlnx_csu_dma_regs_info[!!s->is_dst],
diff --git a/hw/fsi/aspeed_apb2opb.c b/hw/fsi/aspeed_apb2opb.c
index 172ba16b0c05..8eda6f67cfd9 100644
--- a/hw/fsi/aspeed_apb2opb.c
+++ b/hw/fsi/aspeed_apb2opb.c
@@ -349,7 +349,7 @@ static void fsi_opb_init(Object *o)
OPBus *opb = OP_BUS(o);
memory_region_init(&opb->mr, 0, TYPE_FSI_OPB, UINT32_MAX);
- address_space_init(&opb->as, &opb->mr, TYPE_FSI_OPB);
+ address_space_init(&opb->as, NULL, &opb->mr, TYPE_FSI_OPB);
}
static const TypeInfo opb_info = {
diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c
index 83fb906bdc75..9d216b3f0ea3 100644
--- a/hw/i2c/aspeed_i2c.c
+++ b/hw/i2c/aspeed_i2c.c
@@ -1253,7 +1253,7 @@ static void aspeed_i2c_realize(DeviceState *dev, Error **errp)
return;
}
- address_space_init(&s->dram_as, s->dram_mr,
+ address_space_init(&s->dram_as, NULL, s->dram_mr,
TYPE_ASPEED_I2C "-dma-dram");
}
}
diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c
index 26be69bec8ae..af239390ba04 100644
--- a/hw/i386/amd_iommu.c
+++ b/hw/i386/amd_iommu.c
@@ -1522,7 +1522,7 @@ static AddressSpace *amdvi_host_dma_iommu(PCIBus *bus, void *opaque, int devfn)
"amd_iommu", UINT64_MAX);
memory_region_init(&amdvi_dev_as->root, OBJECT(s),
"amdvi_root", UINT64_MAX);
- address_space_init(&amdvi_dev_as->as, &amdvi_dev_as->root, name);
+ address_space_init(&amdvi_dev_as->as, NULL, &amdvi_dev_as->root, name);
memory_region_add_subregion_overlap(&amdvi_dev_as->root, 0,
MEMORY_REGION(&amdvi_dev_as->iommu),
0);
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 83c5e444131a..1f40d904326e 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -4263,7 +4263,8 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus,
vtd_dev_as->iova_tree = iova_tree_new();
memory_region_init(&vtd_dev_as->root, OBJECT(s), name, UINT64_MAX);
- address_space_init(&vtd_dev_as->as, &vtd_dev_as->root, "vtd-root");
+ address_space_init(&vtd_dev_as->as, NULL, &vtd_dev_as->root,
+ "vtd-root");
/*
* Build the DMAR-disabled container with aliases to the
diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c
index e438d8c042d6..169e0fcca828 100644
--- a/hw/intc/arm_gicv3_common.c
+++ b/hw/intc/arm_gicv3_common.c
@@ -429,7 +429,7 @@ static void arm_gicv3_common_realize(DeviceState *dev, Error **errp)
}
if (s->lpi_enable) {
- address_space_init(&s->dma_as, s->dma,
+ address_space_init(&s->dma_as, NULL, s->dma,
"gicv3-its-sysmem");
}
diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c
index c2ca40b8be87..d14c26773021 100644
--- a/hw/intc/pnv_xive.c
+++ b/hw/intc/pnv_xive.c
@@ -2012,10 +2012,10 @@ static void pnv_xive_realize(DeviceState *dev, Error **errp)
memory_region_init(&xive->ipi_mmio, OBJECT(xive), "xive-vc-ipi",
PNV9_XIVE_VC_SIZE);
- address_space_init(&xive->ipi_as, &xive->ipi_mmio, "xive-vc-ipi");
+ address_space_init(&xive->ipi_as, NULL, &xive->ipi_mmio, "xive-vc-ipi");
memory_region_init(&xive->end_mmio, OBJECT(xive), "xive-vc-end",
PNV9_XIVE_VC_SIZE);
- address_space_init(&xive->end_as, &xive->end_mmio, "xive-vc-end");
+ address_space_init(&xive->end_as, NULL, &xive->end_mmio, "xive-vc-end");
/*
* The MMIO windows exposing the IPI ESBs and the END ESBs in the
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index b15ada20787b..0bace2f54b49 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -699,7 +699,7 @@ static void virt_init(MachineState *machine)
/* Create IOCSR space */
memory_region_init_io(&lvms->system_iocsr, OBJECT(machine), NULL,
machine, "iocsr", UINT64_MAX);
- address_space_init(&lvms->as_iocsr, &lvms->system_iocsr, "IOCSR");
+ address_space_init(&lvms->as_iocsr, NULL, &lvms->system_iocsr, "IOCSR");
memory_region_init_io(&lvms->iocsr_mem, OBJECT(machine),
&virt_iocsr_misc_ops,
machine, "iocsr_misc", 0x428);
diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c
index be609ff9d031..1a726b834b02 100644
--- a/hw/mem/cxl_type3.c
+++ b/hw/mem/cxl_type3.c
@@ -770,7 +770,7 @@ static bool cxl_setup_memory(CXLType3Dev *ct3d, Error **errp)
} else {
v_name = g_strdup("cxl-type3-dpa-vmem-space");
}
- address_space_init(&ct3d->hostvmem_as, vmr, v_name);
+ address_space_init(&ct3d->hostvmem_as, NULL, vmr, v_name);
ct3d->cxl_dstate.vmem_size = memory_region_size(vmr);
ct3d->cxl_dstate.static_mem_size += memory_region_size(vmr);
g_free(v_name);
@@ -798,7 +798,7 @@ static bool cxl_setup_memory(CXLType3Dev *ct3d, Error **errp)
} else {
p_name = g_strdup("cxl-type3-dpa-pmem-space");
}
- address_space_init(&ct3d->hostpmem_as, pmr, p_name);
+ address_space_init(&ct3d->hostpmem_as, NULL, pmr, p_name);
ct3d->cxl_dstate.pmem_size = memory_region_size(pmr);
ct3d->cxl_dstate.static_mem_size += memory_region_size(pmr);
g_free(p_name);
@@ -837,7 +837,7 @@ static bool cxl_setup_memory(CXLType3Dev *ct3d, Error **errp)
} else {
dc_name = g_strdup("cxl-dcd-dpa-dc-space");
}
- address_space_init(&ct3d->dc.host_dc_as, dc_mr, dc_name);
+ address_space_init(&ct3d->dc.host_dc_as, NULL, dc_mr, dc_name);
g_free(dc_name);
if (!cxl_create_dc_regions(ct3d, errp)) {
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index 1a432e9bd224..a4a8efdd869b 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -535,7 +535,7 @@ void machine_memory_devices_init(MachineState *ms, hwaddr base, uint64_t size)
memory_region_init(&ms->device_memory->mr, OBJECT(ms), "device-memory",
size);
- address_space_init(&ms->device_memory->as, &ms->device_memory->mr,
+ address_space_init(&ms->device_memory->as, NULL, &ms->device_memory->mr,
"device-memory");
memory_region_add_subregion(get_system_memory(), ms->device_memory->base,
&ms->device_memory->mr);
diff --git a/hw/misc/aspeed_hace.c b/hw/misc/aspeed_hace.c
index 726368fbbc2e..198363fd64fa 100644
--- a/hw/misc/aspeed_hace.c
+++ b/hw/misc/aspeed_hace.c
@@ -603,7 +603,7 @@ static void aspeed_hace_realize(DeviceState *dev, Error **errp)
return;
}
- address_space_init(&s->dram_as, s->dram_mr, "dram");
+ address_space_init(&s->dram_as, NULL, s->dram_mr, "dram");
sysbus_init_mmio(sbd, &s->iomem);
}
diff --git a/hw/misc/auxbus.c b/hw/misc/auxbus.c
index 877f34560626..e5448ef3cc60 100644
--- a/hw/misc/auxbus.c
+++ b/hw/misc/auxbus.c
@@ -74,7 +74,7 @@ AUXBus *aux_bus_init(DeviceState *parent, const char *name)
/* Memory related. */
bus->aux_io = g_malloc(sizeof(*bus->aux_io));
memory_region_init(bus->aux_io, OBJECT(bus), "aux-io", 1 * MiB);
- address_space_init(&bus->aux_addr_space, bus->aux_io, "aux-io");
+ address_space_init(&bus->aux_addr_space, NULL, bus->aux_io, "aux-io");
return bus;
}
diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c
index 603eaaa710d5..4bf3c59a40a1 100644
--- a/hw/misc/bcm2835_mbox.c
+++ b/hw/misc/bcm2835_mbox.c
@@ -310,7 +310,8 @@ static void bcm2835_mbox_realize(DeviceState *dev, Error **errp)
obj = object_property_get_link(OBJECT(dev), "mbox-mr", &error_abort);
s->mbox_mr = MEMORY_REGION(obj);
- address_space_init(&s->mbox_as, s->mbox_mr, TYPE_BCM2835_MBOX "-memory");
+ address_space_init(&s->mbox_as, NULL, s->mbox_mr,
+ TYPE_BCM2835_MBOX "-memory");
bcm2835_mbox_reset(dev);
}
diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c
index a21c6a541c05..8bdde2d248b5 100644
--- a/hw/misc/bcm2835_property.c
+++ b/hw/misc/bcm2835_property.c
@@ -540,7 +540,8 @@ static void bcm2835_property_realize(DeviceState *dev, Error **errp)
obj = object_property_get_link(OBJECT(dev), "dma-mr", &error_abort);
s->dma_mr = MEMORY_REGION(obj);
- address_space_init(&s->dma_as, s->dma_mr, TYPE_BCM2835_PROPERTY "-memory");
+ address_space_init(&s->dma_as, NULL, s->dma_mr,
+ TYPE_BCM2835_PROPERTY "-memory");
obj = object_property_get_link(OBJECT(dev), "otp", &error_abort);
s->otp = BCM2835_OTP(obj);
diff --git a/hw/misc/max78000_gcr.c b/hw/misc/max78000_gcr.c
index fbbc92cca32d..0a0692c7cffe 100644
--- a/hw/misc/max78000_gcr.c
+++ b/hw/misc/max78000_gcr.c
@@ -320,7 +320,7 @@ static void max78000_gcr_realize(DeviceState *dev, Error **errp)
{
Max78000GcrState *s = MAX78000_GCR(dev);
- address_space_init(&s->sram_as, s->sram, "sram");
+ address_space_init(&s->sram_as, NULL, s->sram, "sram");
}
static void max78000_gcr_class_init(ObjectClass *klass, const void *data)
diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c
index a158d4a29445..b8be234630e3 100644
--- a/hw/misc/tz-mpc.c
+++ b/hw/misc/tz-mpc.c
@@ -550,9 +550,9 @@ static void tz_mpc_realize(DeviceState *dev, Error **errp)
memory_region_init_io(&s->blocked_io, obj, &tz_mpc_mem_blocked_ops,
s, "tz-mpc-blocked-io", size);
- address_space_init(&s->downstream_as, s->downstream,
+ address_space_init(&s->downstream_as, NULL, s->downstream,
"tz-mpc-downstream");
- address_space_init(&s->blocked_io_as, &s->blocked_io,
+ address_space_init(&s->blocked_io_as, NULL, &s->blocked_io,
"tz-mpc-blocked-io");
s->blk_lut = g_new0(uint32_t, s->blk_max);
diff --git a/hw/misc/tz-msc.c b/hw/misc/tz-msc.c
index af0cc5d47186..ed1c95e2e9fa 100644
--- a/hw/misc/tz-msc.c
+++ b/hw/misc/tz-msc.c
@@ -260,7 +260,7 @@ static void tz_msc_realize(DeviceState *dev, Error **errp)
}
size = memory_region_size(s->downstream);
- address_space_init(&s->downstream_as, s->downstream, name);
+ address_space_init(&s->downstream_as, NULL, s->downstream, name);
memory_region_init_io(&s->upstream, obj, &tz_msc_ops, s, name, size);
sysbus_init_mmio(sbd, &s->upstream);
}
diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c
index e4235a846d40..28a1c27aa3cc 100644
--- a/hw/misc/tz-ppc.c
+++ b/hw/misc/tz-ppc.c
@@ -276,7 +276,7 @@ static void tz_ppc_realize(DeviceState *dev, Error **errp)
name = g_strdup_printf("tz-ppc-port[%d]", i);
port->ppc = s;
- address_space_init(&port->downstream_as, port->downstream, name);
+ address_space_init(&port->downstream_as, NULL, port->downstream, name);
size = memory_region_size(port->downstream);
memory_region_init_io(&port->upstream, obj, &tz_ppc_ops,
diff --git a/hw/net/allwinner-sun8i-emac.c b/hw/net/allwinner-sun8i-emac.c
index 30a81576b4ce..27160c5ff2a4 100644
--- a/hw/net/allwinner-sun8i-emac.c
+++ b/hw/net/allwinner-sun8i-emac.c
@@ -820,7 +820,7 @@ static void allwinner_sun8i_emac_realize(DeviceState *dev, Error **errp)
return;
}
- address_space_init(&s->dma_as, s->dma_mr, "emac-dma");
+ address_space_init(&s->dma_as, NULL, s->dma_mr, "emac-dma");
qemu_macaddr_default_if_unset(&s->conf.macaddr);
s->nic = qemu_new_nic(&net_allwinner_sun8i_emac_info, &s->conf,
diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index 44446666deb2..3ba8ce017194 100644
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -1734,7 +1734,7 @@ static void gem_realize(DeviceState *dev, Error **errp)
CadenceGEMState *s = CADENCE_GEM(dev);
int i;
- address_space_init(&s->dma_as,
+ address_space_init(&s->dma_as, NULL,
s->dma_mr ? s->dma_mr : get_system_memory(), "dma");
if (s->num_priority_queues == 0 ||
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index d49032059bb1..f65d8ef4dd45 100644
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -908,7 +908,7 @@ static void dp8393x_realize(DeviceState *dev, Error **errp)
{
dp8393xState *s = DP8393X(dev);
- address_space_init(&s->as, s->dma_mr, "dp8393x");
+ address_space_init(&s->as, NULL, s->dma_mr, "dp8393x");
memory_region_init_io(&s->mmio, OBJECT(dev), &dp8393x_ops, s,
"dp8393x-regs", SONIC_REG_COUNT << s->it_shift);
diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c
index 59045973ab95..59c380db30dc 100644
--- a/hw/net/msf2-emac.c
+++ b/hw/net/msf2-emac.c
@@ -526,7 +526,7 @@ static void msf2_emac_realize(DeviceState *dev, Error **errp)
return;
}
- address_space_init(&s->dma_as, s->dma_mr, "emac-ahb");
+ address_space_init(&s->dma_as, NULL, s->dma_mr, "emac-ahb");
qemu_macaddr_default_if_unset(&s->conf.macaddr);
s->nic = qemu_new_nic(&net_msf2_emac_info, &s->conf,
diff --git a/hw/net/mv88w8618_eth.c b/hw/net/mv88w8618_eth.c
index 6f08846c81ca..1ea294bcced5 100644
--- a/hw/net/mv88w8618_eth.c
+++ b/hw/net/mv88w8618_eth.c
@@ -348,7 +348,7 @@ static void mv88w8618_eth_realize(DeviceState *dev, Error **errp)
return;
}
- address_space_init(&s->dma_as, s->dma_mr, "emac-dma");
+ address_space_init(&s->dma_as, NULL, s->dma_mr, "emac-dma");
s->nic = qemu_new_nic(&net_mv88w8618_info, &s->conf,
object_get_typename(OBJECT(dev)), dev->id,
&dev->mem_reentrancy_guard, s);
diff --git a/hw/nubus/nubus-bus.c b/hw/nubus/nubus-bus.c
index 44820f13a853..1d553be77662 100644
--- a/hw/nubus/nubus-bus.c
+++ b/hw/nubus/nubus-bus.c
@@ -94,7 +94,7 @@ static void nubus_realize(BusState *bus, Error **errp)
return;
}
- address_space_init(&nubus->nubus_as, &nubus->nubus_mr, "nubus");
+ address_space_init(&nubus->nubus_as, NULL, &nubus->nubus_mr, "nubus");
}
static void nubus_init(Object *obj)
diff --git a/hw/pci-host/astro.c b/hw/pci-host/astro.c
index 859e308c577c..bb6b7d05582f 100644
--- a/hw/pci-host/astro.c
+++ b/hw/pci-host/astro.c
@@ -835,7 +835,7 @@ static void astro_realize(DeviceState *obj, Error **errp)
memory_region_init_iommu(&s->iommu, sizeof(s->iommu),
TYPE_ASTRO_IOMMU_MEMORY_REGION, OBJECT(s),
"iommu-astro", UINT64_MAX);
- address_space_init(&s->iommu_as, MEMORY_REGION(&s->iommu),
+ address_space_init(&s->iommu_as, NULL, MEMORY_REGION(&s->iommu),
"bm-pci");
/* Create Elroys (PCI host bus chips). */
diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c
index f6e49ce9b8d2..d67211c9bc74 100644
--- a/hw/pci-host/designware.c
+++ b/hw/pci-host/designware.c
@@ -706,7 +706,7 @@ static void designware_pcie_host_realize(DeviceState *dev, Error **errp)
UINT64_MAX);
memory_region_add_subregion(&s->pci.address_space_root,
0x0, &s->pci.memory);
- address_space_init(&s->pci.address_space,
+ address_space_init(&s->pci.address_space, NULL,
&s->pci.address_space_root,
"pcie-bus-address-space");
pci_setup_iommu(pci->bus, &designware_iommu_ops, s);
diff --git a/hw/pci-host/dino.c b/hw/pci-host/dino.c
index 11b353be2eac..b78167fd2fcd 100644
--- a/hw/pci-host/dino.c
+++ b/hw/pci-host/dino.c
@@ -434,7 +434,7 @@ static void dino_pcihost_realize(DeviceState *dev, Error **errp)
memory_region_add_subregion(&s->bm, 0xfff00000,
&s->bm_cpu_alias);
- address_space_init(&s->bm_as, &s->bm, "pci-bm");
+ address_space_init(&s->bm_as, NULL, &s->bm, "pci-bm");
}
static void dino_pcihost_unrealize(DeviceState *dev)
diff --git a/hw/pci-host/gt64120.c b/hw/pci-host/gt64120.c
index b1d96f62fe94..68ad885edbe4 100644
--- a/hw/pci-host/gt64120.c
+++ b/hw/pci-host/gt64120.c
@@ -1198,7 +1198,7 @@ static void gt64120_realize(DeviceState *dev, Error **errp)
memory_region_init_io(&s->ISD_mem, OBJECT(dev), &isd_mem_ops, s,
"gt64120-isd", 0x1000);
memory_region_init(&s->pci0_mem, OBJECT(dev), "pci0-mem", 4 * GiB);
- address_space_init(&s->pci0_mem_as, &s->pci0_mem, "pci0-mem");
+ address_space_init(&s->pci0_mem_as, NULL, &s->pci0_mem, "pci0-mem");
phb->bus = pci_root_bus_new(dev, "pci",
&s->pci0_mem,
get_system_io(),
diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c
index 5d8383fac304..73592c9cbd3d 100644
--- a/hw/pci-host/pnv_phb3.c
+++ b/hw/pci-host/pnv_phb3.c
@@ -956,7 +956,7 @@ static AddressSpace *pnv_phb3_dma_iommu(PCIBus *bus, void *opaque, int devfn)
memory_region_init_iommu(&ds->dma_mr, sizeof(ds->dma_mr),
TYPE_PNV_PHB3_IOMMU_MEMORY_REGION,
OBJECT(phb), "phb3_iommu", UINT64_MAX);
- address_space_init(&ds->dma_as, MEMORY_REGION(&ds->dma_mr),
+ address_space_init(&ds->dma_as, NULL, MEMORY_REGION(&ds->dma_mr),
"phb3_iommu");
memory_region_init_io(&ds->msi32_mr, OBJECT(phb), &pnv_phb3_msi_ops,
ds, "msi32", 0x10000);
diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
index 18992054e831..9db9268358d1 100644
--- a/hw/pci-host/pnv_phb4.c
+++ b/hw/pci-host/pnv_phb4.c
@@ -1469,7 +1469,7 @@ static AddressSpace *pnv_phb4_dma_iommu(PCIBus *bus, void *opaque, int devfn)
memory_region_init_iommu(&ds->dma_mr, sizeof(ds->dma_mr),
TYPE_PNV_PHB4_IOMMU_MEMORY_REGION,
OBJECT(phb), name, UINT64_MAX);
- address_space_init(&ds->dma_as, MEMORY_REGION(&ds->dma_mr),
+ address_space_init(&ds->dma_as, NULL, MEMORY_REGION(&ds->dma_mr),
name);
memory_region_init_io(&ds->msi32_mr, OBJECT(phb), &pnv_phb4_msi_ops,
ds, "msi32", 0x10000);
diff --git a/hw/pci-host/ppc440_pcix.c b/hw/pci-host/ppc440_pcix.c
index 744b85e49cc4..3fe24d70ac30 100644
--- a/hw/pci-host/ppc440_pcix.c
+++ b/hw/pci-host/ppc440_pcix.c
@@ -502,7 +502,7 @@ static void ppc440_pcix_realize(DeviceState *dev, Error **errp)
memory_region_init(&s->bm, OBJECT(s), "bm-ppc440-pcix", UINT64_MAX);
memory_region_add_subregion(&s->bm, 0x0, &s->busmem);
- address_space_init(&s->bm_as, &s->bm, "pci-bm");
+ address_space_init(&s->bm_as, NULL, &s->bm, "pci-bm");
pci_setup_iommu(h->bus, &ppc440_iommu_ops, s);
memory_region_init(&s->container, OBJECT(s), "pci-container", PCI_ALL_SIZE);
diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
index 975d191ccb8e..eda168fb5955 100644
--- a/hw/pci-host/ppce500.c
+++ b/hw/pci-host/ppce500.c
@@ -470,7 +470,7 @@ static void e500_pcihost_realize(DeviceState *dev, Error **errp)
/* Set up PCI view of memory */
memory_region_init(&s->bm, OBJECT(s), "bm-e500", UINT64_MAX);
memory_region_add_subregion(&s->bm, 0x0, &s->busmem);
- address_space_init(&s->bm_as, &s->bm, "pci-bm");
+ address_space_init(&s->bm_as, NULL, &s->bm, "pci-bm");
pci_setup_iommu(b, &ppce500_iommu_ops, s);
pci_create_simple(b, 0, TYPE_PPC_E500_PCI_BRIDGE);
diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
index fd45acb7ebd6..5564b51d6755 100644
--- a/hw/pci-host/raven.c
+++ b/hw/pci-host/raven.c
@@ -214,7 +214,7 @@ static void raven_pcihost_realize(DeviceState *d, Error **errp)
memory_region_init_alias(mr, o, "bm-system", get_system_memory(),
0, 0x80000000);
memory_region_add_subregion(bm, 0x80000000, mr);
- address_space_init(&s->bm_as, bm, "raven-bm-as");
+ address_space_init(&s->bm_as, NULL, bm, "raven-bm-as");
pci_setup_iommu(h->bus, &raven_iommu_ops, s);
}
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 2b408c7ec336..340384a8876a 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1359,7 +1359,7 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev,
memory_region_init(&pci_dev->bus_master_container_region, OBJECT(pci_dev),
"bus master container", UINT64_MAX);
- address_space_init(&pci_dev->bus_master_as,
+ address_space_init(&pci_dev->bus_master_as, NULL,
&pci_dev->bus_master_container_region, pci_dev->name);
pci_dev->bus_master_as.max_bounce_buffer_size =
pci_dev->max_bounce_buffer_size;
diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
index 240d0f904de9..94b61b907ea2 100644
--- a/hw/pci/pci_bridge.c
+++ b/hw/pci/pci_bridge.c
@@ -388,12 +388,13 @@ void pci_bridge_initfn(PCIDevice *dev, const char *typename)
sec_bus->map_irq = br->map_irq ? br->map_irq : pci_swizzle_map_irq_fn;
sec_bus->address_space_mem = &br->address_space_mem;
memory_region_init(&br->address_space_mem, OBJECT(br), "pci_bridge_pci", UINT64_MAX);
- address_space_init(&br->as_mem, &br->address_space_mem,
+ address_space_init(&br->as_mem, NULL, &br->address_space_mem,
"pci_bridge_pci_mem");
sec_bus->address_space_io = &br->address_space_io;
memory_region_init(&br->address_space_io, OBJECT(br), "pci_bridge_io",
4 * GiB);
- address_space_init(&br->as_io, &br->address_space_io, "pci_bridge_pci_io");
+ address_space_init(&br->as_io, NULL, &br->address_space_io,
+ "pci_bridge_pci_io");
pci_bridge_region_update(br, true);
QLIST_INIT(&sec_bus->child);
QLIST_INSERT_HEAD(&parent->child, sec_bus, sibling);
diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c
index f6beba0917dd..373b5a8be573 100644
--- a/hw/ppc/pnv_lpc.c
+++ b/hw/ppc/pnv_lpc.c
@@ -799,7 +799,7 @@ static void pnv_lpc_realize(DeviceState *dev, Error **errp)
/* Create address space and backing MR for the OPB bus */
memory_region_init(&lpc->opb_mr, OBJECT(dev), "lpc-opb", 0x100000000ull);
- address_space_init(&lpc->opb_as, &lpc->opb_mr, "lpc-opb");
+ address_space_init(&lpc->opb_as, NULL, &lpc->opb_mr, "lpc-opb");
/*
* Create ISA IO, Mem, and FW space regions which are the root of
diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c
index fbfec829d5b6..58f86bcbd2a6 100644
--- a/hw/ppc/pnv_xscom.c
+++ b/hw/ppc/pnv_xscom.c
@@ -219,7 +219,7 @@ void pnv_xscom_init(PnvChip *chip, uint64_t size, hwaddr addr)
memory_region_add_subregion(get_system_memory(), addr, &chip->xscom_mmio);
memory_region_init(&chip->xscom, OBJECT(chip), name, size);
- address_space_init(&chip->xscom_as, &chip->xscom, name);
+ address_space_init(&chip->xscom_as, NULL, &chip->xscom, name);
g_free(name);
}
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index b4043ee752c5..13fc5c9aa8f2 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -1902,7 +1902,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp)
memory_region_init(&sphb->iommu_root, OBJECT(sphb),
namebuf, UINT64_MAX);
g_free(namebuf);
- address_space_init(&sphb->iommu_as, &sphb->iommu_root,
+ address_space_init(&sphb->iommu_as, NULL, &sphb->iommu_root,
sphb->dtbusname);
/*
diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
index 7759436a4f55..ebe4bad23668 100644
--- a/hw/ppc/spapr_vio.c
+++ b/hw/ppc/spapr_vio.c
@@ -529,7 +529,7 @@ static void spapr_vio_busdev_realize(DeviceState *qdev, Error **errp)
"iommu-spapr-bypass", get_system_memory(),
0, MACHINE(spapr)->ram_size);
memory_region_add_subregion_overlap(&dev->mrroot, 0, &dev->mrbypass, 1);
- address_space_init(&dev->as, &dev->mrroot, qdev->id);
+ address_space_init(&dev->as, NULL, &dev->mrroot, qdev->id);
dev->tcet = spapr_tce_new_table(qdev, liobn);
spapr_tce_table_enable(dev->tcet, SPAPR_TCE_PAGE_SHIFT, 0,
diff --git a/hw/remote/iommu.c b/hw/remote/iommu.c
index 3e0758a21ed6..aac5c178ec81 100644
--- a/hw/remote/iommu.c
+++ b/hw/remote/iommu.c
@@ -54,7 +54,7 @@ static AddressSpace *remote_iommu_find_add_as(PCIBus *pci_bus,
if (!elem->mr) {
elem->mr = MEMORY_REGION(object_new(TYPE_MEMORY_REGION));
memory_region_set_size(elem->mr, UINT64_MAX);
- address_space_init(&elem->as, elem->mr, NULL);
+ address_space_init(&elem->as, NULL, elem->mr, NULL);
}
qemu_mutex_unlock(&iommu->lock);
diff --git a/hw/riscv/riscv-iommu.c b/hw/riscv/riscv-iommu.c
index 96a7fbdefcf3..aed84d87a823 100644
--- a/hw/riscv/riscv-iommu.c
+++ b/hw/riscv/riscv-iommu.c
@@ -1221,7 +1221,8 @@ static AddressSpace *riscv_iommu_space(RISCVIOMMUState *s, uint32_t devid)
memory_region_init_iommu(&as->iova_mr, sizeof(as->iova_mr),
TYPE_RISCV_IOMMU_MEMORY_REGION,
OBJECT(as), "riscv_iommu", UINT64_MAX);
- address_space_init(&as->iova_as, MEMORY_REGION(&as->iova_mr), name);
+ address_space_init(&as->iova_as, NULL, MEMORY_REGION(&as->iova_mr),
+ name);
QLIST_INSERT_HEAD(&s->spaces, as, list);
@@ -2426,7 +2427,7 @@ static void riscv_iommu_realize(DeviceState *dev, Error **errp)
/* Memory region for downstream access, if specified. */
if (s->target_mr) {
s->target_as = g_new0(AddressSpace, 1);
- address_space_init(s->target_as, s->target_mr,
+ address_space_init(s->target_as, NULL, s->target_mr,
"riscv-iommu-downstream");
} else {
/* Fallback to global system memory. */
@@ -2436,7 +2437,7 @@ static void riscv_iommu_realize(DeviceState *dev, Error **errp)
/* Memory region for untranslated MRIF/MSI writes */
memory_region_init_io(&s->trap_mr, OBJECT(dev), &riscv_iommu_trap_ops, s,
"riscv-iommu-trap", ~0ULL);
- address_space_init(&s->trap_as, &s->trap_mr, "riscv-iommu-trap-as");
+ address_space_init(&s->trap_as, NULL, &s->trap_mr, "riscv-iommu-trap-as");
if (s->cap & RISCV_IOMMU_CAP_HPM) {
s->hpm_timer =
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index f87d2748b637..67fce1c133b0 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -628,7 +628,7 @@ static S390PCIIOMMU *s390_pci_get_iommu(S390pciState *s, PCIBus *bus,
PCI_SLOT(devfn),
PCI_FUNC(devfn));
memory_region_init(&iommu->mr, OBJECT(iommu), mr_name, UINT64_MAX);
- address_space_init(&iommu->as, &iommu->mr, as_name);
+ address_space_init(&iommu->as, NULL, &iommu->mr, as_name);
iommu->iotlb = g_hash_table_new_full(g_int64_hash, g_int64_equal,
NULL, g_free);
table->iommu[PCI_SLOT(devfn)] = iommu;
diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
index 9ea4aa0a853a..ee21b3c0d08a 100644
--- a/hw/scsi/lsi53c895a.c
+++ b/hw/scsi/lsi53c895a.c
@@ -2356,7 +2356,8 @@ static void lsi_scsi_realize(PCIDevice *dev, Error **errp)
s->ram_io.disable_reentrancy_guard = true;
s->mmio_io.disable_reentrancy_guard = true;
- address_space_init(&s->pci_io_as, pci_address_space_io(dev), "lsi-pci-io");
+ address_space_init(&s->pci_io_as, NULL, pci_address_space_io(dev),
+ "lsi-pci-io");
qdev_init_gpio_out(d, &s->ext_irq, 1);
pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io_io);
diff --git a/hw/sd/allwinner-sdhost.c b/hw/sd/allwinner-sdhost.c
index 9d61b372e706..158d434e7fde 100644
--- a/hw/sd/allwinner-sdhost.c
+++ b/hw/sd/allwinner-sdhost.c
@@ -832,7 +832,7 @@ static void allwinner_sdhost_realize(DeviceState *dev, Error **errp)
return;
}
- address_space_init(&s->dma_as, s->dma_mr, "sdhost-dma");
+ address_space_init(&s->dma_as, NULL, s->dma_mr, "sdhost-dma");
}
static void allwinner_sdhost_reset(DeviceState *dev)
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 89b595ce4a5a..c6a203744463 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1594,7 +1594,7 @@ static void sdhci_sysbus_realize(DeviceState *dev, Error **errp)
if (s->dma_mr) {
s->dma_as = &s->sysbus_dma_as;
- address_space_init(s->dma_as, s->dma_mr, "sdhci-dma");
+ address_space_init(s->dma_as, NULL, s->dma_mr, "sdhci-dma");
} else {
/* use system_memory() if property "dma" not set */
s->dma_as = &address_space_memory;
diff --git a/hw/sparc/sun4m_iommu.c b/hw/sparc/sun4m_iommu.c
index a7ff36ee78c1..7b8d78273b97 100644
--- a/hw/sparc/sun4m_iommu.c
+++ b/hw/sparc/sun4m_iommu.c
@@ -359,7 +359,8 @@ static void iommu_init(Object *obj)
memory_region_init_iommu(&s->iommu, sizeof(s->iommu),
TYPE_SUN4M_IOMMU_MEMORY_REGION, OBJECT(dev),
"iommu-sun4m", UINT64_MAX);
- address_space_init(&s->iommu_as, MEMORY_REGION(&s->iommu), "iommu-as");
+ address_space_init(&s->iommu_as, NULL, MEMORY_REGION(&s->iommu),
+ "iommu-as");
sysbus_init_irq(dev, &s->irq);
diff --git a/hw/sparc64/sun4u_iommu.c b/hw/sparc64/sun4u_iommu.c
index 14645f475a09..0a5703044e7a 100644
--- a/hw/sparc64/sun4u_iommu.c
+++ b/hw/sparc64/sun4u_iommu.c
@@ -298,7 +298,8 @@ static void iommu_init(Object *obj)
memory_region_init_iommu(&s->iommu, sizeof(s->iommu),
TYPE_SUN4U_IOMMU_MEMORY_REGION, OBJECT(s),
"iommu-sun4u", UINT64_MAX);
- address_space_init(&s->iommu_as, MEMORY_REGION(&s->iommu), "iommu-as");
+ address_space_init(&s->iommu_as, NULL, MEMORY_REGION(&s->iommu),
+ "iommu-as");
memory_region_init_io(&s->iomem, obj, &iommu_mem_ops, s, "iommu",
IOMMU_NREGS * sizeof(uint64_t));
diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index e33496f50298..7e41d4210330 100644
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -1191,9 +1191,9 @@ static void aspeed_smc_dma_setup(AspeedSMCState *s, Error **errp)
return;
}
- address_space_init(&s->flash_as, &s->mmio_flash,
+ address_space_init(&s->flash_as, NULL, &s->mmio_flash,
TYPE_ASPEED_SMC ".dma-flash");
- address_space_init(&s->dram_as, s->dram_mr,
+ address_space_init(&s->dram_as, NULL, s->dram_mr,
TYPE_ASPEED_SMC ".dma-dram");
}
diff --git a/hw/usb/hcd-dwc2.c b/hw/usb/hcd-dwc2.c
index 83864505bb89..8aaa696dd4de 100644
--- a/hw/usb/hcd-dwc2.c
+++ b/hw/usb/hcd-dwc2.c
@@ -1351,7 +1351,7 @@ static void dwc2_realize(DeviceState *dev, Error **errp)
obj = object_property_get_link(OBJECT(dev), "dma-mr", &error_abort);
s->dma_mr = MEMORY_REGION(obj);
- address_space_init(&s->dma_as, s->dma_mr, "dwc2");
+ address_space_init(&s->dma_as, NULL, s->dma_mr, "dwc2");
usb_bus_new(&s->bus, sizeof(s->bus), &dwc2_bus_ops, dev);
usb_register_port(&s->bus, &s->uport, s, 0, &dwc2_port_ops,
diff --git a/hw/usb/hcd-xhci-sysbus.c b/hw/usb/hcd-xhci-sysbus.c
index 244698e5f2b9..6d060062ab86 100644
--- a/hw/usb/hcd-xhci-sysbus.c
+++ b/hw/usb/hcd-xhci-sysbus.c
@@ -45,7 +45,7 @@ static void xhci_sysbus_realize(DeviceState *dev, Error **errp)
s->xhci.numintrs);
if (s->xhci.dma_mr) {
s->xhci.as = g_malloc0(sizeof(AddressSpace));
- address_space_init(s->xhci.as, s->xhci.dma_mr, NULL);
+ address_space_init(s->xhci.as, NULL, s->xhci.dma_mr, NULL);
} else {
s->xhci.as = &address_space_memory;
}
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index 3500f1b0820c..d9713a38bfae 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -430,7 +430,7 @@ static AddressSpace *virtio_iommu_find_add_as(PCIBus *bus, void *opaque,
trace_virtio_iommu_init_iommu_mr(name);
memory_region_init(&sdev->root, OBJECT(s), name, UINT64_MAX);
- address_space_init(&sdev->as, &sdev->root, TYPE_VIRTIO_IOMMU);
+ address_space_init(&sdev->as, NULL, &sdev->root, TYPE_VIRTIO_IOMMU);
add_prop_resv_regions(sdev);
/*
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 767216d79599..a3cd8f642706 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -2062,7 +2062,7 @@ 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, &proxy->io_bar,
+ address_space_init(&proxy->modern_cfg_io_as, NULL, &proxy->io_bar,
"virtio-pci-cfg-io-as");
pci_register_bar(&proxy->pci_dev, proxy->modern_io_bar_idx,
@@ -2199,7 +2199,7 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)
/* PCI BAR regions must be powers of 2 */
pow2ceil(proxy->notify.offset + proxy->notify.size));
- address_space_init(&proxy->modern_cfg_mem_as, &proxy->modern_bar,
+ address_space_init(&proxy->modern_cfg_mem_as, NULL, &proxy->modern_bar,
"virtio-pci-cfg-mem-as");
if (proxy->disable_legacy == ON_OFF_AUTO_AUTO) {
diff --git a/system/memory.c b/system/memory.c
index 56465479406f..7a77ba0f1797 100644
--- a/system/memory.c
+++ b/system/memory.c
@@ -3203,8 +3203,14 @@ void address_space_remove_listeners(AddressSpace *as)
}
}
-void address_space_init(AddressSpace *as, MemoryRegion *root, const char *name)
+void address_space_init(AddressSpace *as, Object *parent, MemoryRegion *root,
+ const char *name)
{
+ if (parent) {
+ object_initialize_child(parent, name, as, TYPE_ADDRESS_SPACE);
+ }
+
+ as->qom = parent;
memory_region_ref(root);
as->root = root;
as->current_map = NULL;
@@ -3221,8 +3227,10 @@ void address_space_init(AddressSpace *as, MemoryRegion *root, const char *name)
address_space_update_ioeventfds(as);
}
-static void do_address_space_destroy(AddressSpace *as)
+static void do_address_space_destroy(struct rcu_head *head)
{
+ AddressSpace *as = container_of(head, AddressSpace, rcu);
+
assert(qatomic_read(&as->bounce_buffer_size) == 0);
assert(QLIST_EMPTY(&as->map_client_list));
qemu_mutex_destroy(&as->map_client_list_lock);
@@ -3235,6 +3243,11 @@ static void do_address_space_destroy(AddressSpace *as)
memory_region_unref(as->root);
}
+static void address_space_finalize(Object *obj)
+{
+ address_space_destroy(ADDRESS_SPACE(obj));
+}
+
void address_space_destroy(AddressSpace *as)
{
MemoryRegion *root = as->root;
@@ -3250,7 +3263,20 @@ void address_space_destroy(AddressSpace *as)
* values to expire before freeing the data.
*/
as->root = root;
- call_rcu(as, do_address_space_destroy, rcu);
+ call_rcu1(&as->rcu, do_address_space_destroy);
+}
+
+char *address_space_get_path(AddressSpace *as)
+{
+ char *path;
+
+ if (!as->qom) {
+ return as->name;
+ }
+
+ path = object_get_canonical_path(OBJECT(as));
+
+ return path ? path : g_strdup("orphan");
}
static const char *memory_region_type(MemoryRegion *mr)
@@ -3455,9 +3481,12 @@ static void mtree_print_flatview(gpointer key, gpointer value,
++fvi->counter;
for (i = 0; i < fv_address_spaces->len; ++i) {
+ g_autofree char *path = NULL;
+
as = g_array_index(fv_address_spaces, AddressSpace*, i);
+ path = address_space_get_path(as);
qemu_printf(" AS \"%s\", root: %s",
- as->name, memory_region_name(as->root));
+ path, memory_region_name(as->root));
if (as->root->alias) {
qemu_printf(", alias %s", memory_region_name(as->root->alias));
}
@@ -3580,19 +3609,14 @@ struct AddressSpaceInfo {
};
/* Returns negative value if a < b; zero if a = b; positive value if a > b. */
-static gint address_space_compare_name(gconstpointer a, gconstpointer b)
+static gint address_space_compare_path(gconstpointer a, gconstpointer b)
{
- const AddressSpace *as_a = a;
- const AddressSpace *as_b = b;
-
- return g_strcmp0(as_a->name, as_b->name);
+ return g_strcmp0(a, b);
}
-static void mtree_print_as_name(gpointer data, gpointer user_data)
+static void mtree_print_as_path(gpointer data, gpointer user_data)
{
- AddressSpace *as = data;
-
- qemu_printf("address-space: %s\n", as->name);
+ qemu_printf("address-space: %s\n", (char *)data);
}
static void mtree_print_as(gpointer key, gpointer value, gpointer user_data)
@@ -3601,7 +3625,7 @@ static void mtree_print_as(gpointer key, gpointer value, gpointer user_data)
GSList *as_same_root_mr_list = value;
struct AddressSpaceInfo *asi = user_data;
- g_slist_foreach(as_same_root_mr_list, mtree_print_as_name, NULL);
+ g_slist_foreach(as_same_root_mr_list, mtree_print_as_path, NULL);
mtree_print_mr(mr, 1, 0, asi->ml_head, asi->owner, asi->disabled);
qemu_printf("\n");
}
@@ -3611,7 +3635,7 @@ static gboolean mtree_info_as_free(gpointer key, gpointer value,
{
GSList *as_same_root_mr_list = value;
- g_slist_free(as_same_root_mr_list);
+ g_slist_free_full(as_same_root_mr_list, g_free);
return true;
}
@@ -3632,10 +3656,12 @@ static void mtree_info_as(bool dispatch_tree, bool owner, bool disabled)
QTAILQ_INIT(&ml_head);
QTAILQ_FOREACH(as, &address_spaces, address_spaces_link) {
+ char *path = address_space_get_path(as);
+
/* Create hashtable, key=AS root MR, value = list of AS */
as_same_root_mr_list = g_hash_table_lookup(views, as->root);
- as_same_root_mr_list = g_slist_insert_sorted(as_same_root_mr_list, as,
- address_space_compare_name);
+ as_same_root_mr_list = g_slist_insert_sorted(as_same_root_mr_list, path,
+ address_space_compare_path);
g_hash_table_insert(views, as->root, as_same_root_mr_list);
}
@@ -3797,11 +3823,18 @@ static const TypeInfo ram_discard_manager_info = {
.class_size = sizeof(RamDiscardManagerClass),
};
+static const TypeInfo address_space_info = {
+ .parent = TYPE_OBJECT,
+ .name = TYPE_ADDRESS_SPACE,
+ .instance_finalize = address_space_finalize
+};
+
static void memory_register_types(void)
{
type_register_static(&memory_region_info);
type_register_static(&iommu_memory_region_info);
type_register_static(&ram_discard_manager_info);
+ type_register_static(&address_space_info);
}
type_init(memory_register_types)
diff --git a/system/physmem.c b/system/physmem.c
index e5dd760e0bca..6190eca7daed 100644
--- a/system/physmem.c
+++ b/system/physmem.c
@@ -782,7 +782,7 @@ void cpu_address_space_init(CPUState *cpu, int asidx,
assert(mr);
as_name = g_strdup_printf("%s-%d", prefix, cpu->cpu_index);
- address_space_init(as, mr, as_name);
+ address_space_init(as, NULL, mr, as_name);
g_free(as_name);
/* Target code should have set num_ases before calling us */
@@ -812,6 +812,11 @@ void cpu_address_space_init(CPUState *cpu, int asidx,
}
}
+static void address_space_free(struct rcu_head *head)
+{
+ g_free(container_of(head, AddressSpace, rcu));
+}
+
void cpu_address_space_destroy(CPUState *cpu, int asidx)
{
CPUAddressSpace *cpuas;
@@ -827,7 +832,7 @@ void cpu_address_space_destroy(CPUState *cpu, int asidx)
}
address_space_destroy(cpuas->as);
- g_free_rcu(cpuas->as, rcu);
+ call_rcu1(&cpuas->as->rcu, address_space_free);
if (asidx == 0) {
/* reset the convenience alias for address space 0 */
@@ -2812,12 +2817,12 @@ static void memory_map_init(void)
system_memory = g_malloc(sizeof(*system_memory));
memory_region_init(system_memory, NULL, "system", UINT64_MAX);
- address_space_init(&address_space_memory, system_memory, "memory");
+ address_space_init(&address_space_memory, NULL, system_memory, "memory");
system_io = g_malloc(sizeof(*system_io));
memory_region_init_io(system_io, NULL, &unassigned_io_ops, NULL, "io",
65536);
- address_space_init(&address_space_io, system_io, "I/O");
+ address_space_init(&address_space_io, NULL, system_io, "I/O");
}
MemoryRegion *get_system_memory(void)
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 369626f8c8d7..2ce071dfafb2 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -2725,7 +2725,7 @@ static void register_smram_listener(Notifier *n, void *unused)
memory_region_set_enabled(smram, true);
}
- address_space_init(&smram_address_space, &smram_as_root, "KVM-SMRAM");
+ address_space_init(&smram_address_space, NULL, &smram_as_root, "KVM-SMRAM");
kvm_memory_listener_register(kvm_state, &smram_listener,
&smram_address_space, 1, "kvm-smram");
}
diff --git a/target/mips/cpu.c b/target/mips/cpu.c
index 1f6c41fd3401..b13df32e6479 100644
--- a/target/mips/cpu.c
+++ b/target/mips/cpu.c
@@ -505,7 +505,7 @@ static void mips_cpu_initfn(Object *obj)
if (mcc->cpu_def->lcsr_cpucfg2 & (1 << CPUCFG2_LCSRP)) {
memory_region_init_io(&env->iocsr.mr, OBJECT(cpu), NULL,
env, "iocsr", UINT64_MAX);
- address_space_init(&env->iocsr.as,
+ address_space_init(&env->iocsr.as, NULL,
&env->iocsr.mr, "IOCSR");
}
#endif
diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c
index ea9b6df3aa24..26a1c87a7856 100644
--- a/target/xtensa/cpu.c
+++ b/target/xtensa/cpu.c
@@ -272,7 +272,7 @@ static void xtensa_cpu_initfn(Object *obj)
env->system_er = g_malloc(sizeof(*env->system_er));
memory_region_init_io(env->system_er, obj, NULL, env, "er",
UINT64_C(0x100000000));
- address_space_init(env->address_space_er, env->system_er, "ER");
+ address_space_init(env->address_space_er, NULL, env->system_er, "ER");
cpu->clock = qdev_init_clock_in(DEVICE(obj), "clk-in", NULL, cpu, 0);
clock_set_hz(cpu->clock, env->config->clock_freq_khz * 1000);
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 02/35] hw/core/loader: Use address_space_get_path()
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
2025-09-17 12:56 ` [PATCH 01/35] " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 15:18 ` Richard Henderson
2025-09-17 12:56 ` [PATCH 03/35] vfio: " Akihiko Odaki
` (33 subsequent siblings)
35 siblings, 1 reply; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
The name field of an QOM-ified AddressSpace represents a property name,
which may not be sufficient to identify the AddressSpace. Use
address_space_get_path() instead.
Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/core/loader.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 524af6f14a09..1ee603f19c90 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -1258,10 +1258,10 @@ static bool roms_overlap(Rom *last_rom, Rom *this_rom)
last_rom->addr + last_rom->romsize > this_rom->addr;
}
-static const char *rom_as_name(Rom *rom)
+static const char *rom_as_path(Rom *rom)
{
- const char *name = rom->as ? rom->as->name : NULL;
- return name ?: "anonymous";
+ const char *path = rom->as ? address_space_get_path(rom->as) : NULL;
+ return path ?: "anonymous";
}
static void rom_print_overlap_error_header(void)
@@ -1280,7 +1280,7 @@ static void rom_print_one_overlap_error(Rom *last_rom, Rom *rom)
{
error_printf(
"\nThe following two regions overlap (in the %s address space):\n",
- rom_as_name(rom));
+ rom_as_path(rom));
error_printf(
" %s (addresses 0x" HWADDR_FMT_plx " - 0x" HWADDR_FMT_plx ")\n",
last_rom->name, last_rom->addr, last_rom->addr + last_rom->romsize);
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 03/35] vfio: Use address_space_get_path()
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
2025-09-17 12:56 ` [PATCH 01/35] " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 02/35] hw/core/loader: Use address_space_get_path() Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-18 9:52 ` Cédric Le Goater
2025-09-17 12:56 ` [PATCH 04/35] hw/alpha: QOM-ify AddressSpace Akihiko Odaki
` (32 subsequent siblings)
35 siblings, 1 reply; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
The name field of an QOM-ified AddressSpace represents a property name,
which may not be sufficient to identify the AddressSpace. Use
address_space_get_path() instead.
Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/vfio/listener.c | 8 ++++++--
hw/virtio/vhost-vdpa.c | 4 +++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/hw/vfio/listener.c b/hw/vfio/listener.c
index f498e23a9374..d0418db28c8b 100644
--- a/hw/vfio/listener.c
+++ b/hw/vfio/listener.c
@@ -137,9 +137,11 @@ static void vfio_iommu_map_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb)
iova, iova + iotlb->addr_mask);
if (iotlb->target_as != &address_space_memory) {
+ g_autofree char *path = address_space_get_path(iotlb->target_as);
+
error_setg(&local_err,
"Wrong target AS \"%s\", only system memory is allowed",
- iotlb->target_as->name ? iotlb->target_as->name : "none");
+ path);
if (migration_is_running()) {
migration_file_set_error(-EINVAL, local_err);
} else {
@@ -1060,9 +1062,11 @@ static void vfio_iommu_map_dirty_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb)
trace_vfio_iommu_map_dirty_notify(iova, iova + iotlb->addr_mask);
if (iotlb->target_as != &address_space_memory) {
+ g_autofree char *path = address_space_get_path(iotlb->target_as);
+
error_setg(&local_err,
"Wrong target AS \"%s\", only system memory is allowed",
- iotlb->target_as->name ? iotlb->target_as->name : "none");
+ path);
goto out;
}
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 7061b6e1a386..7ed639358458 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -213,8 +213,10 @@ static void vhost_vdpa_iommu_map_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb)
hwaddr xlat;
if (iotlb->target_as != &address_space_memory) {
+ g_autofree char *path = address_space_get_path(iotlb->target_as);
+
error_report("Wrong target AS \"%s\", only system memory is allowed",
- iotlb->target_as->name ? iotlb->target_as->name : "none");
+ path);
return;
}
RCU_READ_LOCK_GUARD();
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 04/35] hw/alpha: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (2 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 03/35] vfio: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 15:56 ` Richard Henderson
2025-09-17 12:56 ` [PATCH 05/35] hw/arm: " Akihiko Odaki
` (31 subsequent siblings)
35 siblings, 1 reply; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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.
Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/alpha/typhoon.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index d2307b076897..7c38be2378ed 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -900,8 +900,8 @@ PCIBus *typhoon_init(MemoryRegion *ram, qemu_irq *p_isa_irq,
memory_region_init_iommu(&s->pchip.iommu, sizeof(s->pchip.iommu),
TYPE_TYPHOON_IOMMU_MEMORY_REGION, OBJECT(s),
"iommu-typhoon", UINT64_MAX);
- address_space_init(&s->pchip.iommu_as, NULL, MEMORY_REGION(&s->pchip.iommu),
- "pchip0-pci");
+ address_space_init(&s->pchip.iommu_as, OBJECT(s),
+ MEMORY_REGION(&s->pchip.iommu), "pchip0-pci");
pci_setup_iommu(b, &typhoon_iommu_ops, s);
/* Pchip0 PCI special/interrupt acknowledge, 0x801.F800.0000, 64MB. */
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 05/35] hw/arm: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (3 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 04/35] hw/alpha: QOM-ify AddressSpace Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 15:57 ` Richard Henderson
2025-09-17 12:56 ` [PATCH 06/35] hw/display: " Akihiko Odaki
` (30 subsequent siblings)
35 siblings, 1 reply; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/arm/armv7m.c | 2 +-
hw/arm/aspeed_ast27x0.c | 2 +-
hw/arm/smmu-common.c | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index 7fa854bc14df..54d0d9f78207 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -117,7 +117,7 @@ static void bitband_realize(DeviceState *dev, Error **errp)
return;
}
- address_space_init(&s->source_as, NULL, s->source_memory, "bitband-source");
+ address_space_init(&s->source_as, OBJECT(s), s->source_memory, "as");
}
/* Board init. */
diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c
index f8c0ac5f87df..7fe097ad3f11 100644
--- a/hw/arm/aspeed_ast27x0.c
+++ b/hw/arm/aspeed_ast27x0.c
@@ -387,7 +387,7 @@ static bool aspeed_soc_ast2700_dram_init(DeviceState *dev, Error **errp)
memory_region_init(&s->dram_container, OBJECT(s), "ram-container",
ram_size);
memory_region_add_subregion(&s->dram_container, 0, s->dram_mr);
- address_space_init(&s->dram_as, NULL, s->dram_mr, "dram");
+ address_space_init(&s->dram_as, OBJECT(s), s->dram_mr, "dram-as");
/*
* Add a memory region beyond the RAM region to emulate
diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c
index 081c50750947..7c1648165b9f 100644
--- a/hw/arm/smmu-common.c
+++ b/hw/arm/smmu-common.c
@@ -863,6 +863,7 @@ static AddressSpace *smmu_find_add_as(PCIBus *bus, void *opaque, int devfn)
sdev = sbus->pbdev[devfn];
if (!sdev) {
char *name = g_strdup_printf("%s-%d-%d", s->mrtypename, devfn, index++);
+ g_autofree char *as_name = g_strconcat(name, "-as", NULL);
sdev = sbus->pbdev[devfn] = g_new0(SMMUDevice, 1);
@@ -873,8 +874,8 @@ static AddressSpace *smmu_find_add_as(PCIBus *bus, void *opaque, int devfn)
memory_region_init_iommu(&sdev->iommu, sizeof(sdev->iommu),
s->mrtypename,
OBJECT(s), name, UINT64_MAX);
- address_space_init(&sdev->as, NULL,
- MEMORY_REGION(&sdev->iommu), name);
+ address_space_init(&sdev->as, OBJECT(s),
+ MEMORY_REGION(&sdev->iommu), as_name);
trace_smmu_add_mr(name);
g_free(name);
}
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 06/35] hw/display: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (4 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 05/35] hw/arm: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 07/35] hw/dma: " Akihiko Odaki
` (29 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/display/artist.c | 2 +-
hw/display/bcm2835_fb.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/display/artist.c b/hw/display/artist.c
index 42905563ad49..b47ca875f93a 100644
--- a/hw/display/artist.c
+++ b/hw/display/artist.c
@@ -1391,7 +1391,7 @@ static void artist_realizefn(DeviceState *dev, Error **errp)
}
memory_region_init(&s->mem_as_root, OBJECT(dev), "artist", ~0ull);
- address_space_init(&s->as, NULL, &s->mem_as_root, "artist");
+ address_space_init(&s->as, OBJECT(s), &s->mem_as_root, "as");
artist_create_buffer(s, "cmap", &offset, ARTIST_BUFFER_CMAP, 2048, 4);
artist_create_buffer(s, "ap", &offset, ARTIST_BUFFER_AP,
diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c
index c6710bdc0700..cc1567895522 100644
--- a/hw/display/bcm2835_fb.c
+++ b/hw/display/bcm2835_fb.c
@@ -421,7 +421,7 @@ static void bcm2835_fb_realize(DeviceState *dev, Error **errp)
s->initial_config.base = s->vcram_base + BCM2835_FB_OFFSET;
s->dma_mr = MEMORY_REGION(obj);
- address_space_init(&s->dma_as, NULL, s->dma_mr, TYPE_BCM2835_FB "-memory");
+ address_space_init(&s->dma_as, OBJECT(s), s->dma_mr, "as");
bcm2835_fb_reset(dev);
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 07/35] hw/dma: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (5 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 06/35] hw/display: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 08/35] hw/fsi: " Akihiko Odaki
` (28 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/dma/bcm2835_dma.c | 2 +-
hw/dma/pl080.c | 3 +--
hw/dma/pl330.c | 3 +--
hw/dma/rc4030.c | 5 ++---
hw/dma/xilinx_axidma.c | 4 ++--
hw/dma/xlnx-zdma.c | 2 +-
hw/dma/xlnx_csu_dma.c | 2 +-
7 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/hw/dma/bcm2835_dma.c b/hw/dma/bcm2835_dma.c
index ebef56d8d613..8ff266c48882 100644
--- a/hw/dma/bcm2835_dma.c
+++ b/hw/dma/bcm2835_dma.c
@@ -380,7 +380,7 @@ static void bcm2835_dma_realize(DeviceState *dev, Error **errp)
obj = object_property_get_link(OBJECT(dev), "dma-mr", &error_abort);
s->dma_mr = MEMORY_REGION(obj);
- address_space_init(&s->dma_as, NULL, s->dma_mr, TYPE_BCM2835_DMA "-memory");
+ address_space_init(&s->dma_as, OBJECT(s), s->dma_mr, "as");
bcm2835_dma_reset(dev);
}
diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c
index cf02a484d6a6..1b6e9f741330 100644
--- a/hw/dma/pl080.c
+++ b/hw/dma/pl080.c
@@ -398,8 +398,7 @@ static void pl080_realize(DeviceState *dev, Error **errp)
return;
}
- address_space_init(&s->downstream_as, NULL, s->downstream,
- "pl080-downstream");
+ address_space_init(&s->downstream_as, OBJECT(s), s->downstream, "as");
}
static void pl081_init(Object *obj)
diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
index 4733799f4045..e9bf8f86ee5a 100644
--- a/hw/dma/pl330.c
+++ b/hw/dma/pl330.c
@@ -1569,8 +1569,7 @@ static void pl330_realize(DeviceState *dev, Error **errp)
s->mem_as = &address_space_memory;
} else {
s->mem_as = g_new0(AddressSpace, 1);
- address_space_init(s->mem_as, NULL, s->mem_mr,
- memory_region_name(s->mem_mr));
+ address_space_init(s->mem_as, OBJECT(s), s->mem_mr, "as");
}
s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, pl330_exec_cycle_timer, s);
diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c
index cf76f90f4d3b..65f2c7f1bd19 100644
--- a/hw/dma/rc4030.c
+++ b/hw/dma/rc4030.c
@@ -688,8 +688,7 @@ static void rc4030_realize(DeviceState *dev, Error **errp)
memory_region_init_iommu(&s->dma_mr, sizeof(s->dma_mr),
TYPE_RC4030_IOMMU_MEMORY_REGION,
o, "rc4030.dma", 4 * GiB);
- address_space_init(&s->dma_as, NULL, MEMORY_REGION(&s->dma_mr),
- "rc4030-dma");
+ address_space_init(&s->dma_as, o, MEMORY_REGION(&s->dma_mr), "as");
}
static void rc4030_unrealize(DeviceState *dev)
@@ -698,7 +697,7 @@ static void rc4030_unrealize(DeviceState *dev)
timer_free(s->periodic_timer);
- address_space_destroy(&s->dma_as);
+ object_unparent(OBJECT(&s->dma_as));
object_unparent(OBJECT(&s->dma_mr));
}
diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index 0f340abc2c6f..5f85b686fd18 100644
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -588,8 +588,8 @@ static void xilinx_axidma_realize(DeviceState *dev, Error **errp)
ptimer_transaction_commit(st->ptimer);
}
- address_space_init(&s->as, NULL,
- s->dma_mr ? s->dma_mr : get_system_memory(), "dma");
+ address_space_init(&s->as, OBJECT(s),
+ s->dma_mr ? s->dma_mr : get_system_memory(), "as");
}
static void xilinx_axidma_init(Object *obj)
diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c
index 9b9ccd1e3c08..ad93bab5d4fa 100644
--- a/hw/dma/xlnx-zdma.c
+++ b/hw/dma/xlnx-zdma.c
@@ -769,7 +769,7 @@ static void zdma_realize(DeviceState *dev, Error **errp)
error_setg(errp, TYPE_XLNX_ZDMA " 'dma' link not set");
return;
}
- address_space_init(&s->dma_as, NULL, s->dma_mr, "zdma-dma");
+ address_space_init(&s->dma_as, OBJECT(s), s->dma_mr, "as");
for (i = 0; i < ARRAY_SIZE(zdma_regs_info); ++i) {
RegisterInfo *r = &s->regs_info[zdma_regs_info[i].addr / 4];
diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c
index 8b88392bb92b..8a0ec5bc5b94 100644
--- a/hw/dma/xlnx_csu_dma.c
+++ b/hw/dma/xlnx_csu_dma.c
@@ -653,7 +653,7 @@ static void xlnx_csu_dma_realize(DeviceState *dev, Error **errp)
error_setg(errp, TYPE_XLNX_CSU_DMA " 'dma' link not set");
return;
}
- address_space_init(&s->dma_as, NULL, s->dma_mr, "csu-dma");
+ address_space_init(&s->dma_as, OBJECT(s), s->dma_mr, "as");
reg_array =
register_init_block32(dev, xlnx_csu_dma_regs_info[!!s->is_dst],
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 08/35] hw/fsi: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (6 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 07/35] hw/dma: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 09/35] hw/i2c: " Akihiko Odaki
` (27 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/fsi/aspeed_apb2opb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/fsi/aspeed_apb2opb.c b/hw/fsi/aspeed_apb2opb.c
index 8eda6f67cfd9..d337f567c6f5 100644
--- a/hw/fsi/aspeed_apb2opb.c
+++ b/hw/fsi/aspeed_apb2opb.c
@@ -349,7 +349,7 @@ static void fsi_opb_init(Object *o)
OPBus *opb = OP_BUS(o);
memory_region_init(&opb->mr, 0, TYPE_FSI_OPB, UINT32_MAX);
- address_space_init(&opb->as, NULL, &opb->mr, TYPE_FSI_OPB);
+ address_space_init(&opb->as, OBJECT(opb), &opb->mr, "as");
}
static const TypeInfo opb_info = {
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 09/35] hw/i2c: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (7 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 08/35] hw/fsi: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 10/35] hw/i386: " Akihiko Odaki
` (26 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/i2c/aspeed_i2c.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c
index 9d216b3f0ea3..d1d980a8961f 100644
--- a/hw/i2c/aspeed_i2c.c
+++ b/hw/i2c/aspeed_i2c.c
@@ -1253,8 +1253,7 @@ static void aspeed_i2c_realize(DeviceState *dev, Error **errp)
return;
}
- address_space_init(&s->dram_as, NULL, s->dram_mr,
- TYPE_ASPEED_I2C "-dma-dram");
+ address_space_init(&s->dram_as, OBJECT(s), s->dram_mr, "as");
}
}
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 10/35] hw/i386: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (8 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 09/35] hw/i2c: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-18 5:53 ` CLEMENT MATHIEU--DRIF
2025-09-17 12:56 ` [PATCH 11/35] hw/intc: " Akihiko Odaki
` (25 subsequent siblings)
35 siblings, 1 reply; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/i386/amd_iommu.c | 5 +++--
hw/i386/intel_iommu.c | 6 ++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c
index af239390ba04..541b9a8c89e1 100644
--- a/hw/i386/amd_iommu.c
+++ b/hw/i386/amd_iommu.c
@@ -1494,7 +1494,7 @@ static AddressSpace *amdvi_host_dma_iommu(PCIBus *bus, void *opaque, int devfn)
/* set up AMD-Vi region */
if (!iommu_as[devfn]) {
- snprintf(name, sizeof(name), "amd_iommu_devfn_%d", devfn);
+ snprintf(name, sizeof(name), "as-%d", devfn);
iommu_as[devfn] = g_new0(AMDVIAddressSpace, 1);
iommu_as[devfn]->bus_num = (uint8_t)bus_num;
@@ -1522,7 +1522,8 @@ static AddressSpace *amdvi_host_dma_iommu(PCIBus *bus, void *opaque, int devfn)
"amd_iommu", UINT64_MAX);
memory_region_init(&amdvi_dev_as->root, OBJECT(s),
"amdvi_root", UINT64_MAX);
- address_space_init(&amdvi_dev_as->as, NULL, &amdvi_dev_as->root, name);
+ address_space_init(&amdvi_dev_as->as, OBJECT(s), &amdvi_dev_as->root,
+ name);
memory_region_add_subregion_overlap(&amdvi_dev_as->root, 0,
MEMORY_REGION(&amdvi_dev_as->iommu),
0);
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 1f40d904326e..5e6d7d510e03 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -4221,6 +4221,7 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus,
vtd_iommu_unlock(s);
if (!vtd_dev_as) {
+ g_autofree char *as_name = NULL;
struct vtd_as_key *new_key;
/* Slow path */
@@ -4263,8 +4264,9 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus,
vtd_dev_as->iova_tree = iova_tree_new();
memory_region_init(&vtd_dev_as->root, OBJECT(s), name, UINT64_MAX);
- address_space_init(&vtd_dev_as->as, NULL, &vtd_dev_as->root,
- "vtd-root");
+ as_name = g_strconcat(name, "-as", NULL);
+ address_space_init(&vtd_dev_as->as, OBJECT(s), &vtd_dev_as->root,
+ as_name);
/*
* Build the DMAR-disabled container with aliases to the
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 11/35] hw/intc: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (9 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 10/35] hw/i386: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 12/35] hw/loongarch: " Akihiko Odaki
` (24 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/intc/arm_gicv3_common.c | 3 +--
hw/intc/pnv_xive.c | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c
index 169e0fcca828..a56b2eb7b3bc 100644
--- a/hw/intc/arm_gicv3_common.c
+++ b/hw/intc/arm_gicv3_common.c
@@ -429,8 +429,7 @@ static void arm_gicv3_common_realize(DeviceState *dev, Error **errp)
}
if (s->lpi_enable) {
- address_space_init(&s->dma_as, NULL, s->dma,
- "gicv3-its-sysmem");
+ address_space_init(&s->dma_as, OBJECT(s), s->dma, "as");
}
s->cpu = g_new0(GICv3CPUState, s->num_cpu);
diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c
index d14c26773021..baa90956e796 100644
--- a/hw/intc/pnv_xive.c
+++ b/hw/intc/pnv_xive.c
@@ -2012,10 +2012,10 @@ static void pnv_xive_realize(DeviceState *dev, Error **errp)
memory_region_init(&xive->ipi_mmio, OBJECT(xive), "xive-vc-ipi",
PNV9_XIVE_VC_SIZE);
- address_space_init(&xive->ipi_as, NULL, &xive->ipi_mmio, "xive-vc-ipi");
+ address_space_init(&xive->ipi_as, OBJECT(xive), &xive->ipi_mmio, "ipi-as");
memory_region_init(&xive->end_mmio, OBJECT(xive), "xive-vc-end",
PNV9_XIVE_VC_SIZE);
- address_space_init(&xive->end_as, NULL, &xive->end_mmio, "xive-vc-end");
+ address_space_init(&xive->end_as, OBJECT(xive), &xive->end_mmio, "end-as");
/*
* The MMIO windows exposing the IPI ESBs and the END ESBs in the
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 12/35] hw/loongarch: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (10 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 11/35] hw/intc: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 13/35] hw/mem: " Akihiko Odaki
` (23 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/loongarch/virt.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 0bace2f54b49..f65c2da5c6dd 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -699,7 +699,8 @@ static void virt_init(MachineState *machine)
/* Create IOCSR space */
memory_region_init_io(&lvms->system_iocsr, OBJECT(machine), NULL,
machine, "iocsr", UINT64_MAX);
- address_space_init(&lvms->as_iocsr, NULL, &lvms->system_iocsr, "IOCSR");
+ address_space_init(&lvms->as_iocsr, OBJECT(machine), &lvms->system_iocsr,
+ "iocsr-as");
memory_region_init_io(&lvms->iocsr_mem, OBJECT(machine),
&virt_iocsr_misc_ops,
machine, "iocsr_misc", 0x428);
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 13/35] hw/mem: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (11 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 12/35] hw/loongarch: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 13:24 ` Jonathan Cameron via
2025-09-17 12:56 ` [PATCH 14/35] hw/misc: " Akihiko Odaki
` (22 subsequent siblings)
35 siblings, 1 reply; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/mem/cxl_type3.c | 44 ++++++++++++--------------------------------
hw/mem/memory-device.c | 4 ++--
2 files changed, 14 insertions(+), 34 deletions(-)
diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c
index 1a726b834b02..968594ae65e2 100644
--- a/hw/mem/cxl_type3.c
+++ b/hw/mem/cxl_type3.c
@@ -727,8 +727,6 @@ static void cxl_destroy_dc_regions(CXLType3Dev *ct3d)
static bool cxl_setup_memory(CXLType3Dev *ct3d, Error **errp)
{
- DeviceState *ds = DEVICE(ct3d);
-
if (!ct3d->hostmem && !ct3d->hostvmem && !ct3d->hostpmem
&& !ct3d->dc.num_regions) {
error_setg(errp, "at least one memdev property must be set");
@@ -750,7 +748,6 @@ static bool cxl_setup_memory(CXLType3Dev *ct3d, Error **errp)
if (ct3d->hostvmem) {
MemoryRegion *vmr;
- char *v_name;
vmr = host_memory_backend_get_memory(ct3d->hostvmem);
if (!vmr) {
@@ -765,20 +762,14 @@ static bool cxl_setup_memory(CXLType3Dev *ct3d, Error **errp)
memory_region_set_nonvolatile(vmr, false);
memory_region_set_enabled(vmr, true);
host_memory_backend_set_mapped(ct3d->hostvmem, true);
- if (ds->id) {
- v_name = g_strdup_printf("cxl-type3-dpa-vmem-space:%s", ds->id);
- } else {
- v_name = g_strdup("cxl-type3-dpa-vmem-space");
- }
- address_space_init(&ct3d->hostvmem_as, NULL, vmr, v_name);
+ address_space_init(&ct3d->hostvmem_as, OBJECT(ct3d), vmr,
+ "volatile-as");
ct3d->cxl_dstate.vmem_size = memory_region_size(vmr);
ct3d->cxl_dstate.static_mem_size += memory_region_size(vmr);
- g_free(v_name);
}
if (ct3d->hostpmem) {
MemoryRegion *pmr;
- char *p_name;
pmr = host_memory_backend_get_memory(ct3d->hostpmem);
if (!pmr) {
@@ -793,21 +784,15 @@ static bool cxl_setup_memory(CXLType3Dev *ct3d, Error **errp)
memory_region_set_nonvolatile(pmr, true);
memory_region_set_enabled(pmr, true);
host_memory_backend_set_mapped(ct3d->hostpmem, true);
- if (ds->id) {
- p_name = g_strdup_printf("cxl-type3-dpa-pmem-space:%s", ds->id);
- } else {
- p_name = g_strdup("cxl-type3-dpa-pmem-space");
- }
- address_space_init(&ct3d->hostpmem_as, NULL, pmr, p_name);
+ address_space_init(&ct3d->hostpmem_as, OBJECT(ct3d), pmr,
+ "persistent-as");
ct3d->cxl_dstate.pmem_size = memory_region_size(pmr);
ct3d->cxl_dstate.static_mem_size += memory_region_size(pmr);
- g_free(p_name);
}
ct3d->dc.total_capacity = 0;
if (ct3d->dc.num_regions > 0) {
MemoryRegion *dc_mr;
- char *dc_name;
if (!ct3d->dc.host_dc) {
error_setg(errp, "dynamic capacity must have a backing device");
@@ -832,13 +817,8 @@ static bool cxl_setup_memory(CXLType3Dev *ct3d, Error **errp)
memory_region_set_nonvolatile(dc_mr, false);
memory_region_set_enabled(dc_mr, true);
host_memory_backend_set_mapped(ct3d->dc.host_dc, true);
- if (ds->id) {
- dc_name = g_strdup_printf("cxl-dcd-dpa-dc-space:%s", ds->id);
- } else {
- dc_name = g_strdup("cxl-dcd-dpa-dc-space");
- }
- address_space_init(&ct3d->dc.host_dc_as, NULL, dc_mr, dc_name);
- g_free(dc_name);
+ address_space_init(&ct3d->dc.host_dc_as, OBJECT(ct3d), dc_mr,
+ "volatile-dc-as");
if (!cxl_create_dc_regions(ct3d, errp)) {
error_append_hint(errp, "setup DC regions failed");
@@ -974,13 +954,13 @@ err_free_special_ops:
g_free(regs->special_ops);
if (ct3d->dc.host_dc) {
cxl_destroy_dc_regions(ct3d);
- address_space_destroy(&ct3d->dc.host_dc_as);
+ object_unparent(OBJECT(&ct3d->dc.host_dc_as));
}
if (ct3d->hostpmem) {
- address_space_destroy(&ct3d->hostpmem_as);
+ object_unparent(OBJECT(&ct3d->hostpmem_as));
}
if (ct3d->hostvmem) {
- address_space_destroy(&ct3d->hostvmem_as);
+ object_unparent(OBJECT(&ct3d->hostvmem_as));
}
}
@@ -997,13 +977,13 @@ static void ct3_exit(PCIDevice *pci_dev)
cxl_destroy_cci(&ct3d->cci);
if (ct3d->dc.host_dc) {
cxl_destroy_dc_regions(ct3d);
- address_space_destroy(&ct3d->dc.host_dc_as);
+ object_unparent(OBJECT(&ct3d->dc.host_dc_as));
}
if (ct3d->hostpmem) {
- address_space_destroy(&ct3d->hostpmem_as);
+ object_unparent(OBJECT(&ct3d->hostpmem_as));
}
if (ct3d->hostvmem) {
- address_space_destroy(&ct3d->hostvmem_as);
+ object_unparent(OBJECT(&ct3d->hostvmem_as));
}
}
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index a4a8efdd869b..165866f10b25 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -535,8 +535,8 @@ void machine_memory_devices_init(MachineState *ms, hwaddr base, uint64_t size)
memory_region_init(&ms->device_memory->mr, OBJECT(ms), "device-memory",
size);
- address_space_init(&ms->device_memory->as, NULL, &ms->device_memory->mr,
- "device-memory");
+ address_space_init(&ms->device_memory->as, OBJECT(ms),
+ &ms->device_memory->mr, "device-memory-as");
memory_region_add_subregion(get_system_memory(), ms->device_memory->base,
&ms->device_memory->mr);
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 14/35] hw/misc: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (12 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 13/35] hw/mem: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 15/35] hw/net: " Akihiko Odaki
` (21 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/misc/aspeed_hace.c | 2 +-
hw/misc/auxbus.c | 2 +-
hw/misc/bcm2835_mbox.c | 3 +--
hw/misc/bcm2835_property.c | 3 +--
hw/misc/max78000_gcr.c | 2 +-
hw/misc/tz-mpc.c | 6 ++----
hw/misc/tz-msc.c | 2 +-
hw/misc/tz-ppc.c | 5 ++++-
8 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/hw/misc/aspeed_hace.c b/hw/misc/aspeed_hace.c
index 198363fd64fa..a8a4a91afac8 100644
--- a/hw/misc/aspeed_hace.c
+++ b/hw/misc/aspeed_hace.c
@@ -603,7 +603,7 @@ static void aspeed_hace_realize(DeviceState *dev, Error **errp)
return;
}
- address_space_init(&s->dram_as, NULL, s->dram_mr, "dram");
+ address_space_init(&s->dram_as, OBJECT(s), s->dram_mr, "as");
sysbus_init_mmio(sbd, &s->iomem);
}
diff --git a/hw/misc/auxbus.c b/hw/misc/auxbus.c
index e5448ef3cc60..d20dd8789ae6 100644
--- a/hw/misc/auxbus.c
+++ b/hw/misc/auxbus.c
@@ -74,7 +74,7 @@ AUXBus *aux_bus_init(DeviceState *parent, const char *name)
/* Memory related. */
bus->aux_io = g_malloc(sizeof(*bus->aux_io));
memory_region_init(bus->aux_io, OBJECT(bus), "aux-io", 1 * MiB);
- address_space_init(&bus->aux_addr_space, NULL, bus->aux_io, "aux-io");
+ address_space_init(&bus->aux_addr_space, OBJECT(bus), bus->aux_io, "as");
return bus;
}
diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c
index 4bf3c59a40a1..f26aa39ca4e5 100644
--- a/hw/misc/bcm2835_mbox.c
+++ b/hw/misc/bcm2835_mbox.c
@@ -310,8 +310,7 @@ static void bcm2835_mbox_realize(DeviceState *dev, Error **errp)
obj = object_property_get_link(OBJECT(dev), "mbox-mr", &error_abort);
s->mbox_mr = MEMORY_REGION(obj);
- address_space_init(&s->mbox_as, NULL, s->mbox_mr,
- TYPE_BCM2835_MBOX "-memory");
+ address_space_init(&s->mbox_as, OBJECT(s), s->mbox_mr, "as");
bcm2835_mbox_reset(dev);
}
diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c
index 8bdde2d248b5..e86d001f17fb 100644
--- a/hw/misc/bcm2835_property.c
+++ b/hw/misc/bcm2835_property.c
@@ -540,8 +540,7 @@ static void bcm2835_property_realize(DeviceState *dev, Error **errp)
obj = object_property_get_link(OBJECT(dev), "dma-mr", &error_abort);
s->dma_mr = MEMORY_REGION(obj);
- address_space_init(&s->dma_as, NULL, s->dma_mr,
- TYPE_BCM2835_PROPERTY "-memory");
+ address_space_init(&s->dma_as, OBJECT(s), s->dma_mr, "as");
obj = object_property_get_link(OBJECT(dev), "otp", &error_abort);
s->otp = BCM2835_OTP(obj);
diff --git a/hw/misc/max78000_gcr.c b/hw/misc/max78000_gcr.c
index 0a0692c7cffe..048b265be348 100644
--- a/hw/misc/max78000_gcr.c
+++ b/hw/misc/max78000_gcr.c
@@ -320,7 +320,7 @@ static void max78000_gcr_realize(DeviceState *dev, Error **errp)
{
Max78000GcrState *s = MAX78000_GCR(dev);
- address_space_init(&s->sram_as, NULL, s->sram, "sram");
+ address_space_init(&s->sram_as, OBJECT(s), s->sram, "as");
}
static void max78000_gcr_class_init(ObjectClass *klass, const void *data)
diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c
index b8be234630e3..b5415d46feae 100644
--- a/hw/misc/tz-mpc.c
+++ b/hw/misc/tz-mpc.c
@@ -550,10 +550,8 @@ static void tz_mpc_realize(DeviceState *dev, Error **errp)
memory_region_init_io(&s->blocked_io, obj, &tz_mpc_mem_blocked_ops,
s, "tz-mpc-blocked-io", size);
- address_space_init(&s->downstream_as, NULL, s->downstream,
- "tz-mpc-downstream");
- address_space_init(&s->blocked_io_as, NULL, &s->blocked_io,
- "tz-mpc-blocked-io");
+ address_space_init(&s->downstream_as, obj, s->downstream, "downstream-as");
+ address_space_init(&s->blocked_io_as, obj, &s->blocked_io, "blocked-io-as");
s->blk_lut = g_new0(uint32_t, s->blk_max);
}
diff --git a/hw/misc/tz-msc.c b/hw/misc/tz-msc.c
index ed1c95e2e9fa..07a8a5137d22 100644
--- a/hw/misc/tz-msc.c
+++ b/hw/misc/tz-msc.c
@@ -260,7 +260,7 @@ static void tz_msc_realize(DeviceState *dev, Error **errp)
}
size = memory_region_size(s->downstream);
- address_space_init(&s->downstream_as, NULL, s->downstream, name);
+ address_space_init(&s->downstream_as, obj, s->downstream, "as");
memory_region_init_io(&s->upstream, obj, &tz_msc_ops, s, name, size);
sysbus_init_mmio(sbd, &s->upstream);
}
diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c
index 28a1c27aa3cc..ac928accec2d 100644
--- a/hw/misc/tz-ppc.c
+++ b/hw/misc/tz-ppc.c
@@ -257,6 +257,7 @@ static void tz_ppc_realize(DeviceState *dev, Error **errp)
for (i = 0; i <= max_port; i++) {
TZPPCPort *port = &s->port[i];
char *name;
+ g_autofree char *as_name = NULL;
uint64_t size;
if (!port->downstream) {
@@ -274,9 +275,11 @@ static void tz_ppc_realize(DeviceState *dev, Error **errp)
}
name = g_strdup_printf("tz-ppc-port[%d]", i);
+ as_name = g_strconcat(name, "-as", NULL);
port->ppc = s;
- address_space_init(&port->downstream_as, NULL, port->downstream, name);
+ address_space_init(&port->downstream_as, obj, port->downstream,
+ as_name);
size = memory_region_size(port->downstream);
memory_region_init_io(&port->upstream, obj, &tz_ppc_ops,
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 15/35] hw/net: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (13 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 14/35] hw/misc: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 16/35] hw/nubus: " Akihiko Odaki
` (20 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/net/allwinner-sun8i-emac.c | 2 +-
hw/net/cadence_gem.c | 4 ++--
hw/net/dp8393x.c | 2 +-
hw/net/msf2-emac.c | 2 +-
hw/net/mv88w8618_eth.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/net/allwinner-sun8i-emac.c b/hw/net/allwinner-sun8i-emac.c
index 27160c5ff2a4..4127fb55c817 100644
--- a/hw/net/allwinner-sun8i-emac.c
+++ b/hw/net/allwinner-sun8i-emac.c
@@ -820,7 +820,7 @@ static void allwinner_sun8i_emac_realize(DeviceState *dev, Error **errp)
return;
}
- address_space_init(&s->dma_as, NULL, s->dma_mr, "emac-dma");
+ address_space_init(&s->dma_as, OBJECT(s), s->dma_mr, "as");
qemu_macaddr_default_if_unset(&s->conf.macaddr);
s->nic = qemu_new_nic(&net_allwinner_sun8i_emac_info, &s->conf,
diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index 3ba8ce017194..e1ff610b48da 100644
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -1734,8 +1734,8 @@ static void gem_realize(DeviceState *dev, Error **errp)
CadenceGEMState *s = CADENCE_GEM(dev);
int i;
- address_space_init(&s->dma_as, NULL,
- s->dma_mr ? s->dma_mr : get_system_memory(), "dma");
+ address_space_init(&s->dma_as, OBJECT(s),
+ s->dma_mr ? s->dma_mr : get_system_memory(), "as");
if (s->num_priority_queues == 0 ||
s->num_priority_queues > MAX_PRIORITY_QUEUES) {
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index f65d8ef4dd45..9b9125954db8 100644
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -908,7 +908,7 @@ static void dp8393x_realize(DeviceState *dev, Error **errp)
{
dp8393xState *s = DP8393X(dev);
- address_space_init(&s->as, NULL, s->dma_mr, "dp8393x");
+ address_space_init(&s->as, OBJECT(s), s->dma_mr, "as");
memory_region_init_io(&s->mmio, OBJECT(dev), &dp8393x_ops, s,
"dp8393x-regs", SONIC_REG_COUNT << s->it_shift);
diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c
index 59c380db30dc..22a79d38403b 100644
--- a/hw/net/msf2-emac.c
+++ b/hw/net/msf2-emac.c
@@ -526,7 +526,7 @@ static void msf2_emac_realize(DeviceState *dev, Error **errp)
return;
}
- address_space_init(&s->dma_as, NULL, s->dma_mr, "emac-ahb");
+ address_space_init(&s->dma_as, OBJECT(s), s->dma_mr, "as");
qemu_macaddr_default_if_unset(&s->conf.macaddr);
s->nic = qemu_new_nic(&net_msf2_emac_info, &s->conf,
diff --git a/hw/net/mv88w8618_eth.c b/hw/net/mv88w8618_eth.c
index 1ea294bcced5..a02e7e60d562 100644
--- a/hw/net/mv88w8618_eth.c
+++ b/hw/net/mv88w8618_eth.c
@@ -348,7 +348,7 @@ static void mv88w8618_eth_realize(DeviceState *dev, Error **errp)
return;
}
- address_space_init(&s->dma_as, NULL, s->dma_mr, "emac-dma");
+ address_space_init(&s->dma_as, OBJECT(s), s->dma_mr, "as");
s->nic = qemu_new_nic(&net_mv88w8618_info, &s->conf,
object_get_typename(OBJECT(dev)), dev->id,
&dev->mem_reentrancy_guard, s);
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 16/35] hw/nubus: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (14 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 15/35] hw/net: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 17/35] hw/pci: " Akihiko Odaki
` (19 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/nubus/nubus-bus.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/nubus/nubus-bus.c b/hw/nubus/nubus-bus.c
index 1d553be77662..75767c9fc399 100644
--- a/hw/nubus/nubus-bus.c
+++ b/hw/nubus/nubus-bus.c
@@ -82,7 +82,7 @@ static void nubus_unrealize(BusState *bus)
{
NubusBus *nubus = NUBUS_BUS(bus);
- address_space_destroy(&nubus->nubus_as);
+ object_unparent(OBJECT(&nubus->nubus_as));
}
static void nubus_realize(BusState *bus, Error **errp)
@@ -94,7 +94,7 @@ static void nubus_realize(BusState *bus, Error **errp)
return;
}
- address_space_init(&nubus->nubus_as, NULL, &nubus->nubus_mr, "nubus");
+ address_space_init(&nubus->nubus_as, OBJECT(nubus), &nubus->nubus_mr, "as");
}
static void nubus_init(Object *obj)
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 17/35] hw/pci: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (15 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 16/35] hw/nubus: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 18/35] hw/pci-host: " Akihiko Odaki
` (18 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/pci/pci.c | 6 +++---
hw/pci/pci_bridge.c | 11 +++++------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 340384a8876a..7ab93df2969d 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1188,7 +1188,7 @@ static void do_pci_unregister_device(PCIDevice *pci_dev)
if (xen_mode == XEN_EMULATE) {
xen_evtchn_remove_pci_device(pci_dev);
}
- address_space_destroy(&pci_dev->bus_master_as);
+ object_unparent(OBJECT(&pci_dev->bus_master_as));
}
/* Extract PCIReqIDCache into BDF format */
@@ -1359,8 +1359,8 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev,
memory_region_init(&pci_dev->bus_master_container_region, OBJECT(pci_dev),
"bus master container", UINT64_MAX);
- address_space_init(&pci_dev->bus_master_as, NULL,
- &pci_dev->bus_master_container_region, pci_dev->name);
+ address_space_init(&pci_dev->bus_master_as, OBJECT(pci_dev),
+ &pci_dev->bus_master_container_region, "bus-master-as");
pci_dev->bus_master_as.max_bounce_buffer_size =
pci_dev->max_bounce_buffer_size;
diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
index 94b61b907ea2..fd74622edb9f 100644
--- a/hw/pci/pci_bridge.c
+++ b/hw/pci/pci_bridge.c
@@ -388,13 +388,12 @@ void pci_bridge_initfn(PCIDevice *dev, const char *typename)
sec_bus->map_irq = br->map_irq ? br->map_irq : pci_swizzle_map_irq_fn;
sec_bus->address_space_mem = &br->address_space_mem;
memory_region_init(&br->address_space_mem, OBJECT(br), "pci_bridge_pci", UINT64_MAX);
- address_space_init(&br->as_mem, NULL, &br->address_space_mem,
- "pci_bridge_pci_mem");
+ address_space_init(&br->as_mem, OBJECT(br), &br->address_space_mem,
+ "mem-as");
sec_bus->address_space_io = &br->address_space_io;
memory_region_init(&br->address_space_io, OBJECT(br), "pci_bridge_io",
4 * GiB);
- address_space_init(&br->as_io, NULL, &br->address_space_io,
- "pci_bridge_pci_io");
+ address_space_init(&br->as_io, OBJECT(br), &br->address_space_io, "io-as");
pci_bridge_region_update(br, true);
QLIST_INIT(&sec_bus->child);
QLIST_INSERT_HEAD(&parent->child, sec_bus, sibling);
@@ -411,8 +410,8 @@ void pci_bridge_exitfn(PCIDevice *pci_dev)
PCIBridge *s = PCI_BRIDGE(pci_dev);
assert(QLIST_EMPTY(&s->sec_bus.child));
QLIST_REMOVE(&s->sec_bus, sibling);
- address_space_destroy(&s->as_mem);
- address_space_destroy(&s->as_io);
+ object_unparent(OBJECT(&s->as_mem));
+ object_unparent(OBJECT(&s->as_io));
pci_bridge_region_del(s, &s->windows);
pci_bridge_region_cleanup(s, &s->windows);
/* object_unparent() is called automatically during device deletion */
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 18/35] hw/pci-host: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (16 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 17/35] hw/pci: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 19/35] hw/ppc: " Akihiko Odaki
` (17 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/pci-host/astro.c | 3 +--
hw/pci-host/designware.c | 5 ++---
hw/pci-host/dino.c | 4 ++--
hw/pci-host/gt64120.c | 2 +-
hw/pci-host/pnv_phb3.c | 4 ++--
hw/pci-host/pnv_phb4.c | 4 ++--
hw/pci-host/ppc440_pcix.c | 2 +-
hw/pci-host/ppce500.c | 2 +-
hw/pci-host/raven.c | 2 +-
9 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/hw/pci-host/astro.c b/hw/pci-host/astro.c
index bb6b7d05582f..19f6a7ac88f4 100644
--- a/hw/pci-host/astro.c
+++ b/hw/pci-host/astro.c
@@ -835,8 +835,7 @@ static void astro_realize(DeviceState *obj, Error **errp)
memory_region_init_iommu(&s->iommu, sizeof(s->iommu),
TYPE_ASTRO_IOMMU_MEMORY_REGION, OBJECT(s),
"iommu-astro", UINT64_MAX);
- address_space_init(&s->iommu_as, NULL, MEMORY_REGION(&s->iommu),
- "bm-pci");
+ address_space_init(&s->iommu_as, OBJECT(s), MEMORY_REGION(&s->iommu), "as");
/* Create Elroys (PCI host bus chips). */
for (i = 0; i < ELROY_NUM; i++) {
diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c
index d67211c9bc74..a542f6e9b1b1 100644
--- a/hw/pci-host/designware.c
+++ b/hw/pci-host/designware.c
@@ -706,9 +706,8 @@ static void designware_pcie_host_realize(DeviceState *dev, Error **errp)
UINT64_MAX);
memory_region_add_subregion(&s->pci.address_space_root,
0x0, &s->pci.memory);
- address_space_init(&s->pci.address_space, NULL,
- &s->pci.address_space_root,
- "pcie-bus-address-space");
+ address_space_init(&s->pci.address_space, OBJECT(s),
+ &s->pci.address_space_root, "as");
pci_setup_iommu(pci->bus, &designware_iommu_ops, s);
qdev_realize(DEVICE(&s->root), BUS(pci->bus), &error_fatal);
diff --git a/hw/pci-host/dino.c b/hw/pci-host/dino.c
index b78167fd2fcd..d213478c86ce 100644
--- a/hw/pci-host/dino.c
+++ b/hw/pci-host/dino.c
@@ -434,14 +434,14 @@ static void dino_pcihost_realize(DeviceState *dev, Error **errp)
memory_region_add_subregion(&s->bm, 0xfff00000,
&s->bm_cpu_alias);
- address_space_init(&s->bm_as, NULL, &s->bm, "pci-bm");
+ address_space_init(&s->bm_as, OBJECT(s), &s->bm, "as");
}
static void dino_pcihost_unrealize(DeviceState *dev)
{
DinoState *s = DINO_PCI_HOST_BRIDGE(dev);
- address_space_destroy(&s->bm_as);
+ object_unparent(OBJECT(&s->bm_as));
}
static void dino_pcihost_init(Object *obj)
diff --git a/hw/pci-host/gt64120.c b/hw/pci-host/gt64120.c
index 68ad885edbe4..89c4cf0bd5f8 100644
--- a/hw/pci-host/gt64120.c
+++ b/hw/pci-host/gt64120.c
@@ -1198,7 +1198,7 @@ static void gt64120_realize(DeviceState *dev, Error **errp)
memory_region_init_io(&s->ISD_mem, OBJECT(dev), &isd_mem_ops, s,
"gt64120-isd", 0x1000);
memory_region_init(&s->pci0_mem, OBJECT(dev), "pci0-mem", 4 * GiB);
- address_space_init(&s->pci0_mem_as, NULL, &s->pci0_mem, "pci0-mem");
+ address_space_init(&s->pci0_mem_as, OBJECT(s), &s->pci0_mem, "as");
phb->bus = pci_root_bus_new(dev, "pci",
&s->pci0_mem,
get_system_io(),
diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c
index 73592c9cbd3d..554ad034b6f4 100644
--- a/hw/pci-host/pnv_phb3.c
+++ b/hw/pci-host/pnv_phb3.c
@@ -956,8 +956,8 @@ static AddressSpace *pnv_phb3_dma_iommu(PCIBus *bus, void *opaque, int devfn)
memory_region_init_iommu(&ds->dma_mr, sizeof(ds->dma_mr),
TYPE_PNV_PHB3_IOMMU_MEMORY_REGION,
OBJECT(phb), "phb3_iommu", UINT64_MAX);
- address_space_init(&ds->dma_as, NULL, MEMORY_REGION(&ds->dma_mr),
- "phb3_iommu");
+ address_space_init(&ds->dma_as, OBJECT(phb), MEMORY_REGION(&ds->dma_mr),
+ "as");
memory_region_init_io(&ds->msi32_mr, OBJECT(phb), &pnv_phb3_msi_ops,
ds, "msi32", 0x10000);
memory_region_init_io(&ds->msi64_mr, OBJECT(phb), &pnv_phb3_msi_ops,
diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
index 9db9268358d1..0d7643e36036 100644
--- a/hw/pci-host/pnv_phb4.c
+++ b/hw/pci-host/pnv_phb4.c
@@ -1469,8 +1469,8 @@ static AddressSpace *pnv_phb4_dma_iommu(PCIBus *bus, void *opaque, int devfn)
memory_region_init_iommu(&ds->dma_mr, sizeof(ds->dma_mr),
TYPE_PNV_PHB4_IOMMU_MEMORY_REGION,
OBJECT(phb), name, UINT64_MAX);
- address_space_init(&ds->dma_as, NULL, MEMORY_REGION(&ds->dma_mr),
- name);
+ address_space_init(&ds->dma_as, OBJECT(phb), MEMORY_REGION(&ds->dma_mr),
+ "as");
memory_region_init_io(&ds->msi32_mr, OBJECT(phb), &pnv_phb4_msi_ops,
ds, "msi32", 0x10000);
memory_region_init_io(&ds->msi64_mr, OBJECT(phb), &pnv_phb4_msi_ops,
diff --git a/hw/pci-host/ppc440_pcix.c b/hw/pci-host/ppc440_pcix.c
index 3fe24d70ac30..6500871f48ae 100644
--- a/hw/pci-host/ppc440_pcix.c
+++ b/hw/pci-host/ppc440_pcix.c
@@ -502,7 +502,7 @@ static void ppc440_pcix_realize(DeviceState *dev, Error **errp)
memory_region_init(&s->bm, OBJECT(s), "bm-ppc440-pcix", UINT64_MAX);
memory_region_add_subregion(&s->bm, 0x0, &s->busmem);
- address_space_init(&s->bm_as, NULL, &s->bm, "pci-bm");
+ address_space_init(&s->bm_as, OBJECT(s), &s->bm, "as");
pci_setup_iommu(h->bus, &ppc440_iommu_ops, s);
memory_region_init(&s->container, OBJECT(s), "pci-container", PCI_ALL_SIZE);
diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
index eda168fb5955..94d5c53f328a 100644
--- a/hw/pci-host/ppce500.c
+++ b/hw/pci-host/ppce500.c
@@ -470,7 +470,7 @@ static void e500_pcihost_realize(DeviceState *dev, Error **errp)
/* Set up PCI view of memory */
memory_region_init(&s->bm, OBJECT(s), "bm-e500", UINT64_MAX);
memory_region_add_subregion(&s->bm, 0x0, &s->busmem);
- address_space_init(&s->bm_as, NULL, &s->bm, "pci-bm");
+ address_space_init(&s->bm_as, OBJECT(s), &s->bm, "as");
pci_setup_iommu(b, &ppce500_iommu_ops, s);
pci_create_simple(b, 0, TYPE_PPC_E500_PCI_BRIDGE);
diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
index 5564b51d6755..5bf87bdffa26 100644
--- a/hw/pci-host/raven.c
+++ b/hw/pci-host/raven.c
@@ -214,7 +214,7 @@ static void raven_pcihost_realize(DeviceState *d, Error **errp)
memory_region_init_alias(mr, o, "bm-system", get_system_memory(),
0, 0x80000000);
memory_region_add_subregion(bm, 0x80000000, mr);
- address_space_init(&s->bm_as, NULL, bm, "raven-bm-as");
+ address_space_init(&s->bm_as, o, bm, "as");
pci_setup_iommu(h->bus, &raven_iommu_ops, s);
}
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 19/35] hw/ppc: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (17 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 18/35] hw/pci-host: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 20/35] hw/remote: " Akihiko Odaki
` (16 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/ppc/pnv_lpc.c | 2 +-
hw/ppc/pnv_xscom.c | 2 +-
hw/ppc/spapr_pci.c | 5 ++---
hw/ppc/spapr_vio.c | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c
index 373b5a8be573..304f01e240db 100644
--- a/hw/ppc/pnv_lpc.c
+++ b/hw/ppc/pnv_lpc.c
@@ -799,7 +799,7 @@ static void pnv_lpc_realize(DeviceState *dev, Error **errp)
/* Create address space and backing MR for the OPB bus */
memory_region_init(&lpc->opb_mr, OBJECT(dev), "lpc-opb", 0x100000000ull);
- address_space_init(&lpc->opb_as, NULL, &lpc->opb_mr, "lpc-opb");
+ address_space_init(&lpc->opb_as, OBJECT(dev), &lpc->opb_mr, "as");
/*
* Create ISA IO, Mem, and FW space regions which are the root of
diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c
index 58f86bcbd2a6..353eb9b14e29 100644
--- a/hw/ppc/pnv_xscom.c
+++ b/hw/ppc/pnv_xscom.c
@@ -219,7 +219,7 @@ void pnv_xscom_init(PnvChip *chip, uint64_t size, hwaddr addr)
memory_region_add_subregion(get_system_memory(), addr, &chip->xscom_mmio);
memory_region_init(&chip->xscom, OBJECT(chip), name, size);
- address_space_init(&chip->xscom_as, NULL, &chip->xscom, name);
+ address_space_init(&chip->xscom_as, OBJECT(chip), &chip->xscom, "as");
g_free(name);
}
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 13fc5c9aa8f2..41bf65b291de 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -1759,7 +1759,7 @@ static void spapr_phb_unrealize(DeviceState *dev)
* address space.
*/
address_space_remove_listeners(&sphb->iommu_as);
- address_space_destroy(&sphb->iommu_as);
+ object_unparent(OBJECT(&sphb->iommu_as));
qbus_set_hotplug_handler(BUS(phb->bus), NULL);
pci_unregister_root_bus(phb->bus);
@@ -1902,8 +1902,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp)
memory_region_init(&sphb->iommu_root, OBJECT(sphb),
namebuf, UINT64_MAX);
g_free(namebuf);
- address_space_init(&sphb->iommu_as, NULL, &sphb->iommu_root,
- sphb->dtbusname);
+ address_space_init(&sphb->iommu_as, OBJECT(sphb), &sphb->iommu_root, "as");
/*
* As MSI/MSIX interrupts trigger by writing at MSI/MSIX vectors,
diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
index ebe4bad23668..5f8dd153dedf 100644
--- a/hw/ppc/spapr_vio.c
+++ b/hw/ppc/spapr_vio.c
@@ -529,7 +529,7 @@ static void spapr_vio_busdev_realize(DeviceState *qdev, Error **errp)
"iommu-spapr-bypass", get_system_memory(),
0, MACHINE(spapr)->ram_size);
memory_region_add_subregion_overlap(&dev->mrroot, 0, &dev->mrbypass, 1);
- address_space_init(&dev->as, NULL, &dev->mrroot, qdev->id);
+ address_space_init(&dev->as, OBJECT(dev), &dev->mrroot, "as");
dev->tcet = spapr_tce_new_table(qdev, liobn);
spapr_tce_table_enable(dev->tcet, SPAPR_TCE_PAGE_SHIFT, 0,
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 20/35] hw/remote: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (18 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 19/35] hw/ppc: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 21/35] hw/riscv: " Akihiko Odaki
` (15 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/remote/iommu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/remote/iommu.c b/hw/remote/iommu.c
index aac5c178ec81..89d79e9480da 100644
--- a/hw/remote/iommu.c
+++ b/hw/remote/iommu.c
@@ -54,7 +54,7 @@ static AddressSpace *remote_iommu_find_add_as(PCIBus *pci_bus,
if (!elem->mr) {
elem->mr = MEMORY_REGION(object_new(TYPE_MEMORY_REGION));
memory_region_set_size(elem->mr, UINT64_MAX);
- address_space_init(&elem->as, NULL, elem->mr, NULL);
+ address_space_init(&elem->as, OBJECT(iommu), elem->mr, "as");
}
qemu_mutex_unlock(&iommu->lock);
@@ -73,7 +73,7 @@ void remote_iommu_unplug_dev(PCIDevice *pci_dev)
elem = container_of(as, RemoteIommuElem, as);
- address_space_destroy(&elem->as);
+ object_unparent(OBJECT(&elem->as));
object_unref(elem->mr);
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 21/35] hw/riscv: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (19 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 20/35] hw/remote: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 22/35] hw/s390x: " Akihiko Odaki
` (14 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/riscv/riscv-iommu.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/riscv/riscv-iommu.c b/hw/riscv/riscv-iommu.c
index aed84d87a823..6e2962f8331b 100644
--- a/hw/riscv/riscv-iommu.c
+++ b/hw/riscv/riscv-iommu.c
@@ -1221,8 +1221,8 @@ static AddressSpace *riscv_iommu_space(RISCVIOMMUState *s, uint32_t devid)
memory_region_init_iommu(&as->iova_mr, sizeof(as->iova_mr),
TYPE_RISCV_IOMMU_MEMORY_REGION,
OBJECT(as), "riscv_iommu", UINT64_MAX);
- address_space_init(&as->iova_as, NULL, MEMORY_REGION(&as->iova_mr),
- name);
+ address_space_init(&as->iova_as, OBJECT(s), MEMORY_REGION(&as->iova_mr),
+ "iova-as");
QLIST_INSERT_HEAD(&s->spaces, as, list);
@@ -2427,8 +2427,8 @@ static void riscv_iommu_realize(DeviceState *dev, Error **errp)
/* Memory region for downstream access, if specified. */
if (s->target_mr) {
s->target_as = g_new0(AddressSpace, 1);
- address_space_init(s->target_as, NULL, s->target_mr,
- "riscv-iommu-downstream");
+ address_space_init(s->target_as, OBJECT(s), s->target_mr,
+ "downstream-as");
} else {
/* Fallback to global system memory. */
s->target_as = &address_space_memory;
@@ -2437,7 +2437,7 @@ static void riscv_iommu_realize(DeviceState *dev, Error **errp)
/* Memory region for untranslated MRIF/MSI writes */
memory_region_init_io(&s->trap_mr, OBJECT(dev), &riscv_iommu_trap_ops, s,
"riscv-iommu-trap", ~0ULL);
- address_space_init(&s->trap_as, NULL, &s->trap_mr, "riscv-iommu-trap-as");
+ address_space_init(&s->trap_as, OBJECT(s), &s->trap_mr, "trap-as");
if (s->cap & RISCV_IOMMU_CAP_HPM) {
s->hpm_timer =
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 22/35] hw/s390x: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (20 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 21/35] hw/riscv: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 23/35] hw/scsi: " Akihiko Odaki
` (13 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/s390x/s390-pci-bus.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 67fce1c133b0..3febf9df968f 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -623,18 +623,13 @@ static S390PCIIOMMU *s390_pci_get_iommu(S390pciState *s, PCIBus *bus,
pci_bus_num(bus),
PCI_SLOT(devfn),
PCI_FUNC(devfn));
- char *as_name = g_strdup_printf("iommu-pci-%02x:%02x.%01x",
- pci_bus_num(bus),
- PCI_SLOT(devfn),
- PCI_FUNC(devfn));
memory_region_init(&iommu->mr, OBJECT(iommu), mr_name, UINT64_MAX);
- address_space_init(&iommu->as, NULL, &iommu->mr, as_name);
+ address_space_init(&iommu->as, OBJECT(iommu), &iommu->mr, "as");
iommu->iotlb = g_hash_table_new_full(g_int64_hash, g_int64_equal,
NULL, g_free);
table->iommu[PCI_SLOT(devfn)] = iommu;
g_free(mr_name);
- g_free(as_name);
}
return iommu;
@@ -785,7 +780,7 @@ static void s390_pci_iommu_free(S390pciState *s, PCIBus *bus, int32_t devfn)
* Remove the listeners now before destroying the address space.
*/
address_space_remove_listeners(&iommu->as);
- address_space_destroy(&iommu->as);
+ object_unparent(OBJECT(&iommu->as));
object_unparent(OBJECT(&iommu->mr));
object_unparent(OBJECT(iommu));
object_unref(OBJECT(iommu));
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 23/35] hw/scsi: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (21 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 22/35] hw/s390x: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 24/35] hw/sd: " Akihiko Odaki
` (12 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/scsi/lsi53c895a.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
index ee21b3c0d08a..b577f5ba2282 100644
--- a/hw/scsi/lsi53c895a.c
+++ b/hw/scsi/lsi53c895a.c
@@ -2356,8 +2356,8 @@ static void lsi_scsi_realize(PCIDevice *dev, Error **errp)
s->ram_io.disable_reentrancy_guard = true;
s->mmio_io.disable_reentrancy_guard = true;
- address_space_init(&s->pci_io_as, NULL, pci_address_space_io(dev),
- "lsi-pci-io");
+ address_space_init(&s->pci_io_as, OBJECT(s), pci_address_space_io(dev),
+ "io-as");
qdev_init_gpio_out(d, &s->ext_irq, 1);
pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io_io);
@@ -2372,7 +2372,7 @@ static void lsi_scsi_exit(PCIDevice *dev)
{
LSIState *s = LSI53C895A(dev);
- address_space_destroy(&s->pci_io_as);
+ object_unparent(OBJECT(&s->pci_io_as));
timer_free(s->scripts_timer);
}
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 24/35] hw/sd: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (22 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 23/35] hw/scsi: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 25/35] hw/sparc: " Akihiko Odaki
` (11 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/sd/allwinner-sdhost.c | 2 +-
hw/sd/sdhci.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/sd/allwinner-sdhost.c b/hw/sd/allwinner-sdhost.c
index 158d434e7fde..c001dfd60203 100644
--- a/hw/sd/allwinner-sdhost.c
+++ b/hw/sd/allwinner-sdhost.c
@@ -832,7 +832,7 @@ static void allwinner_sdhost_realize(DeviceState *dev, Error **errp)
return;
}
- address_space_init(&s->dma_as, NULL, s->dma_mr, "sdhost-dma");
+ address_space_init(&s->dma_as, OBJECT(s), s->dma_mr, "as");
}
static void allwinner_sdhost_reset(DeviceState *dev)
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index c6a203744463..1a6b6e1198f2 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1594,7 +1594,7 @@ static void sdhci_sysbus_realize(DeviceState *dev, Error **errp)
if (s->dma_mr) {
s->dma_as = &s->sysbus_dma_as;
- address_space_init(s->dma_as, NULL, s->dma_mr, "sdhci-dma");
+ address_space_init(s->dma_as, OBJECT(s), s->dma_mr, "as");
} else {
/* use system_memory() if property "dma" not set */
s->dma_as = &address_space_memory;
@@ -1612,7 +1612,7 @@ static void sdhci_sysbus_unrealize(DeviceState *dev)
sdhci_common_unrealize(s);
if (s->dma_mr) {
- address_space_destroy(s->dma_as);
+ object_unparent(OBJECT(s->dma_as));
}
}
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 25/35] hw/sparc: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (23 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 24/35] hw/sd: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 26/35] hw/sparc64: " Akihiko Odaki
` (10 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/sparc/sun4m_iommu.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hw/sparc/sun4m_iommu.c b/hw/sparc/sun4m_iommu.c
index 7b8d78273b97..d1c18f800170 100644
--- a/hw/sparc/sun4m_iommu.c
+++ b/hw/sparc/sun4m_iommu.c
@@ -359,8 +359,7 @@ static void iommu_init(Object *obj)
memory_region_init_iommu(&s->iommu, sizeof(s->iommu),
TYPE_SUN4M_IOMMU_MEMORY_REGION, OBJECT(dev),
"iommu-sun4m", UINT64_MAX);
- address_space_init(&s->iommu_as, NULL, MEMORY_REGION(&s->iommu),
- "iommu-as");
+ address_space_init(&s->iommu_as, OBJECT(s), MEMORY_REGION(&s->iommu), "as");
sysbus_init_irq(dev, &s->irq);
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 26/35] hw/sparc64: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (24 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 25/35] hw/sparc: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 27/35] hw/ssi: " Akihiko Odaki
` (9 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/sparc64/sun4u_iommu.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hw/sparc64/sun4u_iommu.c b/hw/sparc64/sun4u_iommu.c
index 0a5703044e7a..72ccf293b46e 100644
--- a/hw/sparc64/sun4u_iommu.c
+++ b/hw/sparc64/sun4u_iommu.c
@@ -298,8 +298,7 @@ static void iommu_init(Object *obj)
memory_region_init_iommu(&s->iommu, sizeof(s->iommu),
TYPE_SUN4U_IOMMU_MEMORY_REGION, OBJECT(s),
"iommu-sun4u", UINT64_MAX);
- address_space_init(&s->iommu_as, NULL, MEMORY_REGION(&s->iommu),
- "iommu-as");
+ address_space_init(&s->iommu_as, obj, MEMORY_REGION(&s->iommu), "as");
memory_region_init_io(&s->iomem, obj, &iommu_mem_ops, s, "iommu",
IOMMU_NREGS * sizeof(uint64_t));
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 27/35] hw/ssi: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (25 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 26/35] hw/sparc64: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 28/35] hw/usb: " Akihiko Odaki
` (8 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/ssi/aspeed_smc.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index 7e41d4210330..73b8f0e81ff0 100644
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -1191,10 +1191,8 @@ static void aspeed_smc_dma_setup(AspeedSMCState *s, Error **errp)
return;
}
- address_space_init(&s->flash_as, NULL, &s->mmio_flash,
- TYPE_ASPEED_SMC ".dma-flash");
- address_space_init(&s->dram_as, NULL, s->dram_mr,
- TYPE_ASPEED_SMC ".dma-dram");
+ address_space_init(&s->flash_as, OBJECT(s), &s->mmio_flash, "flash-as");
+ address_space_init(&s->dram_as, OBJECT(s), s->dram_mr, "dram-as");
}
static void aspeed_smc_realize(DeviceState *dev, Error **errp)
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 28/35] hw/usb: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (26 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 27/35] hw/ssi: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 29/35] " Akihiko Odaki
` (7 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/usb/hcd-dwc2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/usb/hcd-dwc2.c b/hw/usb/hcd-dwc2.c
index 8aaa696dd4de..156cfb4263e3 100644
--- a/hw/usb/hcd-dwc2.c
+++ b/hw/usb/hcd-dwc2.c
@@ -1351,7 +1351,7 @@ static void dwc2_realize(DeviceState *dev, Error **errp)
obj = object_property_get_link(OBJECT(dev), "dma-mr", &error_abort);
s->dma_mr = MEMORY_REGION(obj);
- address_space_init(&s->dma_as, NULL, s->dma_mr, "dwc2");
+ address_space_init(&s->dma_as, OBJECT(s), s->dma_mr, "as");
usb_bus_new(&s->bus, sizeof(s->bus), &dwc2_bus_ops, dev);
usb_register_port(&s->bus, &s->uport, s, 0, &dwc2_port_ops,
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 29/35] hw/usb: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (27 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 28/35] hw/usb: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 30/35] hw/virtio: " Akihiko Odaki
` (6 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
hw/usb/hcd-xhci-sysbus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/usb/hcd-xhci-sysbus.c b/hw/usb/hcd-xhci-sysbus.c
index 6d060062ab86..a078ab489c54 100644
--- a/hw/usb/hcd-xhci-sysbus.c
+++ b/hw/usb/hcd-xhci-sysbus.c
@@ -45,7 +45,7 @@ static void xhci_sysbus_realize(DeviceState *dev, Error **errp)
s->xhci.numintrs);
if (s->xhci.dma_mr) {
s->xhci.as = g_malloc0(sizeof(AddressSpace));
- address_space_init(s->xhci.as, NULL, s->xhci.dma_mr, NULL);
+ address_space_init(s->xhci.as, OBJECT(s), s->xhci.dma_mr, "as");
} else {
s->xhci.as = &address_space_memory;
}
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 30/35] hw/virtio: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (28 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 29/35] " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 31/35] system/physmem: " Akihiko Odaki
` (5 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
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 *bus, void *opaque,
char *name = g_strdup_printf("%s-%d-%d",
TYPE_VIRTIO_IOMMU_MEMORY_REGION,
mr_index++, devfn);
+ g_autofree char *as_name = g_strconcat(name, "-as", NULL);
sdev = sbus->pbdev[devfn] = g_new0(IOMMUDevice, 1);
sdev->viommu = s;
@@ -430,7 +431,7 @@ static AddressSpace *virtio_iommu_find_add_as(PCIBus *bus, void *opaque,
trace_virtio_iommu_init_iommu_mr(name);
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);
/*
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");
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, Error **errp)
/* PCI BAR regions must be powers of 2 */
pow2ceil(proxy->notify.offset + proxy->notify.size));
- 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");
if (proxy->disable_legacy == ON_OFF_AUTO_AUTO) {
proxy->disable_legacy = 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));
}
}
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 31/35] system/physmem: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (29 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 30/35] hw/virtio: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 32/35] target/i386: " Akihiko Odaki
` (4 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
include/exec/cpu-common.h | 4 ++--
system/physmem.c | 17 ++++++++---------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index 9b658a3f48f7..420e7a71001a 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -105,7 +105,7 @@ size_t qemu_ram_pagesize_largest(void);
* cpu_address_space_init:
* @cpu: CPU to add this address space to
* @asidx: integer index of this address space
- * @prefix: prefix to be used as name of address space
+ * @name: name of address space
* @mr: the root memory region of address space
*
* Add the specified address space to the CPU's cpu_ases list.
@@ -121,7 +121,7 @@ size_t qemu_ram_pagesize_largest(void);
* Note that with KVM only one address space is supported.
*/
void cpu_address_space_init(CPUState *cpu, int asidx,
- const char *prefix, MemoryRegion *mr);
+ const char *name, MemoryRegion *mr);
/**
* cpu_address_space_destroy:
* @cpu: CPU for which address space needs to be destroyed
diff --git a/system/physmem.c b/system/physmem.c
index 6190eca7daed..7fa7b9ee6b76 100644
--- a/system/physmem.c
+++ b/system/physmem.c
@@ -774,16 +774,13 @@ hwaddr memory_region_section_get_iotlb(CPUState *cpu,
#endif /* CONFIG_TCG */
void cpu_address_space_init(CPUState *cpu, int asidx,
- const char *prefix, MemoryRegion *mr)
+ const char *name, MemoryRegion *mr)
{
CPUAddressSpace *newas;
AddressSpace *as = g_new0(AddressSpace, 1);
- char *as_name;
assert(mr);
- as_name = g_strdup_printf("%s-%d", prefix, cpu->cpu_index);
- address_space_init(as, NULL, mr, as_name);
- g_free(as_name);
+ address_space_init(as, OBJECT(cpu), mr, name);
/* Target code should have set num_ases before calling us */
assert(asidx < cpu->num_ases);
@@ -831,7 +828,7 @@ void cpu_address_space_destroy(CPUState *cpu, int asidx)
memory_listener_unregister(&cpuas->tcg_as_listener);
}
- address_space_destroy(cpuas->as);
+ object_unparent(OBJECT(cpuas->as));
call_rcu1(&cpuas->as->rcu, address_space_free);
if (asidx == 0) {
@@ -2814,15 +2811,17 @@ static void tcg_commit(MemoryListener *listener)
static void memory_map_init(void)
{
- system_memory = g_malloc(sizeof(*system_memory));
+ Object *owner = machine_get_container("unattached");
+ system_memory = g_malloc(sizeof(*system_memory));
memory_region_init(system_memory, NULL, "system", UINT64_MAX);
- address_space_init(&address_space_memory, NULL, system_memory, "memory");
+ address_space_init(&address_space_memory, owner, system_memory,
+ "system-as");
system_io = g_malloc(sizeof(*system_io));
memory_region_init_io(system_io, NULL, &unassigned_io_ops, NULL, "io",
65536);
- address_space_init(&address_space_io, NULL, system_io, "I/O");
+ address_space_init(&address_space_io, owner, system_io, "io-as");
}
MemoryRegion *get_system_memory(void)
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 32/35] target/i386: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (30 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 31/35] system/physmem: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 33/35] target/mips: " Akihiko Odaki
` (3 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
target/i386/kvm/kvm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 2ce071dfafb2..17f3c3c9e543 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -2725,7 +2725,8 @@ static void register_smram_listener(Notifier *n, void *unused)
memory_region_set_enabled(smram, true);
}
- address_space_init(&smram_address_space, NULL, &smram_as_root, "KVM-SMRAM");
+ address_space_init(&smram_address_space, OBJECT(kvm_state), &smram_as_root,
+ "smram-as");
kvm_memory_listener_register(kvm_state, &smram_listener,
&smram_address_space, 1, "kvm-smram");
}
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 33/35] target/mips: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (31 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 32/35] target/i386: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 34/35] target/xtensa: " Akihiko Odaki
` (2 subsequent siblings)
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
target/mips/cpu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/mips/cpu.c b/target/mips/cpu.c
index b13df32e6479..571caf6f4e0b 100644
--- a/target/mips/cpu.c
+++ b/target/mips/cpu.c
@@ -505,8 +505,8 @@ static void mips_cpu_initfn(Object *obj)
if (mcc->cpu_def->lcsr_cpucfg2 & (1 << CPUCFG2_LCSRP)) {
memory_region_init_io(&env->iocsr.mr, OBJECT(cpu), NULL,
env, "iocsr", UINT64_MAX);
- address_space_init(&env->iocsr.as, NULL,
- &env->iocsr.mr, "IOCSR");
+ address_space_init(&env->iocsr.as, OBJECT(cpu),
+ &env->iocsr.mr, "iocsr-as");
}
#endif
}
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 34/35] target/xtensa: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (32 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 33/35] target/mips: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 35/35] memory: Drop non-QOM AddressSpace support Akihiko Odaki
2025-09-18 12:39 ` [PATCH 00/35] memory: QOM-ify AddressSpace Cédric Le Goater
35 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
target/xtensa/cpu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c
index 26a1c87a7856..de68a36bc36f 100644
--- a/target/xtensa/cpu.c
+++ b/target/xtensa/cpu.c
@@ -272,7 +272,7 @@ static void xtensa_cpu_initfn(Object *obj)
env->system_er = g_malloc(sizeof(*env->system_er));
memory_region_init_io(env->system_er, obj, NULL, env, "er",
UINT64_C(0x100000000));
- address_space_init(env->address_space_er, NULL, env->system_er, "ER");
+ address_space_init(env->address_space_er, obj, env->system_er, "er-as");
cpu->clock = qdev_init_clock_in(DEVICE(obj), "clk-in", NULL, cpu, 0);
clock_set_hz(cpu->clock, env->config->clock_freq_khz * 1000);
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* [PATCH 35/35] memory: Drop non-QOM AddressSpace support
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (33 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 34/35] target/xtensa: " Akihiko Odaki
@ 2025-09-17 12:56 ` Akihiko Odaki
2025-09-17 16:01 ` Richard Henderson
2025-09-18 12:39 ` [PATCH 00/35] memory: QOM-ify AddressSpace Cédric Le Goater
35 siblings, 1 reply; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-17 12:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis, Akihiko Odaki
Now all AddressSpace instances are converted to QOM so drop
non-QOM AddressSpace support.
Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
include/system/memory.h | 13 -------------
system/memory.c | 26 +++++---------------------
2 files changed, 5 insertions(+), 34 deletions(-)
diff --git a/include/system/memory.h b/include/system/memory.h
index 5108e0fba339..9b249b4b3ae2 100644
--- a/include/system/memory.h
+++ b/include/system/memory.h
@@ -1163,8 +1163,6 @@ struct AddressSpace {
/* private: */
Object parent_obj;
struct rcu_head rcu;
- bool qom;
- char *name;
MemoryRegion *root;
/* Accessed via RCU. */
@@ -2719,17 +2717,6 @@ MemTxResult memory_region_dispatch_write(MemoryRegion *mr,
void address_space_init(AddressSpace *as, Object *parent, MemoryRegion *root,
const char *name);
-/**
- * address_space_destroy: destroy an address space
- *
- * Releases all resources associated with an address space. After an address space
- * is destroyed, its root memory region (given by address_space_init()) may be destroyed
- * as well.
- *
- * @as: address space to be destroyed
- */
-void address_space_destroy(AddressSpace *as);
-
/**
* address_space_get_path: get the path to an address space
*
diff --git a/system/memory.c b/system/memory.c
index 7a77ba0f1797..363f50e7a4f0 100644
--- a/system/memory.c
+++ b/system/memory.c
@@ -3206,11 +3206,7 @@ void address_space_remove_listeners(AddressSpace *as)
void address_space_init(AddressSpace *as, Object *parent, MemoryRegion *root,
const char *name)
{
- if (parent) {
- object_initialize_child(parent, name, as, TYPE_ADDRESS_SPACE);
- }
-
- as->qom = parent;
+ object_initialize_child(parent, name, as, TYPE_ADDRESS_SPACE);
memory_region_ref(root);
as->root = root;
as->current_map = NULL;
@@ -3222,12 +3218,11 @@ void address_space_init(AddressSpace *as, Object *parent, MemoryRegion *root,
as->bounce_buffer_size = 0;
qemu_mutex_init(&as->map_client_list_lock);
QLIST_INIT(&as->map_client_list);
- as->name = g_strdup(name ? name : "anonymous");
address_space_update_topology(as);
address_space_update_ioeventfds(as);
}
-static void do_address_space_destroy(struct rcu_head *head)
+static void do_address_space_finalize(struct rcu_head *head)
{
AddressSpace *as = container_of(head, AddressSpace, rcu);
@@ -3238,18 +3233,13 @@ static void do_address_space_destroy(struct rcu_head *head)
assert(QTAILQ_EMPTY(&as->listeners));
flatview_unref(as->current_map);
- g_free(as->name);
g_free(as->ioeventfds);
memory_region_unref(as->root);
}
static void address_space_finalize(Object *obj)
{
- address_space_destroy(ADDRESS_SPACE(obj));
-}
-
-void address_space_destroy(AddressSpace *as)
-{
+ AddressSpace *as = ADDRESS_SPACE(obj);
MemoryRegion *root = as->root;
/* Flush out anything from MemoryListeners listening in on this */
@@ -3263,18 +3253,12 @@ void address_space_destroy(AddressSpace *as)
* values to expire before freeing the data.
*/
as->root = root;
- call_rcu1(&as->rcu, do_address_space_destroy);
+ call_rcu1(&as->rcu, do_address_space_finalize);
}
char *address_space_get_path(AddressSpace *as)
{
- char *path;
-
- if (!as->qom) {
- return as->name;
- }
-
- path = object_get_canonical_path(OBJECT(as));
+ char *path = object_get_canonical_path(OBJECT(as));
return path ? path : g_strdup("orphan");
}
--
2.51.0
^ permalink raw reply related [flat|nested] 50+ messages in thread
* Re: [PATCH 13/35] hw/mem: QOM-ify AddressSpace
2025-09-17 12:56 ` [PATCH 13/35] hw/mem: " Akihiko Odaki
@ 2025-09-17 13:24 ` Jonathan Cameron via
0 siblings, 0 replies; 50+ messages in thread
From: Jonathan Cameron via @ 2025-09-17 13:24 UTC (permalink / raw)
To: Akihiko Odaki
Cc: qemu-devel, Richard Henderson, Peter Maydell,
Cédric Le Goater, Steven Lee, Troy Lee, Jamin Lin,
Andrew Jeffery, Joel Stanley, Eric Auger, Helge Deller,
Philippe Mathieu-Daudé, Hervé Poussineau,
Aleksandar Rikalo, Edgar E. Iglesias, Alistair Francis,
Ninad Palsule, Paolo Bonzini, Eduardo Habkost, Michael S. Tsirkin,
Marcel Apfelbaum, Jason Wang, Yi Liu, Clément Mathieu--Drif,
Nicholas Piggin, Aditya Gupta, Gautam Menghani, Song Gao,
Bibo Mao, Jiaxun Yang, 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Cédric Le Goater,
Stefano Garzarella, Alistair Francis
On Wed, 17 Sep 2025 21:56:25 +0900
Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> wrote:
> 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 <odaki@rsg.ci.i.u-tokyo.ac.jp>
Assuming the fundamental change makes sense (which I haven't looked into in
enough depth!), this CXL bit looks fine to me.
Acked-by: Jonathan Cameron <jonathan.cameron@huawei.com>
>
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PATCH 02/35] hw/core/loader: Use address_space_get_path()
2025-09-17 12:56 ` [PATCH 02/35] hw/core/loader: Use address_space_get_path() Akihiko Odaki
@ 2025-09-17 15:18 ` Richard Henderson
2025-09-17 15:55 ` Richard Henderson
0 siblings, 1 reply; 50+ messages in thread
From: Richard Henderson @ 2025-09-17 15:18 UTC (permalink / raw)
To: Akihiko Odaki, qemu-devel
On 9/17/25 05:56, Akihiko Odaki wrote:
> The name field of an QOM-ified AddressSpace represents a property name,
> which may not be sufficient to identify the AddressSpace. Use
> address_space_get_path() instead.
>
> Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
> ---
> hw/core/loader.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/core/loader.c b/hw/core/loader.c
> index 524af6f14a09..1ee603f19c90 100644
> --- a/hw/core/loader.c
> +++ b/hw/core/loader.c
> @@ -1258,10 +1258,10 @@ static bool roms_overlap(Rom *last_rom, Rom *this_rom)
> last_rom->addr + last_rom->romsize > this_rom->addr;
> }
>
> -static const char *rom_as_name(Rom *rom)
> +static const char *rom_as_path(Rom *rom)
> {
> - const char *name = rom->as ? rom->as->name : NULL;
> - return name ?: "anonymous";
> + const char *path = rom->as ? address_space_get_path(rom->as) : NULL;
> + return path ?: "anonymous";
> }
You're not freeing the result of address_space_get_path.
r~
>
> static void rom_print_overlap_error_header(void)
> @@ -1280,7 +1280,7 @@ static void rom_print_one_overlap_error(Rom *last_rom, Rom *rom)
> {
> error_printf(
> "\nThe following two regions overlap (in the %s address space):\n",
> - rom_as_name(rom));
> + rom_as_path(rom));
> error_printf(
> " %s (addresses 0x" HWADDR_FMT_plx " - 0x" HWADDR_FMT_plx ")\n",
> last_rom->name, last_rom->addr, last_rom->addr + last_rom->romsize);
>
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PATCH 01/35] memory: QOM-ify AddressSpace
2025-09-17 12:56 ` [PATCH 01/35] " Akihiko Odaki
@ 2025-09-17 15:53 ` Richard Henderson
0 siblings, 0 replies; 50+ messages in thread
From: Richard Henderson @ 2025-09-17 15:53 UTC (permalink / raw)
To: Akihiko Odaki, qemu-devel
On 9/17/25 05:56, Akihiko Odaki wrote:
> +char *address_space_get_path(AddressSpace *as)
> +{
> + char *path;
> +
> + if (!as->qom) {
> + return as->name;
You need to strdup this to allow the caller to free the result.
r~
> + }
> +
> + path = object_get_canonical_path(OBJECT(as));
> +
> + return path ? path : g_strdup("orphan");
> }
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PATCH 02/35] hw/core/loader: Use address_space_get_path()
2025-09-17 15:18 ` Richard Henderson
@ 2025-09-17 15:55 ` Richard Henderson
0 siblings, 0 replies; 50+ messages in thread
From: Richard Henderson @ 2025-09-17 15:55 UTC (permalink / raw)
To: Akihiko Odaki, qemu-devel
On 9/17/25 08:18, Richard Henderson wrote:
> On 9/17/25 05:56, Akihiko Odaki wrote:
>> The name field of an QOM-ified AddressSpace represents a property name,
>> which may not be sufficient to identify the AddressSpace. Use
>> address_space_get_path() instead.
>>
>> Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
>> ---
>> hw/core/loader.c | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/hw/core/loader.c b/hw/core/loader.c
>> index 524af6f14a09..1ee603f19c90 100644
>> --- a/hw/core/loader.c
>> +++ b/hw/core/loader.c
>> @@ -1258,10 +1258,10 @@ static bool roms_overlap(Rom *last_rom, Rom *this_rom)
>> last_rom->addr + last_rom->romsize > this_rom->addr;
>> }
>> -static const char *rom_as_name(Rom *rom)
>> +static const char *rom_as_path(Rom *rom)
>> {
>> - const char *name = rom->as ? rom->as->name : NULL;
>> - return name ?: "anonymous";
>> + const char *path = rom->as ? address_space_get_path(rom->as) : NULL;
>> + return path ?: "anonymous";
>> }
>
> You're not freeing the result of address_space_get_path.
In addition, I think the result of address_space_get_path cannot be null, so,
if (rom->as) {
return address_space_get_path(rom->as);
}
return g_strdup("anonymous");
r~
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PATCH 04/35] hw/alpha: QOM-ify AddressSpace
2025-09-17 12:56 ` [PATCH 04/35] hw/alpha: QOM-ify AddressSpace Akihiko Odaki
@ 2025-09-17 15:56 ` Richard Henderson
0 siblings, 0 replies; 50+ messages in thread
From: Richard Henderson @ 2025-09-17 15:56 UTC (permalink / raw)
To: Akihiko Odaki, qemu-devel
On 9/17/25 05:56, Akihiko Odaki wrote:
> 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.
>
> Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
> ---
> hw/alpha/typhoon.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
>
> diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
> index d2307b076897..7c38be2378ed 100644
> --- a/hw/alpha/typhoon.c
> +++ b/hw/alpha/typhoon.c
> @@ -900,8 +900,8 @@ PCIBus *typhoon_init(MemoryRegion *ram, qemu_irq *p_isa_irq,
> memory_region_init_iommu(&s->pchip.iommu, sizeof(s->pchip.iommu),
> TYPE_TYPHOON_IOMMU_MEMORY_REGION, OBJECT(s),
> "iommu-typhoon", UINT64_MAX);
> - address_space_init(&s->pchip.iommu_as, NULL, MEMORY_REGION(&s->pchip.iommu),
> - "pchip0-pci");
> + address_space_init(&s->pchip.iommu_as, OBJECT(s),
> + MEMORY_REGION(&s->pchip.iommu), "pchip0-pci");
> pci_setup_iommu(b, &typhoon_iommu_ops, s);
>
> /* Pchip0 PCI special/interrupt acknowledge, 0x801.F800.0000, 64MB. */
>
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PATCH 05/35] hw/arm: QOM-ify AddressSpace
2025-09-17 12:56 ` [PATCH 05/35] hw/arm: " Akihiko Odaki
@ 2025-09-17 15:57 ` Richard Henderson
0 siblings, 0 replies; 50+ messages in thread
From: Richard Henderson @ 2025-09-17 15:57 UTC (permalink / raw)
To: Akihiko Odaki, qemu-devel
On 9/17/25 05:56, Akihiko Odaki wrote:
> 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<odaki@rsg.ci.i.u-tokyo.ac.jp>
> ---
> hw/arm/armv7m.c | 2 +-
> hw/arm/aspeed_ast27x0.c | 2 +-
> hw/arm/smmu-common.c | 5 +++--
> 3 files changed, 5 insertions(+), 4 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PATCH 35/35] memory: Drop non-QOM AddressSpace support
2025-09-17 12:56 ` [PATCH 35/35] memory: Drop non-QOM AddressSpace support Akihiko Odaki
@ 2025-09-17 16:01 ` Richard Henderson
0 siblings, 0 replies; 50+ messages in thread
From: Richard Henderson @ 2025-09-17 16:01 UTC (permalink / raw)
To: Akihiko Odaki, qemu-devel
On 9/17/25 05:56, Akihiko Odaki wrote:
> Now all AddressSpace instances are converted to QOM so drop
> non-QOM AddressSpace support.
>
> Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
> ---
> include/system/memory.h | 13 -------------
> system/memory.c | 26 +++++---------------------
> 2 files changed, 5 insertions(+), 34 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PATCH 10/35] hw/i386: QOM-ify AddressSpace
2025-09-17 12:56 ` [PATCH 10/35] hw/i386: " Akihiko Odaki
@ 2025-09-18 5:53 ` CLEMENT MATHIEU--DRIF
2025-09-18 12:16 ` Akihiko Odaki
0 siblings, 1 reply; 50+ messages in thread
From: CLEMENT MATHIEU--DRIF @ 2025-09-18 5:53 UTC (permalink / raw)
To: Akihiko Odaki, qemu-devel@nongnu.org
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
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,
Cédric Le Goater, Stefano Garzarella, Alistair Francis
Hi Akihiko,
Why do we change the naming scheme in amd-vi?
Did you have any issue with the old one?
If we decide not to stick to the old one, maybe splitting the slot and function would be convenient.
Thanks
On Wed, 2025-09-17 at 21:56 +0900, Akihiko Odaki wrote:
>
>
> 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 <[odaki@rsg.ci.i.u-tokyo.ac.jp](mailto:odaki@rsg.ci.i.u-tokyo.ac.jp)>
> ---
> hw/i386/amd_iommu.c | 5 +++--
> hw/i386/intel_iommu.c | 6 ++++--
> 2 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c
> index af239390ba04..541b9a8c89e1 100644
> --- a/hw/i386/amd_iommu.c
> +++ b/hw/i386/amd_iommu.c
> @@ -1494,7 +1494,7 @@ static AddressSpace *amdvi_host_dma_iommu(PCIBus *bus, void *opaque, int devfn)
>
> /* set up AMD-Vi region */
> if (!iommu_as[devfn]) {
> - snprintf(name, sizeof(name), "amd_iommu_devfn_%d", devfn);
> + snprintf(name, sizeof(name), "as-%d", devfn);
>
> iommu_as[devfn] = g_new0(AMDVIAddressSpace, 1);
> iommu_as[devfn]->bus_num = (uint8_t)bus_num;
> @@ -1522,7 +1522,8 @@ static AddressSpace *amdvi_host_dma_iommu(PCIBus *bus, void *opaque, int devfn)
> "amd_iommu", UINT64_MAX);
> memory_region_init(&amdvi_dev_as->root, OBJECT(s),
> "amdvi_root", UINT64_MAX);
> - address_space_init(&amdvi_dev_as->as, NULL, &amdvi_dev_as->root, name);
> + address_space_init(&amdvi_dev_as->as, OBJECT(s), &amdvi_dev_as->root,
> + name);
> memory_region_add_subregion_overlap(&amdvi_dev_as->root, 0,
> MEMORY_REGION(&amdvi_dev_as->iommu),
> 0);
> diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
> index 1f40d904326e..5e6d7d510e03 100644
> --- a/hw/i386/intel_iommu.c
> +++ b/hw/i386/intel_iommu.c
> @@ -4221,6 +4221,7 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus,
> vtd_iommu_unlock(s);
>
> if (!vtd_dev_as) {
> + g_autofree char *as_name = NULL;
> struct vtd_as_key *new_key;
> /* Slow path */
>
> @@ -4263,8 +4264,9 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus,
> vtd_dev_as->iova_tree = iova_tree_new();
>
> memory_region_init(&vtd_dev_as->root, OBJECT(s), name, UINT64_MAX);
> - address_space_init(&vtd_dev_as->as, NULL, &vtd_dev_as->root,
> - "vtd-root");
> + as_name = g_strconcat(name, "-as", NULL);
> + address_space_init(&vtd_dev_as->as, OBJECT(s), &vtd_dev_as->root,
> + as_name);
>
> /*
> * Build the DMAR-disabled container with aliases to the
>
> --
> 2.51.0
>
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PATCH 03/35] vfio: Use address_space_get_path()
2025-09-17 12:56 ` [PATCH 03/35] vfio: " Akihiko Odaki
@ 2025-09-18 9:52 ` Cédric Le Goater
0 siblings, 0 replies; 50+ messages in thread
From: Cédric Le Goater @ 2025-09-18 9:52 UTC (permalink / raw)
To: Akihiko Odaki, qemu-devel
Cc: Richard Henderson, Peter Maydell, Steven Lee, Troy Lee, Jamin Lin,
Andrew Jeffery, Joel Stanley, Eric Auger, Helge Deller,
Philippe Mathieu-Daudé, Hervé Poussineau,
Aleksandar Rikalo, Edgar E. Iglesias, Alistair Francis,
Ninad Palsule, Paolo Bonzini, Eduardo Habkost, Michael S. Tsirkin,
Marcel Apfelbaum, Jason Wang, Yi Liu, Clément 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, qemu-ppc, qemu-riscv,
qemu-s390x, qemu-block, kvm, Alex Williamson,
Cédric Le Goater, Stefano Garzarella, Alistair Francis
On 9/17/25 14:56, Akihiko Odaki wrote:
> The name field of an QOM-ified AddressSpace represents a property name,
> which may not be sufficient to identify the AddressSpace. Use
> address_space_get_path() instead.
>
> Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Thanks,
C.
> ---
> hw/vfio/listener.c | 8 ++++++--
> hw/virtio/vhost-vdpa.c | 4 +++-
> 2 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/hw/vfio/listener.c b/hw/vfio/listener.c
> index f498e23a9374..d0418db28c8b 100644
> --- a/hw/vfio/listener.c
> +++ b/hw/vfio/listener.c
> @@ -137,9 +137,11 @@ static void vfio_iommu_map_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb)
> iova, iova + iotlb->addr_mask);
>
> if (iotlb->target_as != &address_space_memory) {
> + g_autofree char *path = address_space_get_path(iotlb->target_as);
> +
> error_setg(&local_err,
> "Wrong target AS \"%s\", only system memory is allowed",
> - iotlb->target_as->name ? iotlb->target_as->name : "none");
> + path);
> if (migration_is_running()) {
> migration_file_set_error(-EINVAL, local_err);
> } else {
> @@ -1060,9 +1062,11 @@ static void vfio_iommu_map_dirty_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb)
> trace_vfio_iommu_map_dirty_notify(iova, iova + iotlb->addr_mask);
>
> if (iotlb->target_as != &address_space_memory) {
> + g_autofree char *path = address_space_get_path(iotlb->target_as);
> +
> error_setg(&local_err,
> "Wrong target AS \"%s\", only system memory is allowed",
> - iotlb->target_as->name ? iotlb->target_as->name : "none");
> + path);
> goto out;
> }
>
> diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
> index 7061b6e1a386..7ed639358458 100644
> --- a/hw/virtio/vhost-vdpa.c
> +++ b/hw/virtio/vhost-vdpa.c
> @@ -213,8 +213,10 @@ static void vhost_vdpa_iommu_map_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb)
> hwaddr xlat;
>
> if (iotlb->target_as != &address_space_memory) {
> + g_autofree char *path = address_space_get_path(iotlb->target_as);
> +
> error_report("Wrong target AS \"%s\", only system memory is allowed",
> - iotlb->target_as->name ? iotlb->target_as->name : "none");
> + path);
> return;
> }
> RCU_READ_LOCK_GUARD();
>
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PATCH 10/35] hw/i386: QOM-ify AddressSpace
2025-09-18 5:53 ` CLEMENT MATHIEU--DRIF
@ 2025-09-18 12:16 ` Akihiko Odaki
0 siblings, 0 replies; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-18 12:16 UTC (permalink / raw)
To: CLEMENT MATHIEU--DRIF, qemu-devel@nongnu.org
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
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,
Cédric Le Goater, Stefano Garzarella, Alistair Francis
On 2025/09/18 14:53, CLEMENT MATHIEU--DRIF wrote:
> Hi Akihiko,
>
> Why do we change the naming scheme in amd-vi?
> Did you have any issue with the old one?
QOM-ifying AddressSpaces moves the responsibility to create distinct
identifiers for debug outputs from the callers of address_space_init()
to AddressSpaces. QOM-ified AddressSpaces can create unique, unambigous
identifiers by inspecting the QOM hierarchy and cover all devices, not
just amd-iommu.
>
> If we decide not to stick to the old one, maybe splitting the slot and function would be convenient.
Strictly speaking such a change is an out-of-scope of this patch, but it
won't hurt to have it. I'll make the change with the next version.
Regards,
Akihiko Odaki
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PATCH 00/35] memory: QOM-ify AddressSpace
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
` (34 preceding siblings ...)
2025-09-17 12:56 ` [PATCH 35/35] memory: Drop non-QOM AddressSpace support Akihiko Odaki
@ 2025-09-18 12:39 ` Cédric Le Goater
2025-09-18 12:47 ` Akihiko Odaki
35 siblings, 1 reply; 50+ messages in thread
From: Cédric Le Goater @ 2025-09-18 12:39 UTC (permalink / raw)
To: Akihiko Odaki, qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Stefano Garzarella,
Alistair Francis
Hello Akihiko,
On 9/17/25 14:56, Akihiko Odaki wrote:
> Based-on: <20250917-subregion-v1-0-bef37d9b4f73@rsg.ci.i.u-tokyo.ac.jp>
> ("[PATCH 00/14] Fix memory region use-after-finalization")
>
> 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.
>
> Suggested by BALATON Zoltan:
> https://lore.kernel.org/qemu-devel/cd21698f-db77-eb75-6966-d559fdcab835@eik.bme.hu/
>
> Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
I wonder if this is going to fix an issue I was seeing a while ago
in the FSI models. I couldn't find a clean way to avoid corrupting
memory because of how the address_space was created and later on
destroyed. See below,
Thanks,
C.
from hw/fsi/ :
typedef struct OPBus {
BusState bus;
MemoryRegion mr;
AddressSpace as;
} OPBus;
typedef struct AspeedAPB2OPBState {
...
OPBus opb[ASPEED_FSI_NUM];
...
}
static void fsi_aspeed_apb2opb_realize(DeviceState *dev, Error **errp)
{
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
AspeedAPB2OPBState *s = ASPEED_APB2OPB(dev);
int i;
/*
* TODO: The OPBus model initializes the OPB address space in
* the .instance_init handler and this is problematic for test
* device-introspect-test. To avoid a memory corruption and a QEMU
* crash, qbus_init() should be called from realize(). Something to
* improve. Possibly, OPBus could also be removed.
*/
for (i = 0; i < ASPEED_FSI_NUM; i++) {
qbus_init(&s->opb[i], sizeof(s->opb[i]), TYPE_OP_BUS, DEVICE(s),
NULL);
}
....
static void fsi_opb_init(Object *o)
{
OPBus *opb = OP_BUS(o);
memory_region_init(&opb->mr, 0, TYPE_FSI_OPB, UINT32_MAX);
address_space_init(&opb->as, &opb->mr, TYPE_FSI_OPB);
}
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PATCH 00/35] memory: QOM-ify AddressSpace
2025-09-18 12:39 ` [PATCH 00/35] memory: QOM-ify AddressSpace Cédric Le Goater
@ 2025-09-18 12:47 ` Akihiko Odaki
2025-09-29 20:58 ` Peter Xu
0 siblings, 1 reply; 50+ messages in thread
From: Akihiko Odaki @ 2025-09-18 12:47 UTC (permalink / raw)
To: Cédric Le Goater, qemu-devel
Cc: Richard Henderson, Peter Maydell, Cédric Le Goater,
Steven Lee, Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley,
Eric Auger, Helge Deller, Philippe Mathieu-Daudé,
Hervé Poussineau, Aleksandar Rikalo, Edgar E. Iglesias,
Alistair Francis, Ninad Palsule, Paolo Bonzini, Eduardo Habkost,
Michael S. Tsirkin, Marcel Apfelbaum, Jason Wang, Yi Liu,
Clément 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, qemu-ppc, qemu-riscv, qemu-s390x,
qemu-block, kvm, Alex Williamson, Stefano Garzarella,
Alistair Francis
On 2025/09/18 21:39, Cédric Le Goater wrote:
> Hello Akihiko,
>
> On 9/17/25 14:56, Akihiko Odaki wrote:
>> Based-on: <20250917-subregion-v1-0-bef37d9b4f73@rsg.ci.i.u-tokyo.ac.jp>
>> ("[PATCH 00/14] Fix memory region use-after-finalization")
>>
>> 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.
>>
>> Suggested by BALATON Zoltan:
>> https://lore.kernel.org/qemu-devel/cd21698f-db77-eb75-6966-
>> d559fdcab835@eik.bme.hu/
>>
>> Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
>
> I wonder if this is going to fix an issue I was seeing a while ago
> in the FSI models. I couldn't find a clean way to avoid corrupting
> memory because of how the address_space was created and later on
> destroyed. See below,
Partially, but this is insufficient.
The first problem is that AddressSpace suffers from circular references
the following series solves:
https://lore.kernel.org/qemu-devel/20250906-mr-v2-0-2820f5a3d282@rsg.ci.i.u-tokyo.ac.jp/
"[PATCH v2 0/3] memory: Stop piggybacking on memory region owners"
Another problem is that RCU is not properly waited. This is left to
future work.
Regards,
Akihiko Odaki
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PATCH 00/35] memory: QOM-ify AddressSpace
2025-09-18 12:47 ` Akihiko Odaki
@ 2025-09-29 20:58 ` Peter Xu
2025-09-30 8:06 ` Cédric Le Goater
0 siblings, 1 reply; 50+ messages in thread
From: Peter Xu @ 2025-09-29 20:58 UTC (permalink / raw)
To: Akihiko Odaki, Cédric Le Goater
Cc: Cédric Le Goater, qemu-devel, Richard Henderson,
Peter Maydell, Cédric Le Goater, Steven Lee, Troy Lee,
Jamin Lin, Andrew Jeffery, Joel Stanley, Eric Auger, Helge Deller,
Philippe Mathieu-Daudé, Hervé Poussineau,
Aleksandar Rikalo, Edgar E. Iglesias, Alistair Francis,
Ninad Palsule, Paolo Bonzini, Eduardo Habkost, Michael S. Tsirkin,
Marcel Apfelbaum, Jason Wang, Yi Liu, Clément 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,
Marcelo Tosatti, Max Filippov, qemu-arm, qemu-ppc, qemu-riscv,
qemu-s390x, qemu-block, kvm, Alex Williamson, Stefano Garzarella,
Alistair Francis
On Thu, Sep 18, 2025 at 09:47:07PM +0900, Akihiko Odaki wrote:
> On 2025/09/18 21:39, Cédric Le Goater wrote:
> > Hello Akihiko,
> >
> > On 9/17/25 14:56, Akihiko Odaki wrote:
> > > Based-on: <20250917-subregion-v1-0-bef37d9b4f73@rsg.ci.i.u-tokyo.ac.jp>
> > > ("[PATCH 00/14] Fix memory region use-after-finalization")
> > >
> > > 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.
> > >
> > > Suggested by BALATON Zoltan:
> > > https://lore.kernel.org/qemu-devel/cd21698f-db77-eb75-6966-
> > > d559fdcab835@eik.bme.hu/
> > >
> > > Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
> >
> > I wonder if this is going to fix an issue I was seeing a while ago
> > in the FSI models. I couldn't find a clean way to avoid corrupting
> > memory because of how the address_space was created and later on
> > destroyed. See below,
>
> Partially, but this is insufficient.
>
> The first problem is that AddressSpace suffers from circular references the
> following series solves:
> https://lore.kernel.org/qemu-devel/20250906-mr-v2-0-2820f5a3d282@rsg.ci.i.u-tokyo.ac.jp/
> "[PATCH v2 0/3] memory: Stop piggybacking on memory region owners"
>
> Another problem is that RCU is not properly waited. This is left to future
> work.
Just to mention, Peter Maydell just posted a series for fixing AS
destructions here:
https://lore.kernel.org/qemu-devel/20250929144228.1994037-1-peter.maydell@linaro.org/
IIUC it should also work for FSI, if FSI can convert to use dynamically
allocated AddressSpaces (with/without QOMify; as Akihiko pointed out
correctly, these should be orthogonal), then provide a proper unrealize()
of the bus device to invoke address_space_destroy_free().
Thanks,
--
Peter Xu
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PATCH 00/35] memory: QOM-ify AddressSpace
2025-09-29 20:58 ` Peter Xu
@ 2025-09-30 8:06 ` Cédric Le Goater
0 siblings, 0 replies; 50+ messages in thread
From: Cédric Le Goater @ 2025-09-30 8:06 UTC (permalink / raw)
To: Peter Xu, Akihiko Odaki
Cc: qemu-devel, Richard Henderson, Peter Maydell,
Cédric Le Goater, Steven Lee, Troy Lee, Jamin Lin,
Andrew Jeffery, Joel Stanley, Eric Auger, Helge Deller,
Philippe Mathieu-Daudé, Hervé Poussineau,
Aleksandar Rikalo, Edgar E. Iglesias, Alistair Francis,
Ninad Palsule, Paolo Bonzini, Eduardo Habkost, Michael S. Tsirkin,
Marcel Apfelbaum, Jason Wang, Yi Liu, Clément 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,
Marcelo Tosatti, Max Filippov, qemu-arm, qemu-ppc, qemu-riscv,
qemu-s390x, qemu-block, kvm, Alex Williamson, Stefano Garzarella,
Alistair Francis
On 9/29/25 22:58, Peter Xu wrote:
> On Thu, Sep 18, 2025 at 09:47:07PM +0900, Akihiko Odaki wrote:
>> On 2025/09/18 21:39, Cédric Le Goater wrote:
>>> Hello Akihiko,
>>>
>>> On 9/17/25 14:56, Akihiko Odaki wrote:
>>>> Based-on: <20250917-subregion-v1-0-bef37d9b4f73@rsg.ci.i.u-tokyo.ac.jp>
>>>> ("[PATCH 00/14] Fix memory region use-after-finalization")
>>>>
>>>> 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.
>>>>
>>>> Suggested by BALATON Zoltan:
>>>> https://lore.kernel.org/qemu-devel/cd21698f-db77-eb75-6966-
>>>> d559fdcab835@eik.bme.hu/
>>>>
>>>> Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
>>>
>>> I wonder if this is going to fix an issue I was seeing a while ago
>>> in the FSI models. I couldn't find a clean way to avoid corrupting
>>> memory because of how the address_space was created and later on
>>> destroyed. See below,
>>
>> Partially, but this is insufficient.
>>
>> The first problem is that AddressSpace suffers from circular references the
>> following series solves:
>> https://lore.kernel.org/qemu-devel/20250906-mr-v2-0-2820f5a3d282@rsg.ci.i.u-tokyo.ac.jp/
>> "[PATCH v2 0/3] memory: Stop piggybacking on memory region owners"
>>
>> Another problem is that RCU is not properly waited. This is left to future
>> work.
>
> Just to mention, Peter Maydell just posted a series for fixing AS
> destructions here:
>
> https://lore.kernel.org/qemu-devel/20250929144228.1994037-1-peter.maydell@linaro.org/
>
> IIUC it should also work for FSI, if FSI can convert to use dynamically
> allocated AddressSpaces (with/without QOMify; as Akihiko pointed out
> correctly, these should be orthogonal), then provide a proper unrealize()
> of the bus device to invoke address_space_destroy_free().
Thanks,
I see the series is reviewed. Once merged, I will rework the OP bus
and check if the issue we initially saw on the OPB address space is
fixed.
C.
^ permalink raw reply [flat|nested] 50+ messages in thread
end of thread, other threads:[~2025-09-30 8:07 UTC | newest]
Thread overview: 50+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-17 12:56 [PATCH 00/35] memory: QOM-ify AddressSpace Akihiko Odaki
2025-09-17 12:56 ` [PATCH 01/35] " Akihiko Odaki
2025-09-17 15:53 ` Richard Henderson
2025-09-17 12:56 ` [PATCH 02/35] hw/core/loader: Use address_space_get_path() Akihiko Odaki
2025-09-17 15:18 ` Richard Henderson
2025-09-17 15:55 ` Richard Henderson
2025-09-17 12:56 ` [PATCH 03/35] vfio: " Akihiko Odaki
2025-09-18 9:52 ` Cédric Le Goater
2025-09-17 12:56 ` [PATCH 04/35] hw/alpha: QOM-ify AddressSpace Akihiko Odaki
2025-09-17 15:56 ` Richard Henderson
2025-09-17 12:56 ` [PATCH 05/35] hw/arm: " Akihiko Odaki
2025-09-17 15:57 ` Richard Henderson
2025-09-17 12:56 ` [PATCH 06/35] hw/display: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 07/35] hw/dma: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 08/35] hw/fsi: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 09/35] hw/i2c: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 10/35] hw/i386: " Akihiko Odaki
2025-09-18 5:53 ` CLEMENT MATHIEU--DRIF
2025-09-18 12:16 ` Akihiko Odaki
2025-09-17 12:56 ` [PATCH 11/35] hw/intc: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 12/35] hw/loongarch: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 13/35] hw/mem: " Akihiko Odaki
2025-09-17 13:24 ` Jonathan Cameron via
2025-09-17 12:56 ` [PATCH 14/35] hw/misc: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 15/35] hw/net: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 16/35] hw/nubus: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 17/35] hw/pci: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 18/35] hw/pci-host: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 19/35] hw/ppc: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 20/35] hw/remote: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 21/35] hw/riscv: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 22/35] hw/s390x: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 23/35] hw/scsi: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 24/35] hw/sd: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 25/35] hw/sparc: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 26/35] hw/sparc64: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 27/35] hw/ssi: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 28/35] hw/usb: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 29/35] " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 30/35] hw/virtio: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 31/35] system/physmem: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 32/35] target/i386: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 33/35] target/mips: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 34/35] target/xtensa: " Akihiko Odaki
2025-09-17 12:56 ` [PATCH 35/35] memory: Drop non-QOM AddressSpace support Akihiko Odaki
2025-09-17 16:01 ` Richard Henderson
2025-09-18 12:39 ` [PATCH 00/35] memory: QOM-ify AddressSpace Cédric Le Goater
2025-09-18 12:47 ` Akihiko Odaki
2025-09-29 20:58 ` Peter Xu
2025-09-30 8:06 ` Cédric Le Goater
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).