From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XihIR-0003na-9Q for qemu-devel@nongnu.org; Mon, 27 Oct 2014 06:13:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XihIM-00062l-5d for qemu-devel@nongnu.org; Mon, 27 Oct 2014 06:13:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42541) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XihIL-00062f-UX for qemu-devel@nongnu.org; Mon, 27 Oct 2014 06:13:02 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9RAD1pg007164 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 27 Oct 2014 06:13:01 -0400 From: Max Reitz Date: Mon, 27 Oct 2014 11:12:50 +0100 Message-Id: <1414404776-4919-2-git-send-email-mreitz@redhat.com> In-Reply-To: <1414404776-4919-1-git-send-email-mreitz@redhat.com> References: <1414404776-4919-1-git-send-email-mreitz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 1/7] block: Add status callback to bdrv_amend_options() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz Depending on the changed options and the image format, bdrv_amend_options() may take a significant amount of time. In these cases, a way to be informed about the operation's status is desirable. Since the operation is rather complex and may fundamentally change the image, implementing it as AIO or a coroutine does not seem feasible. On the other hand, implementing it as a block job would be significantly more difficult than a simple callback and would not add benefits other than progress report to the amending operation, because it should not actually be run as a block job at all. A callback may not be very pretty, but it's very easy to implement and perfectly fits its purpose here. Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Beno=C3=AEt Canet --- block.c | 5 +++-- block/qcow2.c | 3 ++- include/block/block.h | 8 +++++++- include/block/block_int.h | 3 ++- qemu-img.c | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/block.c b/block.c index 88f6d9b..4228cb7 100644 --- a/block.c +++ b/block.c @@ -5750,12 +5750,13 @@ void bdrv_add_before_write_notifier(BlockDriverSt= ate *bs, notifier_with_return_list_add(&bs->before_write_notifiers, notifier)= ; } =20 -int bdrv_amend_options(BlockDriverState *bs, QemuOpts *opts) +int bdrv_amend_options(BlockDriverState *bs, QemuOpts *opts, + BlockDriverAmendStatusCB *status_cb) { if (!bs->drv->bdrv_amend_options) { return -ENOTSUP; } - return bs->drv->bdrv_amend_options(bs, opts); + return bs->drv->bdrv_amend_options(bs, opts, status_cb); } =20 /* This function will be called by the bdrv_recurse_is_first_non_filter = method diff --git a/block/qcow2.c b/block/qcow2.c index d031515..a121a63 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2424,7 +2424,8 @@ static int qcow2_downgrade(BlockDriverState *bs, in= t target_version) return 0; } =20 -static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts) +static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts, + BlockDriverAmendStatusCB *status_cb) { BDRVQcowState *s =3D bs->opaque; int old_version =3D s->qcow_version, new_version =3D old_version; diff --git a/include/block/block.h b/include/block/block.h index 341054d..2ff96e5 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -268,7 +268,13 @@ typedef enum { =20 int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res, BdrvCheckMode= fix); =20 -int bdrv_amend_options(BlockDriverState *bs_new, QemuOpts *opts); +/* The units of offset and total_work_size may be chosen arbitrarily by = the + * block driver; total_work_size may change during the course of the ame= ndment + * operation */ +typedef void BlockDriverAmendStatusCB(BlockDriverState *bs, int64_t offs= et, + int64_t total_work_size); +int bdrv_amend_options(BlockDriverState *bs_new, QemuOpts *opts, + BlockDriverAmendStatusCB *status_cb); =20 /* external snapshots */ bool bdrv_recurse_is_first_non_filter(BlockDriverState *bs, diff --git a/include/block/block_int.h b/include/block/block_int.h index 8898c6c..df9e349 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -232,7 +232,8 @@ struct BlockDriver { int (*bdrv_check)(BlockDriverState* bs, BdrvCheckResult *result, BdrvCheckMode fix); =20 - int (*bdrv_amend_options)(BlockDriverState *bs, QemuOpts *opts); + int (*bdrv_amend_options)(BlockDriverState *bs, QemuOpts *opts, + BlockDriverAmendStatusCB *status_cb); =20 void (*bdrv_debug_event)(BlockDriverState *bs, BlkDebugEvent event); =20 diff --git a/qemu-img.c b/qemu-img.c index 731502c..58973ef 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2867,7 +2867,7 @@ static int img_amend(int argc, char **argv) goto out; } =20 - ret =3D bdrv_amend_options(bs, opts); + ret =3D bdrv_amend_options(bs, opts, NULL); if (ret < 0) { error_report("Error while amending options: %s", strerror(-ret))= ; goto out; --=20 1.9.3