From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKVQ5-0001xR-Oo for qemu-devel@nongnu.org; Thu, 12 May 2011 08:55:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QKVQ5-00006z-0V for qemu-devel@nongnu.org; Thu, 12 May 2011 08:55:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56325) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKVQ4-00006q-Ng for qemu-devel@nongnu.org; Thu, 12 May 2011 08:55:08 -0400 From: Glauber Costa Date: Thu, 12 May 2011 09:55:03 -0300 Message-Id: <1305204903-13283-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH] Avoid segmentation fault for qdev device not found List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm@vger.kernel.org Cc: aliguori@us.ibm.com, mtosatti@redhat.com, qemu-devel@nongnu.org, avi@redhat.com qdev_try_create will cope well with a NULL bus, since it will assume the main system bus by default. qdev_create, however, wants to print a message, in which it instantiates the bus name. That simple and at first inoffensive message will generate a segmentation found if the reason for failure is a NULL bus. I propose we avoid that - thus generating the normal hw_error by always passing a valid bus to qdev_try_create - if none, be it the main system bus. The code for testing a NULL bus is not remove from qdev_try_create because it is a externally visible function, and we want it to continue working fine. Signed-off-by: Glauber Costa --- hw/qdev.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 1aa1ea0..21ef075 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -108,6 +108,10 @@ DeviceState *qdev_create(BusState *bus, const char *name) { DeviceState *dev; + if (!bus) { + bus = sysbus_get_default(); + } + dev = qdev_try_create(bus, name); if (!dev) { hw_error("Unknown device '%s' for bus '%s'\n", name, bus->info->name); -- 1.7.4.2