[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/19] qemu-img convert: Fix progress output
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 03/19] qemu-img convert: Fix progress output |
Date: |
Fri, 7 Mar 2014 14:32:51 +0100 |
Initialise progress output only when the -p and -q options have already
been parsed, otherwise it's always disabled.
Reported-by: Peter Lieven <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
qemu-img.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 886db88..2e40cc1 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1162,9 +1162,6 @@ static int img_convert(int argc, char **argv)
Error *local_err = NULL;
QemuOpts *sn_opts = NULL;
- /* Initialize before goto out */
- qemu_progress_init(progress, 1.0);
-
fmt = NULL;
out_fmt = "raw";
cache = "unsafe";
@@ -1197,17 +1194,17 @@ static int img_convert(int argc, char **argv)
error_report("option -e is deprecated, please use \'-o "
"encryption\' instead!");
ret = -1;
- goto out;
+ goto fail_getopt;
case '6':
error_report("option -6 is deprecated, please use \'-o "
"compat6\' instead!");
ret = -1;
- goto out;
+ goto fail_getopt;
case 'o':
if (!is_valid_option_list(optarg)) {
error_report("Invalid option list: %s", optarg);
ret = -1;
- goto out;
+ goto fail_getopt;
}
if (!options) {
options = g_strdup(optarg);
@@ -1227,7 +1224,7 @@ static int img_convert(int argc, char **argv)
error_report("Failed in parsing snapshot param '%s'",
optarg);
ret = -1;
- goto out;
+ goto fail_getopt;
}
} else {
snapshot_name = optarg;
@@ -1241,7 +1238,7 @@ static int img_convert(int argc, char **argv)
if (sval < 0 || *end) {
error_report("Invalid minimum zero buffer size for sparse
output specified");
ret = -1;
- goto out;
+ goto fail_getopt;
}
min_sparse = sval / BDRV_SECTOR_SIZE;
@@ -1262,9 +1259,12 @@ static int img_convert(int argc, char **argv)
}
}
+ /* Initialize before goto out */
if (quiet) {
progress = 0;
}
+ qemu_progress_init(progress, 1.0);
+
bs_n = argc - optind - 1;
out_filename = bs_n >= 1 ? argv[argc - 1] : NULL;
@@ -1667,7 +1667,6 @@ out:
free_option_parameters(create_options);
free_option_parameters(param);
qemu_vfree(buf);
- g_free(options);
if (sn_opts) {
qemu_opts_del(sn_opts);
}
@@ -1682,6 +1681,9 @@ out:
}
g_free(bs);
}
+fail_getopt:
+ g_free(options);
+
if (ret) {
return 1;
}
--
1.8.1.4
- [Qemu-devel] [PULL 00/19] Block patches, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 01/19] gluster: Change licence to GPLv2+, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 03/19] qemu-img convert: Fix progress output,
Kevin Wolf <=
- [Qemu-devel] [PULL 04/19] qemu-iotests: Test progress output for conversion, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 02/19] gluster: Remove unused defines and header include, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 05/19] iscsi: Use bs->sg for everything else than disks, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 06/19] block: Fix bs->request_alignment assertion for bs->sg=1, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 07/19] block: make bdrv_swap rebuild the bs graph node list field., Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 08/19] block: mirror - remove code cruft that has no function, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 09/19] block: Keep "filename" option after parsing, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 10/19] block/raw-posix: Implement bdrv_parse_filename(), Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 12/19] block/raw-win32: Implement bdrv_parse_filename(), Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 11/19] block/raw-posix: Strip "file:" prefix on creation, Kevin Wolf, 2014/03/07