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 <od...@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
