summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Weil <weil@mail.berlios.de>2010-12-16 19:33:22 +0100
committerAurelien Jarno <aurelien@aurel32.net>2010-12-21 18:28:19 +0100
commitfcd61af6631fb98c4c12e865572d4d81d73728d0 (patch)
treef94b7fc03806b7ea5591c7ba8538fb7356e25ad8
parente0087e618552c7bc77485561ed96ec2a4f01404a (diff)
downloadhqemu-fcd61af6631fb98c4c12e865572d4d81d73728d0.zip
hqemu-fcd61af6631fb98c4c12e865572d4d81d73728d0.tar.gz
qdev: sysbus_get_default must not return a NULL pointer (fix regression)
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> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-rw-r--r--hw/qdev.c9
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;
}
OpenPOWER on IntegriCloud