[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 37/53] qemu-img: Add progress output for amend
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 37/53] qemu-img: Add progress output for amend |
Date: |
Mon, 3 Nov 2014 11:50:40 +0000 |
From: Max Reitz <address@hidden>
Now that bdrv_amend_options() supports a status callback, use it to
display a progress report.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: BenoƮt Canet <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
qemu-img-cmds.hx | 4 ++--
qemu-img.c | 25 ++++++++++++++++++++++---
qemu-img.texi | 2 +-
3 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
index 04c207d..9567774 100644
--- a/qemu-img-cmds.hx
+++ b/qemu-img-cmds.hx
@@ -70,8 +70,8 @@ STEXI
ETEXI
DEF("amend", img_amend,
- "amend [-q] [-f fmt] [-t cache] -o options filename")
+ "amend [-p] [-q] [-f fmt] [-t cache] -o options filename")
STEXI
address@hidden amend [-q] [-f @var{fmt}] [-t @var{cache}] -o @var{options}
@var{filename}
address@hidden amend [-p] [-q] [-f @var{fmt}] [-t @var{cache}] -o @var{options}
@var{filename}
@end table
ETEXI
diff --git a/qemu-img.c b/qemu-img.c
index a095d42..c7b394a 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2871,6 +2871,12 @@ out:
return 0;
}
+static void amend_status_cb(BlockDriverState *bs,
+ int64_t offset, int64_t total_work_size)
+{
+ qemu_progress_print(100.f * offset / total_work_size, 0);
+}
+
static int img_amend(int argc, char **argv)
{
int c, ret = 0;
@@ -2879,13 +2885,13 @@ static int img_amend(int argc, char **argv)
QemuOpts *opts = NULL;
const char *fmt = NULL, *filename, *cache;
int flags;
- bool quiet = false;
+ bool quiet = false, progress = false;
BlockBackend *blk = NULL;
BlockDriverState *bs = NULL;
cache = BDRV_DEFAULT_CACHE;
for (;;) {
- c = getopt(argc, argv, "ho:f:t:q");
+ c = getopt(argc, argv, "ho:f:t:pq");
if (c == -1) {
break;
}
@@ -2915,6 +2921,9 @@ static int img_amend(int argc, char **argv)
case 't':
cache = optarg;
break;
+ case 'p':
+ progress = true;
+ break;
case 'q':
quiet = true;
break;
@@ -2925,6 +2934,11 @@ static int img_amend(int argc, char **argv)
error_exit("Must specify options (-o)");
}
+ if (quiet) {
+ progress = false;
+ }
+ qemu_progress_init(progress, 1.0);
+
filename = (optind == argc - 1) ? argv[argc - 1] : NULL;
if (fmt && has_help_option(options)) {
/* If a format is explicitly specified (and possibly no filename is
@@ -2968,13 +2982,18 @@ static int img_amend(int argc, char **argv)
goto out;
}
- ret = bdrv_amend_options(bs, opts, NULL);
+ /* In case the driver does not call amend_status_cb() */
+ qemu_progress_print(0.f, 0);
+ ret = bdrv_amend_options(bs, opts, &amend_status_cb);
+ qemu_progress_print(100.f, 0);
if (ret < 0) {
error_report("Error while amending options: %s", strerror(-ret));
goto out;
}
out:
+ qemu_progress_end();
+
blk_unref(blk);
qemu_opts_del(opts);
qemu_opts_free(create_opts);
diff --git a/qemu-img.texi b/qemu-img.texi
index 078851a..0a1ab35 100644
--- a/qemu-img.texi
+++ b/qemu-img.texi
@@ -412,7 +412,7 @@ After using this command to grow a disk image, you must use
file system and
partitioning tools inside the VM to actually begin using the new space on the
device.
address@hidden amend [-f @var{fmt}] [-t @var{cache}] -o @var{options}
@var{filename}
address@hidden amend [-p] [-f @var{fmt}] [-t @var{cache}] -o @var{options}
@var{filename}
Amends the image format specific @var{options} for the image file
@var{filename}. Not all file formats support this operation.
--
1.9.3
- [Qemu-devel] [PULL 27/53] block/mirror: Improve progress report, (continued)
- [Qemu-devel] [PULL 27/53] block/mirror: Improve progress report, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 28/53] qemu-img: Implement commit like QMP, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 29/53] qemu-img: Empty image after commit, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 30/53] qemu-img: Enable progress output for commit, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 31/53] qemu-img: Specify backing file for commit, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 32/53] iotests: Add _filter_qemu_img_map, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 33/53] iotests: Add test for backing-chain commits, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 34/53] iotests: Add test for qcow2's bdrv_make_empty, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 36/53] block: Add status callback to bdrv_amend_options(), Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 35/53] block: qemu-iotest 107 supports NFS, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 37/53] qemu-img: Add progress output for amend,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 38/53] qemu-img: Fix insignificant memleak, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 39/53] block/qcow2: Implement status CB for amend, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 40/53] block/qcow2: Make get_refcount() global, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 41/53] block/qcow2: Simplify shared L2 handling in amend, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 42/53] iotests: Expand test 061, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 43/53] block: acquire AioContext in generic blockjob QMP commands, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 44/53] blockdev: acquire AioContext in do_qmp_query_block_jobs_one(), Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 45/53] blockdev: acquire AioContext in blockdev_mark_auto_del(), Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 46/53] blockdev: add note that block_job_cb() must be thread-safe, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 47/53] blockjob: add block_job_defer_to_main_loop(), Stefan Hajnoczi, 2014/11/03