[v1] hw: Strengthen SysBus & QBus API

[PATCH 11/12] hw/sysbus: Ensure device is not realized before adding MMIO region

Philippe Mathieu-Daudé posted 12 patches 1 year, 1 month ago

Diff against v2 v3 v4
Download mbox

Maintainers: Peter Maydell <peter.maydell@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, Richard Henderson <richard.henderson@linaro.org>, "Michael S. Tsirkin" <mst@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Peter Xu <peterx@redhat.com>, Jason Wang <jasowang@redhat.com>, Sergio Lopez <slp@redhat.com>, Song Gao <gaosong@loongson.cn>, Beniamino Galvani <b.galvani@gmail.com>, Strahinja Jankovic <strahinja.p.jankovic@gmail.com>, Huacai Chen <chenhuacai@kernel.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Thomas Huth <thuth@redhat.com>, David Hildenbrand <david@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>

There is a newer version of this series

Expand all Fold all

[PATCH 11/12] hw/sysbus: Ensure device is not realized before adding MMIO region

Posted by Philippe Mathieu-Daudé 1 year, 1 month ago

sysbus_init_mmio() should not be called on realized device.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/core/sysbus.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c
index 35f902b582..ce54e2c416 100644
--- a/hw/core/sysbus.c
+++ b/hw/core/sysbus.c
@@ -192,6 +192,11 @@ void sysbus_init_mmio(SysBusDevice *dev, MemoryRegion *memory)
     int n;
 
     assert(dev->num_mmio < QDEV_MAX_MMIO);
+    if (DEVICE(dev)->realized) {
+        error_report("sysbus_init_mmio(type:%s) but object is realized",
+                     object_get_typename(OBJECT(dev)));
+        abort();
+    }
     n = dev->num_mmio++;
     dev->mmio[n].addr = -1;
     dev->mmio[n].memory = memory;
-- 
2.41.0

Re: [PATCH 11/12] hw/sysbus: Ensure device is not realized before adding MMIO region

Posted by Thomas Huth 1 year, 1 month ago

On 18/10/2023 16.11, Philippe Mathieu-Daudé wrote:
> sysbus_init_mmio() should not be called on realized device.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/core/sysbus.c | 5 +++++
>   1 file changed, 5 insertions(+)
> 
> diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c
> index 35f902b582..ce54e2c416 100644
> --- a/hw/core/sysbus.c
> +++ b/hw/core/sysbus.c
> @@ -192,6 +192,11 @@ void sysbus_init_mmio(SysBusDevice *dev, MemoryRegion *memory)
>       int n;
>   
>       assert(dev->num_mmio < QDEV_MAX_MMIO);
> +    if (DEVICE(dev)->realized) {
> +        error_report("sysbus_init_mmio(type:%s) but object is realized",
> +                     object_get_typename(OBJECT(dev)));
> +        abort();
> +    }
>       n = dev->num_mmio++;
>       dev->mmio[n].addr = -1;
>       dev->mmio[n].memory = memory;

Reviewed-by: Thomas Huth <thuth@redhat.com>