From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSRsP-0000kB-Dj for qemu-devel@nongnu.org; Thu, 10 May 2012 07:49:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSRsM-0006BF-IJ for qemu-devel@nongnu.org; Thu, 10 May 2012 07:49:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32457) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSRsM-0006Ay-AO for qemu-devel@nongnu.org; Thu, 10 May 2012 07:49:42 -0400 From: Kevin Wolf Date: Thu, 10 May 2012 13:49:07 +0200 Message-Id: <1336650574-12835-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1336650574-12835-1-git-send-email-kwolf@redhat.com> References: <1336650574-12835-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 03/30] block: fail live snapshot if disk has no medium List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Paolo Bonzini Reviewed-by: Kevin Wolf Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- blockdev.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/blockdev.c b/blockdev.c index d25ffea..67895b2 100644 --- a/blockdev.c +++ b/blockdev.c @@ -756,14 +756,17 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp) goto delete_and_fail; } + if (!bdrv_is_inserted(states->old_bs)) { + error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, device); + goto delete_and_fail; + } + if (bdrv_in_use(states->old_bs)) { error_set(errp, QERR_DEVICE_IN_USE, device); goto delete_and_fail; } - if (!bdrv_is_read_only(states->old_bs) && - bdrv_is_inserted(states->old_bs)) { - + if (!bdrv_is_read_only(states->old_bs)) { if (bdrv_flush(states->old_bs)) { error_set(errp, QERR_IO_ERROR); goto delete_and_fail; -- 1.7.6.5