| Message ID | 20190926173428.10713-4-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/arm/raspi: Improve Raspberry Pi 2/3 reliability | expand |
On Thu, Sep 26, 2019 at 10:36 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > > Various address spaces from the BCM2835 are reported as > 'anonymous' in memory tree: > > (qemu) info mtree > > address-space: anonymous > 0000000000000000-000000000000008f (prio 0, i/o): bcm2835-mbox > 0000000000000010-000000000000001f (prio 0, i/o): bcm2835-fb > 0000000000000080-000000000000008f (prio 0, i/o): bcm2835-property > > address-space: anonymous > 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu > 0000000000000000-000000003fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 0000000040000000-000000007fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 000000007e000000-000000007effffff (prio 1, i/o): alias bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff > 0000000080000000-00000000bfffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 00000000c0000000-00000000ffffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > > [...] > > Since the address_space_init() function takes a 'name' argument, > set it to correctly describe each address space: > > (qemu) info mtree > > address-space: bcm2835-mbox-memory > 0000000000000000-000000000000008f (prio 0, i/o): bcm2835-mbox > 0000000000000010-000000000000001f (prio 0, i/o): bcm2835-fb > 0000000000000080-000000000000008f (prio 0, i/o): bcm2835-property > > address-space: bcm2835-fb-memory > 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu > 0000000000000000-000000003fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 0000000040000000-000000007fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 000000007e000000-000000007effffff (prio 1, i/o): alias bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff > 0000000080000000-00000000bfffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 00000000c0000000-00000000ffffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > > address-space: bcm2835-property-memory > 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu > 0000000000000000-000000003fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 0000000040000000-000000007fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 000000007e000000-000000007effffff (prio 1, i/o): alias bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff > 0000000080000000-00000000bfffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 00000000c0000000-00000000ffffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > > address-space: bcm2835-dma-memory > 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu > 0000000000000000-000000003fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 0000000040000000-000000007fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 000000007e000000-000000007effffff (prio 1, i/o): alias bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff > 0000000080000000-00000000bfffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 00000000c0000000-00000000ffffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/display/bcm2835_fb.c | 2 +- > hw/dma/bcm2835_dma.c | 2 +- > hw/misc/bcm2835_mbox.c | 2 +- > hw/misc/bcm2835_property.c | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c > index 8f856878cd..85aaa54330 100644 > --- a/hw/display/bcm2835_fb.c > +++ b/hw/display/bcm2835_fb.c > @@ -425,7 +425,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, NULL); > + address_space_init(&s->dma_as, 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 6acc2b644e..1e458d7fba 100644 > --- a/hw/dma/bcm2835_dma.c > +++ b/hw/dma/bcm2835_dma.c > @@ -383,7 +383,7 @@ static void bcm2835_dma_realize(DeviceState *dev, Error **errp) > } > > s->dma_mr = MEMORY_REGION(obj); > - address_space_init(&s->dma_as, s->dma_mr, NULL); > + address_space_init(&s->dma_as, s->dma_mr, TYPE_BCM2835_DMA "-memory"); > > bcm2835_dma_reset(dev); > } > diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c > index 7690b9afaf..77285624c9 100644 > --- a/hw/misc/bcm2835_mbox.c > +++ b/hw/misc/bcm2835_mbox.c > @@ -311,7 +311,7 @@ static void bcm2835_mbox_realize(DeviceState *dev, Error **errp) > } > > s->mbox_mr = MEMORY_REGION(obj); > - address_space_init(&s->mbox_as, s->mbox_mr, NULL); > + address_space_init(&s->mbox_as, 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 0a1a3eb5d9..43a5465c5d 100644 > --- a/hw/misc/bcm2835_property.c > +++ b/hw/misc/bcm2835_property.c > @@ -407,7 +407,7 @@ static void bcm2835_property_realize(DeviceState *dev, Error **errp) > } > > s->dma_mr = MEMORY_REGION(obj); > - address_space_init(&s->dma_as, s->dma_mr, NULL); > + address_space_init(&s->dma_as, s->dma_mr, TYPE_BCM2835_PROPERTY "-memory"); > > /* TODO: connect to MAC address of USB NIC device, once we emulate it */ > qemu_macaddr_default_if_unset(&s->macaddr); > -- > 2.20.1 > >
Philippe Mathieu-Daudé <f4bug@amsat.org> writes: > Various address spaces from the BCM2835 are reported as > 'anonymous' in memory tree: Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > > (qemu) info mtree > > address-space: anonymous > 0000000000000000-000000000000008f (prio 0, i/o): bcm2835-mbox > 0000000000000010-000000000000001f (prio 0, i/o): bcm2835-fb > 0000000000000080-000000000000008f (prio 0, i/o): bcm2835-property > > address-space: anonymous > 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu > 0000000000000000-000000003fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 0000000040000000-000000007fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 000000007e000000-000000007effffff (prio 1, i/o): alias bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff > 0000000080000000-00000000bfffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 00000000c0000000-00000000ffffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > > [...] > > Since the address_space_init() function takes a 'name' argument, > set it to correctly describe each address space: > > (qemu) info mtree > > address-space: bcm2835-mbox-memory > 0000000000000000-000000000000008f (prio 0, i/o): bcm2835-mbox > 0000000000000010-000000000000001f (prio 0, i/o): bcm2835-fb > 0000000000000080-000000000000008f (prio 0, i/o): bcm2835-property > > address-space: bcm2835-fb-memory > 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu > 0000000000000000-000000003fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 0000000040000000-000000007fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 000000007e000000-000000007effffff (prio 1, i/o): alias bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff > 0000000080000000-00000000bfffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 00000000c0000000-00000000ffffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > > address-space: bcm2835-property-memory > 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu > 0000000000000000-000000003fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 0000000040000000-000000007fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 000000007e000000-000000007effffff (prio 1, i/o): alias bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff > 0000000080000000-00000000bfffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 00000000c0000000-00000000ffffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > > address-space: bcm2835-dma-memory > 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu > 0000000000000000-000000003fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 0000000040000000-000000007fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 000000007e000000-000000007effffff (prio 1, i/o): alias bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff > 0000000080000000-00000000bfffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 00000000c0000000-00000000ffffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/display/bcm2835_fb.c | 2 +- > hw/dma/bcm2835_dma.c | 2 +- > hw/misc/bcm2835_mbox.c | 2 +- > hw/misc/bcm2835_property.c | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c > index 8f856878cd..85aaa54330 100644 > --- a/hw/display/bcm2835_fb.c > +++ b/hw/display/bcm2835_fb.c > @@ -425,7 +425,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, NULL); > + address_space_init(&s->dma_as, 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 6acc2b644e..1e458d7fba 100644 > --- a/hw/dma/bcm2835_dma.c > +++ b/hw/dma/bcm2835_dma.c > @@ -383,7 +383,7 @@ static void bcm2835_dma_realize(DeviceState *dev, Error **errp) > } > > s->dma_mr = MEMORY_REGION(obj); > - address_space_init(&s->dma_as, s->dma_mr, NULL); > + address_space_init(&s->dma_as, s->dma_mr, TYPE_BCM2835_DMA "-memory"); > > bcm2835_dma_reset(dev); > } > diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c > index 7690b9afaf..77285624c9 100644 > --- a/hw/misc/bcm2835_mbox.c > +++ b/hw/misc/bcm2835_mbox.c > @@ -311,7 +311,7 @@ static void bcm2835_mbox_realize(DeviceState *dev, Error **errp) > } > > s->mbox_mr = MEMORY_REGION(obj); > - address_space_init(&s->mbox_as, s->mbox_mr, NULL); > + address_space_init(&s->mbox_as, 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 0a1a3eb5d9..43a5465c5d 100644 > --- a/hw/misc/bcm2835_property.c > +++ b/hw/misc/bcm2835_property.c > @@ -407,7 +407,7 @@ static void bcm2835_property_realize(DeviceState *dev, Error **errp) > } > > s->dma_mr = MEMORY_REGION(obj); > - address_space_init(&s->dma_as, s->dma_mr, NULL); > + address_space_init(&s->dma_as, s->dma_mr, TYPE_BCM2835_PROPERTY "-memory"); > > /* TODO: connect to MAC address of USB NIC device, once we emulate it */ > qemu_macaddr_default_if_unset(&s->macaddr); -- Alex Bennée
On Thu, Sep 26, 2019 at 07:34:11PM +0200, Philippe Mathieu-Daudé wrote: > Various address spaces from the BCM2835 are reported as > 'anonymous' in memory tree: > > (qemu) info mtree > > address-space: anonymous > 0000000000000000-000000000000008f (prio 0, i/o): bcm2835-mbox > 0000000000000010-000000000000001f (prio 0, i/o): bcm2835-fb > 0000000000000080-000000000000008f (prio 0, i/o): bcm2835-property > > address-space: anonymous > 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu > 0000000000000000-000000003fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 0000000040000000-000000007fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 000000007e000000-000000007effffff (prio 1, i/o): alias bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff > 0000000080000000-00000000bfffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 00000000c0000000-00000000ffffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > > [...] > > Since the address_space_init() function takes a 'name' argument, > set it to correctly describe each address space: > > (qemu) info mtree > > address-space: bcm2835-mbox-memory > 0000000000000000-000000000000008f (prio 0, i/o): bcm2835-mbox > 0000000000000010-000000000000001f (prio 0, i/o): bcm2835-fb > 0000000000000080-000000000000008f (prio 0, i/o): bcm2835-property > > address-space: bcm2835-fb-memory > 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu > 0000000000000000-000000003fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 0000000040000000-000000007fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 000000007e000000-000000007effffff (prio 1, i/o): alias bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff > 0000000080000000-00000000bfffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 00000000c0000000-00000000ffffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > > address-space: bcm2835-property-memory > 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu > 0000000000000000-000000003fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 0000000040000000-000000007fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 000000007e000000-000000007effffff (prio 1, i/o): alias bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff > 0000000080000000-00000000bfffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 00000000c0000000-00000000ffffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > > address-space: bcm2835-dma-memory > 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu > 0000000000000000-000000003fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 0000000040000000-000000007fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 000000007e000000-000000007effffff (prio 1, i/o): alias bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff > 0000000080000000-00000000bfffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > 00000000c0000000-00000000ffffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/display/bcm2835_fb.c | 2 +- > hw/dma/bcm2835_dma.c | 2 +- > hw/misc/bcm2835_mbox.c | 2 +- > hw/misc/bcm2835_property.c | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c > index 8f856878cd..85aaa54330 100644 > --- a/hw/display/bcm2835_fb.c > +++ b/hw/display/bcm2835_fb.c > @@ -425,7 +425,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, NULL); > + address_space_init(&s->dma_as, 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 6acc2b644e..1e458d7fba 100644 > --- a/hw/dma/bcm2835_dma.c > +++ b/hw/dma/bcm2835_dma.c > @@ -383,7 +383,7 @@ static void bcm2835_dma_realize(DeviceState *dev, Error **errp) > } > > s->dma_mr = MEMORY_REGION(obj); > - address_space_init(&s->dma_as, s->dma_mr, NULL); > + address_space_init(&s->dma_as, s->dma_mr, TYPE_BCM2835_DMA "-memory"); > > bcm2835_dma_reset(dev); > } > diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c > index 7690b9afaf..77285624c9 100644 > --- a/hw/misc/bcm2835_mbox.c > +++ b/hw/misc/bcm2835_mbox.c > @@ -311,7 +311,7 @@ static void bcm2835_mbox_realize(DeviceState *dev, Error **errp) > } > > s->mbox_mr = MEMORY_REGION(obj); > - address_space_init(&s->mbox_as, s->mbox_mr, NULL); > + address_space_init(&s->mbox_as, 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 0a1a3eb5d9..43a5465c5d 100644 > --- a/hw/misc/bcm2835_property.c > +++ b/hw/misc/bcm2835_property.c > @@ -407,7 +407,7 @@ static void bcm2835_property_realize(DeviceState *dev, Error **errp) > } > > s->dma_mr = MEMORY_REGION(obj); > - address_space_init(&s->dma_as, s->dma_mr, NULL); > + address_space_init(&s->dma_as, s->dma_mr, TYPE_BCM2835_PROPERTY "-memory"); > > /* TODO: connect to MAC address of USB NIC device, once we emulate it */ > qemu_macaddr_default_if_unset(&s->macaddr); > -- > 2.20.1 > The names you're giving are much more detailed than most other examples I found for address_space_init(), and I like that approach a lot. Reviewed-by: Cleber Rosa <crosa@redhat.com>
diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c index 8f856878cd..85aaa54330 100644 --- a/hw/display/bcm2835_fb.c +++ b/hw/display/bcm2835_fb.c @@ -425,7 +425,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, NULL); + address_space_init(&s->dma_as, 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 6acc2b644e..1e458d7fba 100644 --- a/hw/dma/bcm2835_dma.c +++ b/hw/dma/bcm2835_dma.c @@ -383,7 +383,7 @@ static void bcm2835_dma_realize(DeviceState *dev, Error **errp) } s->dma_mr = MEMORY_REGION(obj); - address_space_init(&s->dma_as, s->dma_mr, NULL); + address_space_init(&s->dma_as, s->dma_mr, TYPE_BCM2835_DMA "-memory"); bcm2835_dma_reset(dev); } diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c index 7690b9afaf..77285624c9 100644 --- a/hw/misc/bcm2835_mbox.c +++ b/hw/misc/bcm2835_mbox.c @@ -311,7 +311,7 @@ static void bcm2835_mbox_realize(DeviceState *dev, Error **errp) } s->mbox_mr = MEMORY_REGION(obj); - address_space_init(&s->mbox_as, s->mbox_mr, NULL); + address_space_init(&s->mbox_as, 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 0a1a3eb5d9..43a5465c5d 100644 --- a/hw/misc/bcm2835_property.c +++ b/hw/misc/bcm2835_property.c @@ -407,7 +407,7 @@ static void bcm2835_property_realize(DeviceState *dev, Error **errp) } s->dma_mr = MEMORY_REGION(obj); - address_space_init(&s->dma_as, s->dma_mr, NULL); + address_space_init(&s->dma_as, s->dma_mr, TYPE_BCM2835_PROPERTY "-memory"); /* TODO: connect to MAC address of USB NIC device, once we emulate it */ qemu_macaddr_default_if_unset(&s->macaddr);
Various address spaces from the BCM2835 are reported as 'anonymous' in memory tree: (qemu) info mtree address-space: anonymous 0000000000000000-000000000000008f (prio 0, i/o): bcm2835-mbox 0000000000000010-000000000000001f (prio 0, i/o): bcm2835-fb 0000000000000080-000000000000008f (prio 0, i/o): bcm2835-property address-space: anonymous 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu 0000000000000000-000000003fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff 0000000040000000-000000007fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff 000000007e000000-000000007effffff (prio 1, i/o): alias bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff 0000000080000000-00000000bfffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff 00000000c0000000-00000000ffffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff [...] Since the address_space_init() function takes a 'name' argument, set it to correctly describe each address space: (qemu) info mtree address-space: bcm2835-mbox-memory 0000000000000000-000000000000008f (prio 0, i/o): bcm2835-mbox 0000000000000010-000000000000001f (prio 0, i/o): bcm2835-fb 0000000000000080-000000000000008f (prio 0, i/o): bcm2835-property address-space: bcm2835-fb-memory 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu 0000000000000000-000000003fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff 0000000040000000-000000007fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff 000000007e000000-000000007effffff (prio 1, i/o): alias bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff 0000000080000000-00000000bfffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff 00000000c0000000-00000000ffffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff address-space: bcm2835-property-memory 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu 0000000000000000-000000003fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff 0000000040000000-000000007fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff 000000007e000000-000000007effffff (prio 1, i/o): alias bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff 0000000080000000-00000000bfffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff 00000000c0000000-00000000ffffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff address-space: bcm2835-dma-memory 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu 0000000000000000-000000003fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff 0000000040000000-000000007fffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff 000000007e000000-000000007effffff (prio 1, i/o): alias bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff 0000000080000000-00000000bfffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff 00000000c0000000-00000000ffffffff (prio 0, i/o): alias bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/display/bcm2835_fb.c | 2 +- hw/dma/bcm2835_dma.c | 2 +- hw/misc/bcm2835_mbox.c | 2 +- hw/misc/bcm2835_property.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)