From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7wtL-0001XK-5a for qemu-devel@nongnu.org; Wed, 24 Jun 2015 22:27:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7wtK-0005X8-6d for qemu-devel@nongnu.org; Wed, 24 Jun 2015 22:27:51 -0400 Date: Thu, 25 Jun 2015 10:27:40 +0800 From: Fam Zheng Message-ID: <20150625022740.GE17695@ad.nay.redhat.com> References: <1433816027-32588-1-git-send-email-famz@redhat.com> <1433816027-32588-2-git-send-email-famz@redhat.com> <558AD771.3070000@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <558AD771.3070000@redhat.com> Subject: Re: [Qemu-devel] [PATCH 1/6] block: Add blocker on mirror target List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz Cc: Kevin Wolf , qemu-block@nongnu.org, Jeff Cody , qemu-devel@nongnu.org, Markus Armbruster , Stefan Hajnoczi , pbonzini@redhat.com On Wed, 06/24 18:14, Max Reitz wrote: > On 09.06.2015 04:13, Fam Zheng wrote: > >In block/backup.c, we already check and add blocker on the target bs, > >which is necessary so that it won't be intervened with other operations. > > > >In block/mirror.c we should also protect the mirror target bs, because it > >could have a node-name (drive-mirror ... node-name=XXX), and on top of > >that it's safe to add blockdev-mirror. > > > >Signed-off-by: Fam Zheng > >--- > > block/mirror.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > >diff --git a/block/mirror.c b/block/mirror.c > >index 33c640f..8b23ddd 100644 > >--- a/block/mirror.c > >+++ b/block/mirror.c > >@@ -360,6 +360,7 @@ static void mirror_exit(BlockJob *job, void *opaque) > > aio_context_release(replace_aio_context); > > } > > g_free(s->replaces); > >+ bdrv_op_unblock_all(s->target, s->common.blocker); > > bdrv_unref(s->target); > > block_job_completed(&s->common, data->ret); > > g_free(data); > >@@ -682,6 +683,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target, > > return; > > } > >+ bdrv_op_block_all(target, s->common.blocker); > > s->replaces = g_strdup(replaces); > > s->on_source_error = on_source_error; > > s->on_target_error = on_target_error; > > Do we need a bdrv_op_unblock_all() if bdrv_create_dirty_bitmap() fails? > Yes, good catch! Fam