From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YwCim-0005zE-6M for qemu-devel@nongnu.org; Sat, 23 May 2015 12:56:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YwCih-0004i6-EV for qemu-devel@nongnu.org; Sat, 23 May 2015 12:56:24 -0400 Message-ID: <5560B122.60602@redhat.com> Date: Sat, 23 May 2015 18:56:02 +0200 From: Max Reitz MIME-Version: 1.0 References: <1432190583-10518-1-git-send-email-famz@redhat.com> <1432190583-10518-9-git-send-email-famz@redhat.com> In-Reply-To: <1432190583-10518-9-git-send-email-famz@redhat.com> Content-Type: text/plain; charset=iso-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v6 08/13] blockdev: Block device IO during internal snapshot transaction List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng , qemu-devel@nongnu.org Cc: Kevin Wolf , qemu-block@nongnu.org, jcody@redhat.com, armbru@redhat.com, Stefan Hajnoczi , amit.shah@redhat.com, pbonzini@redhat.com On 21.05.2015 08:42, Fam Zheng wrote: > Signed-off-by: Fam Zheng > --- > 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; > } Unchanged from v5, so the same issue: Pulling this up means that internal_snapshot_abort() may attempt to delete the snapshot even if it hasn't been (successfully) created. This will always fail because sn->id_str is empty, though. Max > 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); > }