From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=53929 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Petrc-0002ZP-Mu for qemu-devel@nongnu.org; Mon, 17 Jan 2011 13:31:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Petra-00022R-KS for qemu-devel@nongnu.org; Mon, 17 Jan 2011 13:31:36 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:46217) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Petra-00021i-ER for qemu-devel@nongnu.org; Mon, 17 Jan 2011 13:31:34 -0500 Received: from blackfin.pond.sub.org (p5B32B9B0.dip.t-dialin.net [91.50.185.176]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 5EBD82DA972 for ; Mon, 17 Jan 2011 19:31:31 +0100 (CET) From: Markus Armbruster Date: Mon, 17 Jan 2011 19:31:29 +0100 Message-Id: <1295289090-18236-5-git-send-email-armbru@redhat.com> In-Reply-To: <1295289090-18236-1-git-send-email-armbru@redhat.com> References: <1295289090-18236-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 4/5] blockdev: Fix drive_del not to crash when drive is not in use List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com Watch this: (qemu) drive_add 0 if=none,file=tmp.img OK (qemu) info block none0: type=hd removable=0 file=tmp.img ro=0 drv=raw encrypted=0 (qemu) drive_del none0 Segmentation fault (core dumped) do_drive_del()'s code to clean up the pointer from a qdev using the drive back to the drive needs to check whether such a device exists. Signed-off-by: Markus Armbruster --- blockdev.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/blockdev.c b/blockdev.c index 04a0e84..51a2da3 100644 --- a/blockdev.c +++ b/blockdev.c @@ -682,13 +682,15 @@ int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data) /* clean up guest state from pointing to host resource by * finding and removing DeviceState "drive" property */ - for (prop = bs->peer->info->props; prop && prop->name; prop++) { - if (prop->info->type == PROP_TYPE_DRIVE) { - ptr = qdev_get_prop_ptr(bs->peer, prop); - if ((*ptr) == bs) { - bdrv_detach(bs, bs->peer); - *ptr = NULL; - break; + if (bs->peer) { + for (prop = bs->peer->info->props; prop && prop->name; prop++) { + if (prop->info->type == PROP_TYPE_DRIVE) { + ptr = qdev_get_prop_ptr(bs->peer, prop); + if (*ptr == bs) { + bdrv_detach(bs, bs->peer); + *ptr = NULL; + break; + } } } } -- 1.7.2.3