From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=55899 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTIeR-0007Z3-Ve for qemu-devel@nongnu.org; Thu, 16 Dec 2010 13:34:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PTIe1-0002mX-Vf for qemu-devel@nongnu.org; Thu, 16 Dec 2010 13:34:03 -0500 Received: from moutng.kundenserver.de ([212.227.17.8]:50220) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PTIe1-0002fH-Gc for qemu-devel@nongnu.org; Thu, 16 Dec 2010 13:33:37 -0500 From: Stefan Weil Date: Thu, 16 Dec 2010 19:33:22 +0100 Message-Id: <1292524402-9312-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH] qdev: sysbus_get_default must not return a NULL pointer (fix regression) List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers 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 Signed-off-by: Stefan Weil --- 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