From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGC6O-0006wr-JM for qemu-devel@nongnu.org; Tue, 27 Jan 2015 14:47:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGC6M-0002C3-IH for qemu-devel@nongnu.org; Tue, 27 Jan 2015 14:47:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36878) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGC6M-0002Bv-A7 for qemu-devel@nongnu.org; Tue, 27 Jan 2015 14:47:06 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0RJl4rJ008154 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 27 Jan 2015 14:47:05 -0500 From: Max Reitz Date: Tue, 27 Jan 2015 14:46:03 -0500 Message-Id: <1422387983-32153-31-git-send-email-mreitz@redhat.com> In-Reply-To: <1422387983-32153-1-git-send-email-mreitz@redhat.com> References: <1422387983-32153-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH RESEND 30/50] blockdev: Check BB validity in change-backing-file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Jeff Cody , Markus Armbruster , Max Reitz , Stefan Hajnoczi , John Snow Call blk_is_available() before using blk_bs() to obtain the root BlockDriverState behind the BlockBackend. Signed-off-by: Max Reitz --- blockdev.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/blockdev.c b/blockdev.c index 4bd52b8..7f4470f 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2821,7 +2821,8 @@ void qmp_change_backing_file(const char *device, const char *backing_file, Error **errp) { - BlockDriverState *bs = NULL; + BlockBackend *blk; + BlockDriverState *bs; AioContext *aio_context; BlockDriverState *image_bs = NULL; Error *local_err = NULL; @@ -2830,15 +2831,21 @@ void qmp_change_backing_file(const char *device, int ret; /* find the top layer BDS of the chain */ - bs = bdrv_find(device); - if (!bs) { + blk = blk_by_name(device); + if (!blk) { error_set(errp, QERR_DEVICE_NOT_FOUND, device); return; } - aio_context = bdrv_get_aio_context(bs); + aio_context = blk_get_aio_context(blk); aio_context_acquire(aio_context); + if (!blk_is_available(blk)) { + error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, device); + goto out; + } + bs = blk_bs(blk); + image_bs = bdrv_lookup_bs(NULL, image_node_name, &local_err); if (local_err) { error_propagate(errp, local_err); -- 2.1.0