From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=60942 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PhTg0-0001FM-Dw for qemu-devel@nongnu.org; Mon, 24 Jan 2011 16:10:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PhTfw-0007Wt-LP for qemu-devel@nongnu.org; Mon, 24 Jan 2011 16:10:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:64379) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PhTfw-0007Wj-BH for qemu-devel@nongnu.org; Mon, 24 Jan 2011 16:10:12 -0500 From: Kevin Wolf Date: Mon, 24 Jan 2011 22:10:47 +0100 Message-Id: <1295903452-18017-19-git-send-email-kwolf@redhat.com> In-Reply-To: <1295903452-18017-1-git-send-email-kwolf@redhat.com> References: <1295903452-18017-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 18/23] 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: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster 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 Reviewed-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- blockdev.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/blockdev.c b/blockdev.c index 0621390..f7f591f 100644 --- a/blockdev.c +++ b/blockdev.c @@ -687,13 +687,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