qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	qemu-block@nongnu.org, jcody@redhat.com, armbru@redhat.com,
	mreitz@redhat.com, Stefan Hajnoczi <stefanha@redhat.com>,
	amit.shah@redhat.com, pbonzini@redhat.com
Subject: [Qemu-devel] [PATCH v5 08/13] blockdev: Block device IO during internal snapshot transaction
Date: Wed, 20 May 2015 14:16:11 +0800	[thread overview]
Message-ID: <1432102576-6637-9-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1432102576-6637-1-git-send-email-famz@redhat.com>

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 blockdev.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/blockdev.c b/blockdev.c
index 5eaf77e..7f763d9 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1262,6 +1262,7 @@ typedef struct InternalSnapshotState {
     BlockDriverState *bs;
     AioContext *aio_context;
     QEMUSnapshotInfo sn;
+    Error *blocker;
 } InternalSnapshotState;
 
 static void internal_snapshot_prepare(BlkTransactionState *common,
@@ -1300,6 +1301,10 @@ static void internal_snapshot_prepare(BlkTransactionState *common,
     state->aio_context = bdrv_get_aio_context(bs);
     aio_context_acquire(state->aio_context);
 
+    state->bs = bs;
+    error_setg(&state->blocker, "internal snapshot in progress");
+    bdrv_op_block(bs, BLOCK_OP_TYPE_DEVICE_IO, state->blocker);
+
     if (!bdrv_is_inserted(bs)) {
         error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, device);
         return;
@@ -1354,9 +1359,6 @@ static void internal_snapshot_prepare(BlkTransactionState *common,
                          name, device);
         return;
     }
-
-    /* 4. succeed, mark a snapshot is created */
-    state->bs = bs;
 }
 
 static void internal_snapshot_abort(BlkTransactionState *common)
@@ -1387,6 +1389,10 @@ static void internal_snapshot_clean(BlkTransactionState *common)
     InternalSnapshotState *state = DO_UPCAST(InternalSnapshotState,
                                              common, common);
 
+    if (state->bs) {
+        bdrv_op_unblock(state->bs, BLOCK_OP_TYPE_DEVICE_IO, state->blocker);
+        error_free(state->blocker);
+    }
     if (state->aio_context) {
         aio_context_release(state->aio_context);
     }
-- 
2.4.1

  parent reply	other threads:[~2015-05-20  6:17 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-20  6:16 [Qemu-devel] [PATCH v5 00/13] Fix transactional snapshot with dataplane and NBD export Fam Zheng
2015-05-20  6:16 ` [Qemu-devel] [PATCH v5 01/13] block: Add op blocker type "device IO" Fam Zheng
2015-05-23 15:20   ` Max Reitz
2015-05-23 15:25   ` Max Reitz
2015-05-20  6:16 ` [Qemu-devel] [PATCH v5 02/13] block: Add op blocker notifier list Fam Zheng
2015-05-20  6:16 ` [Qemu-devel] [PATCH v5 03/13] block-backend: Add blk_op_blocker_add_notifier Fam Zheng
2015-05-20  6:16 ` [Qemu-devel] [PATCH v5 04/13] virtio-blk: Move complete_request to 'ops' structure Fam Zheng
2015-05-20  6:16 ` [Qemu-devel] [PATCH v5 05/13] virtio-blk: Don't handle output when there is "device IO" op blocker Fam Zheng
2015-05-23 15:27   ` Max Reitz
2015-05-20  6:16 ` [Qemu-devel] [PATCH v5 06/13] virtio-scsi-dataplane: Add "device IO" op blocker listener Fam Zheng
2015-05-23 16:13   ` Max Reitz
2015-05-20  6:16 ` [Qemu-devel] [PATCH v5 07/13] nbd-server: Clear "can_read" when "device io" blocker is set Fam Zheng
2015-05-23 16:14   ` Max Reitz
2015-05-20  6:16 ` Fam Zheng [this message]
2015-05-23 16:39   ` [Qemu-devel] [PATCH v5 08/13] blockdev: Block device IO during internal snapshot transaction Max Reitz
2015-05-20  6:16 ` [Qemu-devel] [PATCH v5 09/13] blockdev: Block device IO during external " Fam Zheng
2015-05-23 16:43   ` Max Reitz
2015-05-20  6:16 ` [Qemu-devel] [PATCH v5 10/13] blockdev: Block device IO during drive-backup transaction Fam Zheng
2015-05-23 16:47   ` Max Reitz
2015-05-20  6:16 ` [Qemu-devel] [PATCH v5 11/13] blockdev: Block device IO during blockdev-backup transaction Fam Zheng
2015-05-20  6:16 ` [Qemu-devel] [PATCH v5 12/13] block: Block "device IO" during bdrv_drain and bdrv_drain_all Fam Zheng
2015-05-20  6:16 ` [Qemu-devel] [PATCH v5 13/13] block/mirror: Block "device IO" during mirror exit Fam Zheng
2015-05-20  6:32   ` Paolo Bonzini
2015-05-20  6:43     ` Fam Zheng

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=1432102576-6637-9-git-send-email-famz@redhat.com \
    --to=famz@redhat.com \
    --cc=amit.shah@redhat.com \
    --cc=armbru@redhat.com \
    --cc=jcody@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /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).