qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 2/7] block: fail live snapshot if disk has no medium
Date: Thu,  5 Apr 2012 17:42:56 +0200	[thread overview]
Message-ID: <1333640581-25649-3-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1333640581-25649-1-git-send-email-pbonzini@redhat.com>

This would cause a segfault accessing states->old_bs->drv.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 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

  parent reply	other threads:[~2012-04-05 15:43 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-05 15:42 [Qemu-devel] [PATCH 0/7] Miscellaneous fixes for block and snapshots Paolo Bonzini
2012-04-05 15:42 ` [Qemu-devel] [PATCH 1/7] block: add mode argument to blockdev-snapshot-sync Paolo Bonzini
2012-04-05 15:42 ` Paolo Bonzini [this message]
2012-04-05 15:42 ` [Qemu-devel] [PATCH 3/7] block: fix snapshot with QED format Paolo Bonzini
2012-04-05 15:42 ` [Qemu-devel] [PATCH 5/7] block: pass new base image format to bdrv_change_backing_file Paolo Bonzini
2012-04-05 15:43 ` [Qemu-devel] [PATCH 6/7] block: push bdrv_change_backing_file error checking up from drivers Paolo Bonzini
2012-04-05 15:43 ` [Qemu-devel] [PATCH 7/7] block: update in-memory backing file and format Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1333640581-25649-3-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).