From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:54971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrqcY-0002Ed-S3 for qemu-devel@nongnu.org; Fri, 12 Aug 2011 08:13:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QrqcX-00012A-Jx for qemu-devel@nongnu.org; Fri, 12 Aug 2011 08:13:50 -0400 Received: from mtagate3.uk.ibm.com ([194.196.100.163]:35966) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrqcX-000126-9t for qemu-devel@nongnu.org; Fri, 12 Aug 2011 08:13:49 -0400 Received: from d06nrmr1307.portsmouth.uk.ibm.com (d06nrmr1307.portsmouth.uk.ibm.com [9.149.38.129]) by mtagate3.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p7CCDlrs011447 for ; Fri, 12 Aug 2011 12:13:47 GMT Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p7CCDkdP2076806 for ; Fri, 12 Aug 2011 13:13:47 +0100 Received: from d06av09.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p7CCCN19014714 for ; Fri, 12 Aug 2011 06:12:24 -0600 From: Stefan Hajnoczi Date: Fri, 12 Aug 2011 13:12:20 +0100 Message-Id: <1313151141-8541-3-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1313151141-8541-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1313151141-8541-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 2/3] hw/qdev: Don't crash if qdev_create(NULL, ...) fails List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori , Stefan Hajnoczi From: Peter Maydell If an attempt to create a qdev device on the default sysbus (by passing NULL as the bus to qdev_create) fails, print a useful error message rather than crashing trying to dereference a NULL pointer. Signed-off-by: Peter Maydell Reviewed-by: Markus Armbruster Signed-off-by: Stefan Hajnoczi --- hw/qdev.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 6819537..d8114c6 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -111,7 +111,12 @@ DeviceState *qdev_create(BusState *bus, const char *name) dev = qdev_try_create(bus, name); if (!dev) { - hw_error("Unknown device '%s' for bus '%s'\n", name, bus->info->name); + if (bus) { + hw_error("Unknown device '%s' for bus '%s'\n", name, + bus->info->name); + } else { + hw_error("Unknown device '%s' for default sysbus\n", name); + } } return dev; -- 1.7.5.4