From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48490) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMOQs-0000Ad-Gx for qemu-devel@nongnu.org; Tue, 26 Aug 2014 17:37:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XMOQm-0005vJ-Ai for qemu-devel@nongnu.org; Tue, 26 Aug 2014 17:37:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46939) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMOQm-0005tq-40 for qemu-devel@nongnu.org; Tue, 26 Aug 2014 17:37:32 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7QLbVHe023321 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 26 Aug 2014 17:37:31 -0400 From: Max Reitz Date: Tue, 26 Aug 2014 23:36:23 +0200 Message-Id: <1409088987-17207-11-git-send-email-mreitz@redhat.com> In-Reply-To: <1409088987-17207-1-git-send-email-mreitz@redhat.com> References: <1409088987-17207-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v12 10/14] qemu-img: Enable progress output for commit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz Implement progress output for the commit command by querying the progress of the block job. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- qemu-img-cmds.hx | 4 ++-- qemu-img.c | 24 ++++++++++++++++++++++-- qemu-img.texi | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx index e2ceadf..fde33d1 100644 --- a/qemu-img-cmds.hx +++ b/qemu-img-cmds.hx @@ -22,9 +22,9 @@ STEXI ETEXI DEF("commit", img_commit, - "commit [-q] [-f fmt] [-t cache] [-d] filename") + "commit [-q] [-f fmt] [-t cache] [-d] [-p] filename") STEXI -@item commit [-q] [-f @var{fmt}] [-t @var{cache}] [-d] @var{filename} +@item commit [-q] [-f @var{fmt}] [-t @var{cache}] [-d] [-p] @var{filename} ETEXI DEF("compare", img_compare, diff --git a/qemu-img.c b/qemu-img.c index cd9c17d..f9ef12a 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -757,12 +757,18 @@ static void run_block_job(BlockJob *job, Error **errp) do { aio_poll(aio_context, true); + qemu_progress_print((float)job->offset / job->len * 100.f, 0); + if (!job->busy && !job->ready) { block_job_resume(job); } } while (!job->ready); block_job_complete_sync(job, errp); + + /* A block job may finish instantaneously without publishing any progress, + * so just signal completion here */ + qemu_progress_print(100.f, 0); } static int img_commit(int argc, char **argv) @@ -770,14 +776,14 @@ static int img_commit(int argc, char **argv) int c, ret, flags; const char *filename, *fmt, *cache; BlockDriverState *bs, *base_bs; - bool quiet = false, drop = false; + bool progress = false, quiet = false, drop = false; Error *local_err = NULL; CommonBlockJobCBInfo cbi; fmt = NULL; cache = BDRV_DEFAULT_CACHE; for(;;) { - c = getopt(argc, argv, "f:ht:dq"); + c = getopt(argc, argv, "f:ht:dpq"); if (c == -1) { break; } @@ -795,11 +801,20 @@ static int img_commit(int argc, char **argv) case 'd': drop = true; break; + case 'p': + progress = true; + break; case 'q': quiet = true; break; } } + + /* Progress is not shown in Quiet mode */ + if (quiet) { + progress = false; + } + if (optind != argc - 1) { error_exit("Expecting one image file name"); } @@ -817,6 +832,9 @@ static int img_commit(int argc, char **argv) return 1; } + qemu_progress_init(progress, 1.f); + qemu_progress_print(0.f, 100); + /* This is different from QMP, which by default uses the deepest file in the * backing chain (i.e., the very base); however, the traditional behavior of * qemu-img commit is using the immediate backing file. */ @@ -865,6 +883,8 @@ unref_backing: } done: + qemu_progress_end(); + bdrv_unref(bs); if (local_err) { diff --git a/qemu-img.texi b/qemu-img.texi index 3574145..db411f1 100644 --- a/qemu-img.texi +++ b/qemu-img.texi @@ -166,7 +166,7 @@ this case. @var{backing_file} will never be modified unless you use the The size can also be specified using the @var{size} option with @code{-o}, it doesn't need to be specified separately in this case. -@item commit [-f @var{fmt}] [-t @var{cache}] [-d] @var{filename} +@item commit [-q] [-f @var{fmt}] [-t @var{cache}] [-d] [-p] @var{filename} Commit the changes recorded in @var{filename} in its base image or backing file. If the backing file is smaller than the snapshot, then the backing file will be -- 2.1.0