From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYG6j-0002Ra-Lm for qemu-devel@nongnu.org; Thu, 10 Apr 2014 10:37:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WYG6d-0003CH-Ha for qemu-devel@nongnu.org; Thu, 10 Apr 2014 10:37:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22695) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYG6d-0003CB-8K for qemu-devel@nongnu.org; Thu, 10 Apr 2014 10:37:31 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s3AEbUkS026086 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 10 Apr 2014 10:37:30 -0400 Message-ID: <5346ACA0.3090701@redhat.com> Date: Thu, 10 Apr 2014 16:37:20 +0200 From: Max Reitz MIME-Version: 1.0 References: <1396961442-24046-1-git-send-email-mreitz@redhat.com> <1396961442-24046-5-git-send-email-mreitz@redhat.com> <20140408153452.GF6262@noname.str.redhat.com> In-Reply-To: <20140408153452.GF6262@noname.str.redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 4/6] qemu-img: Enable progress output for commit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: qemu-devel@nongnu.org, Stefan Hajnoczi On 08.04.2014 17:34, Kevin Wolf wrote: > Am 08.04.2014 um 14:50 hat Max Reitz geschrieben: >> 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 | 33 +++++++++++++++++++++++++++++++-- >> qemu-img.texi | 2 +- >> 3 files changed, 34 insertions(+), 5 deletions(-) >> >> diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx >> index d029609..8bc55cd 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] filename") >> + "commit [-q] [-f fmt] [-t cache] [-p] filename") >> STEXI >> -@item commit [-q] [-f @var{fmt}] [-t @var{cache}] @var{filename} >> +@item commit [-q] [-f @var{fmt}] [-t @var{cache}] [-p] @var{filename} >> ETEXI >> >> DEF("compare", img_compare, >> diff --git a/qemu-img.c b/qemu-img.c >> index e86911f..0a9eff7 100644 >> --- a/qemu-img.c >> +++ b/qemu-img.c >> @@ -690,12 +690,27 @@ static void dummy_block_job_cb(void *opaque, int ret) >> static void run_block_job(BlockJob *job, Error **errp) >> { >> BlockJobInfo *info; >> + uint64_t mod_offset = 0; >> >> do { >> aio_poll(qemu_get_aio_context(), true); >> >> info = block_job_query(job); >> >> + if (info->offset) { >> + if (!mod_offset) { > On a fully populated image this doesn't look entirely right. I think the > first 2 MB (or whatever the buffer size is) will be disregarded in the > calculation, even though they are real work that is done. Hm, right. I'll see how I get it included into this supposedly common function. Max >> + /* Some block jobs (at least "commit") will only work on a >> + * subset of the image file and therefore basically skip many >> + * sectors at the start (processing them apparently >> + * instantaneously). These sectors should be ignored when >> + * calculating the progress. */ >> + mod_offset = info->offset; >> + } >> + >> + qemu_progress_print((float)(info->offset - mod_offset) / >> + (info->len - mod_offset) * 100.f, 0); >> + } >> + >> if (!info->busy && info->offset < info->len) { >> block_job_resume(job); >> } > Kevin