[Qemu-devel] [PATCH] qdev: sysbus_get_default must not return a NULL pointer (fix regression)

[Qemu-devel] [PATCH] qdev: sysbus_get_default must not return a NULL pointer (fix regression)

[Stefan Weil]

Every system should have some sort of main system bus,
so sysbus_get_default should always return a valid bus.

Without this patch, at least mipssim and malta no longer
start but raise a null pointer access exception (caused by
commit ec990eb622ad46df5ddcb1e94c418c271894d416).

Cc: Anthony Liguori <anthony@codemonkey.ws>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 hw/qdev.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/hw/qdev.c b/hw/qdev.c
index 10e28df..6fc9b02 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -107,10 +107,7 @@ DeviceState *qdev_create(BusState *bus, const char *name)
     DeviceInfo *info;
 
     if (!bus) {
-        if (!main_system_bus) {
-            main_system_bus = qbus_create(&system_bus_info, NULL, "main-system-bus");
-        }
-        bus = main_system_bus;
+        bus = sysbus_get_default();
     }
 
     info = qdev_find_info(bus->info, name);
@@ -311,6 +308,10 @@ static int qdev_reset_one(DeviceState *dev, void *opaque)
 
 BusState *sysbus_get_default(void)
 {
+    if (!main_system_bus) {
+        main_system_bus = qbus_create(&system_bus_info, NULL,
+                                      "main-system-bus");
+    }
     return main_system_bus;
 }
 
-- 
1.7.2.3

Re: [Qemu-devel] [PATCH] qdev: sysbus_get_default must not return a NULL pointer (fix regression)

[Aurelien Jarno]

On Thu, Dec 16, 2010 at 07:33:22PM +0100, Stefan Weil wrote:
> Every system should have some sort of main system bus,
> so sysbus_get_default should always return a valid bus.
> 
> Without this patch, at least mipssim and malta no longer
> start but raise a null pointer access exception (caused by
> commit ec990eb622ad46df5ddcb1e94c418c271894d416).
> 
> Cc: Anthony Liguori <anthony@codemonkey.ws>
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
> ---
>  hw/qdev.c |    9 +++++----
>  1 files changed, 5 insertions(+), 4 deletions(-)

Thanks, applied.

> diff --git a/hw/qdev.c b/hw/qdev.c
> index 10e28df..6fc9b02 100644
> --- a/hw/qdev.c
> +++ b/hw/qdev.c
> @@ -107,10 +107,7 @@ DeviceState *qdev_create(BusState *bus, const char *name)
>      DeviceInfo *info;
>  
>      if (!bus) {
> -        if (!main_system_bus) {
> -            main_system_bus = qbus_create(&system_bus_info, NULL, "main-system-bus");
> -        }
> -        bus = main_system_bus;
> +        bus = sysbus_get_default();
>      }
>  
>      info = qdev_find_info(bus->info, name);
> @@ -311,6 +308,10 @@ static int qdev_reset_one(DeviceState *dev, void *opaque)
>  
>  BusState *sysbus_get_default(void)
>  {
> +    if (!main_system_bus) {
> +        main_system_bus = qbus_create(&system_bus_info, NULL,
> +                                      "main-system-bus");
> +    }
>      return main_system_bus;
>  }
>  
> -- 
> 1.7.2.3
> 
> 
> 

-- 
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net