From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlBSz-0004kl-Ts for qemu-devel@nongnu.org; Tue, 26 Nov 2013 00:45:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VlBSt-00027x-U8 for qemu-devel@nongnu.org; Tue, 26 Nov 2013 00:45:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52603) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlBSt-00027t-8i for qemu-devel@nongnu.org; Tue, 26 Nov 2013 00:45:39 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rAQ5jc86020781 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 26 Nov 2013 00:45:38 -0500 From: Fam Zheng Date: Tue, 26 Nov 2013 13:45:06 +0800 Message-Id: <1385444708-19439-5-git-send-email-famz@redhat.com> In-Reply-To: <1385444708-19439-1-git-send-email-famz@redhat.com> References: <1385444708-19439-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v6 4/6] commit: support commit active layer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, jcody@redhat.com, stefanha@redhat.com If active is top, it will be mirrored to base, (with block/mirror.c code), then the image is switched when user completes the block job. QMP documentation is updated. Signed-off-by: Fam Zheng --- block/mirror.c | 11 +++++++++++ blockdev.c | 9 +++++++-- qapi-schema.json | 5 +++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index 9be741a..86ffac8 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -478,6 +478,13 @@ immediate_exit: bdrv_reopen(s->target, bdrv_get_flags(s->common.bs), NULL); } bdrv_swap(s->target, s->common.bs); + if (s->common.driver->job_type == BLOCK_JOB_TYPE_COMMIT) { + /* drop the bs loop chain formed by the swap: break the loop then + * trigger the unref from the top one */ + BlockDriverState *p = s->base->backing_hd; + s->base->backing_hd = NULL; + bdrv_unref(p); + } } bdrv_unref(s->target); block_job_completed(&s->common, ret); @@ -619,6 +626,10 @@ void commit_active_start(BlockDriverState *bs, BlockDriverState *base, BlockDriverCompletionFunc *cb, void *opaque, Error **errp) { + if (bdrv_reopen(base, bs->open_flags, errp)) { + return; + } + bdrv_ref(base); mirror_start_job(bs, base, speed, 0, 0, on_error, on_error, cb, opaque, errp, &commit_active_job_driver, false, base); diff --git a/blockdev.c b/blockdev.c index 330aa4a..d6b9005 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1820,8 +1820,13 @@ void qmp_block_commit(const char *device, return; } - commit_start(bs, base_bs, top_bs, speed, on_error, block_job_cb, bs, - &local_err); + if (top_bs == bs) { + commit_active_start(bs, base_bs, speed, on_error, block_job_cb, + bs, &local_err); + } else { + commit_start(bs, base_bs, top_bs, speed, on_error, block_job_cb, bs, + &local_err); + } if (local_err != NULL) { error_propagate(errp, local_err); return; diff --git a/qapi-schema.json b/qapi-schema.json index 83fa485..02817d0 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1967,9 +1967,11 @@ # # @top: The file name of the backing image within the image chain, # which contains the topmost data to be committed down. -# Note, the active layer as 'top' is currently unsupported. # # If top == base, that is an error. +# If top == active, the job will not be completed by itself, +# user needs to complete the job with the block-job-complete +# command after getting the ready event. (Since 1.8) # # # @speed: #optional the maximum speed, in bytes per second @@ -1979,7 +1981,6 @@ # If @device does not exist, DeviceNotFound # If image commit is not supported by this device, NotSupported # If @base or @top is invalid, a generic error is returned -# If @top is the active layer, or omitted, a generic error is returned # If @speed is invalid, InvalidParameter # # Since: 1.3 -- 1.8.4.2