qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	mreitz@redhat.com
Subject: [Qemu-devel] [PATCH 4/4] blockdev: check for BLOCK_OP_TYPE_EXTERNAL_SNAPSHOT
Date: Fri, 21 Nov 2014 10:49:00 +0000	[thread overview]
Message-ID: <1416566940-4430-5-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1416566940-4430-1-git-send-email-stefanha@redhat.com>

The BLOCK_OP_TYPE_EXTERNAL_SNAPSHOT op blocker exists but was never
used!  Let's fix that so external snapshot can be blocked.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 blockdev.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/blockdev.c b/blockdev.c
index 90cb33d..d63bb7f 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1236,6 +1236,10 @@ static void internal_snapshot_prepare(BlkTransactionState *common,
         return;
     }
 
+    if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_INTERNAL_SNAPSHOT, errp)) {
+        return;
+    }
+
     if (bdrv_is_read_only(bs)) {
         error_set(errp, QERR_DEVICE_IS_READ_ONLY, device);
         return;
-- 
2.1.0

  parent reply	other threads:[~2014-11-21 10:49 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-21 10:48 [Qemu-devel] [PATCH 0/4] blockdev: support dataplane in QMP 'transaction' command Stefan Hajnoczi
2014-11-21 10:48 ` [Qemu-devel] [PATCH 1/4] blockdev: update outdated qmp_transaction() comments Stefan Hajnoczi
2014-11-21 13:22   ` Max Reitz
2014-11-21 13:30     ` Max Reitz
2014-11-21 10:48 ` [Qemu-devel] [PATCH 2/4] blockdev: drop unnecessary DriveBackupState field assignment Stefan Hajnoczi
2014-11-21 13:25   ` Max Reitz
2014-11-21 10:48 ` [Qemu-devel] [PATCH 3/4] blockdev: acquire AioContext in QMP 'transaction' actions Stefan Hajnoczi
2014-11-21 13:51   ` Max Reitz
2014-11-24 13:57     ` Stefan Hajnoczi
2014-11-21 10:49 ` Stefan Hajnoczi [this message]
2014-11-21 11:58   ` [Qemu-devel] [PATCH 4/4] blockdev: check for BLOCK_OP_TYPE_EXTERNAL_SNAPSHOT Paolo Bonzini
2014-11-24 13:58     ` Stefan Hajnoczi
2014-11-24 16:13   ` Max Reitz
2014-11-26 16:41 ` [Qemu-devel] [PATCH 0/4] blockdev: support dataplane in QMP 'transaction' command Stefan Hajnoczi

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=1416566940-4430-5-git-send-email-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=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).