From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqynI-0003kB-F9 for qemu-devel@nongnu.org; Fri, 15 Apr 2016 04:08:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aqynH-0003UU-8w for qemu-devel@nongnu.org; Fri, 15 Apr 2016 04:08:00 -0400 From: Changlong Xie Date: Fri, 15 Apr 2016 16:10:35 +0800 Message-ID: <1460707838-13510-6-git-send-email-xiecl.fnst@cn.fujitsu.com> In-Reply-To: <1460707838-13510-1-git-send-email-xiecl.fnst@cn.fujitsu.com> References: <1460707838-13510-1-git-send-email-xiecl.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v18 5/8] auto complete active commit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu devel , Eric Blake , Alberto Garcia , Kevin Wolf , Max Reitz , Stefan Hajnoczi Cc: Markus Armbruster , "Dr. David Alan Gilbert" , Dong Eddie , Jiang Yunhong , Wen Congyang , Changlong Xie , qemu block From: Wen Congyang Auto complete mirror job in background to prevent from blocking synchronously Signed-off-by: Wen Congyang Signed-off-by: Changlong Xie --- block/mirror.c | 13 +++++++++---- blockdev.c | 2 +- include/block/block_int.h | 3 ++- qemu-img.c | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index c2cfc1a..1c4aeae 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -790,7 +790,8 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target, BlockCompletionFunc *cb, void *opaque, Error **errp, const BlockJobDriver *driver, - bool is_none_mode, BlockDriverState *base) + bool is_none_mode, BlockDriverState *base, + bool auto_complete) { MirrorBlockJob *s; BlockDriverState *replaced_bs; @@ -846,6 +847,9 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target, s->granularity = granularity; s->buf_size = ROUND_UP(buf_size, granularity); s->unmap = unmap; + if (auto_complete) { + s->should_complete = true; + } s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp); if (!s->dirty_bitmap) { @@ -886,14 +890,15 @@ void mirror_start(BlockDriverState *bs, BlockDriverState *target, mirror_start_job(bs, target, replaces, speed, granularity, buf_size, on_source_error, on_target_error, unmap, cb, opaque, errp, - &mirror_job_driver, is_none_mode, base); + &mirror_job_driver, is_none_mode, base, false); } void commit_active_start(BlockDriverState *bs, BlockDriverState *base, int64_t speed, BlockdevOnError on_error, BlockCompletionFunc *cb, - void *opaque, Error **errp) + void *opaque, Error **errp, + bool auto_complete) { int64_t length, base_length; int orig_base_flags; @@ -934,7 +939,7 @@ void commit_active_start(BlockDriverState *bs, BlockDriverState *base, bdrv_ref(base); mirror_start_job(bs, base, NULL, speed, 0, 0, on_error, on_error, false, cb, opaque, &local_err, - &commit_active_job_driver, false, base); + &commit_active_job_driver, false, base, auto_complete); if (local_err) { error_propagate(errp, local_err); goto error_restore_flags; diff --git a/blockdev.c b/blockdev.c index d16d449..5457fdf 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3150,7 +3150,7 @@ void qmp_block_commit(const char *device, goto out; } commit_active_start(bs, base_bs, speed, on_error, block_job_cb, - bs, &local_err); + bs, &local_err, false); } else { commit_start(bs, base_bs, top_bs, speed, on_error, block_job_cb, bs, has_backing_file ? backing_file : NULL, &local_err); diff --git a/include/block/block_int.h b/include/block/block_int.h index 3c3caa7..05469f7 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -649,13 +649,14 @@ void commit_start(BlockDriverState *bs, BlockDriverState *base, * @cb: Completion function for the job. * @opaque: Opaque pointer value passed to @cb. * @errp: Error object. + * @auto_complete: Auto complete the job. * */ void commit_active_start(BlockDriverState *bs, BlockDriverState *base, int64_t speed, BlockdevOnError on_error, BlockCompletionFunc *cb, - void *opaque, Error **errp); + void *opaque, Error **errp, bool auto_complete); /* * mirror_start: * @bs: Block device to operate on. diff --git a/qemu-img.c b/qemu-img.c index 1697762..326640b 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -915,7 +915,7 @@ static int img_commit(int argc, char **argv) }; commit_active_start(bs, base_bs, 0, BLOCKDEV_ON_ERROR_REPORT, - common_block_job_cb, &cbi, &local_err); + common_block_job_cb, &cbi, &local_err, false); if (local_err) { goto done; } -- 1.9.3