[Qemu-devel] [PATCH 6/7] qemu-img convert: Support multiple -o options

[Kevin Wolf]

Multiple -o options has the same meaning as having a single option with
all settings in the order of their respective -o options.

Signed-off-by: Kevin Wolf <address@hidden>
---
 qemu-img.c | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/qemu-img.c b/qemu-img.c
index 30273ad..e0d19f8 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1204,6 +1204,9 @@ 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 = NULL;
     cache = NULL;
@@ -1223,21 +1226,24 @@ static int img_convert(int argc, char **argv)
         case 'f':
             if (fmt) {
                 error_report("-f may only be specified once");
-                return 1;
+                ret = -1;
+                goto out;
             }
             fmt = optarg;
             break;
         case 'O':
             if (out_fmt) {
                 error_report("-O may only be specified once");
-                return 1;
+                ret = -1;
+                goto out;
             }
             out_fmt = optarg;
             break;
         case 'B':
             if (out_baseimg) {
                 error_report("-B may only be specified once");
-                return 1;
+                ret = -1;
+                goto out;
             }
             out_baseimg = optarg;
             break;
@@ -1247,41 +1253,43 @@ static int img_convert(int argc, char **argv)
         case 'e':
             error_report("option -e is deprecated, please use \'-o "
                   "encryption\' instead!");
-            return 1;
+            ret = -1;
+            goto out;
         case '6':
             error_report("option -6 is deprecated, please use \'-o "
                   "compat6\' instead!");
-            return 1;
+            ret = -1;
+            goto out;
         case 'o':
             if (is_help_option(optarg)) {
                 options_help = true;
             } else if (!options) {
-                options = optarg;
+                options = g_strdup(optarg);
             } else {
-                error_report("-o cannot be used multiple times. Please use a "
-                             "single -o option with comma-separated settings "
-                             "instead.");
-                return 1;
+                options = g_strdup_printf("%s,%s", options, optarg);
             }
             break;
         case 's':
             if (sn_opts || snapshot_name) {
                 error_report("-l/-s may only be specified once");
-                return 1;
+                ret = -1;
+                goto out;
             }
             snapshot_name = optarg;
             break;
         case 'l':
             if (sn_opts || snapshot_name) {
                 error_report("-l/-s may only be specified once");
-                return 1;
+                ret = -1;
+                goto out;
             }
             if (strstart(optarg, SNAPSHOT_OPT_BASE, NULL)) {
                 sn_opts = qemu_opts_parse(&internal_snapshot_opts, optarg, 0);
                 if (!sn_opts) {
                     error_report("Failed in parsing snapshot param '%s'",
                                  optarg);
-                    return 1;
+                    ret = -1;
+                    goto out;
                 }
             } else {
                 snapshot_name = optarg;
@@ -1294,7 +1302,8 @@ static int img_convert(int argc, char **argv)
             sval = strtosz_suffix(optarg, &end, STRTOSZ_DEFSUFFIX_B);
             if (sval < 0 || *end) {
                 error_report("Invalid minimum zero buffer size for sparse 
output specified");
-                return 1;
+                ret = -1;
+                goto out;
             }
 
             min_sparse = sval / BDRV_SECTOR_SIZE;
@@ -1306,7 +1315,8 @@ static int img_convert(int argc, char **argv)
         case 't':
             if (cache) {
                 error_report("-t may only be specified once");
-                return 1;
+                ret = -1;
+                goto out;
             }
             cache = optarg;
             break;
@@ -1337,9 +1347,6 @@ static int img_convert(int argc, char **argv)
 
     out_filename = argv[argc - 1];
 
-    /* Initialize before goto out */
-    qemu_progress_init(progress, 1.0);
-
     if (options_help) {
         ret = print_block_option_help(out_filename, out_fmt);
         goto out;
@@ -1733,6 +1740,7 @@ out:
     free_option_parameters(create_options);
     free_option_parameters(param);
     qemu_vfree(buf);
+    g_free(options);
     if (sn_opts) {
         qemu_opts_del(sn_opts);
     }
-- 
1.8.1.4