From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFoqL-0008Th-9v for qemu-devel@nongnu.org; Thu, 05 Apr 2012 11:43:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SFoqD-0005XQ-4q for qemu-devel@nongnu.org; Thu, 05 Apr 2012 11:43:23 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:34338) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFoqC-0005WY-S5 for qemu-devel@nongnu.org; Thu, 05 Apr 2012 11:43:17 -0400 Received: by mail-pz0-f46.google.com with SMTP id z9so2115338dad.33 for ; Thu, 05 Apr 2012 08:43:16 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 5 Apr 2012 17:42:56 +0200 Message-Id: <1333640581-25649-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1333640581-25649-1-git-send-email-pbonzini@redhat.com> References: <1333640581-25649-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 2/7] block: fail live snapshot if disk has no medium List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This would cause a segfault accessing states->old_bs->drv. Signed-off-by: Paolo Bonzini --- blockdev.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/blockdev.c b/blockdev.c index 4d17486..be9cdc5 100644 --- a/blockdev.c +++ b/blockdev.c @@ -752,14 +752,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.9.3