From a20760c046f133055cedaba6952f49758e0d9cbf Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Tue, 25 Feb 2014 15:00:02 +0100

Subject: [PATCH 4/7] qemu-img convert: Support multiple -o options

RH-Author: Kevin Wolf <kwolf@redhat.com>

Message-id: <1393340405-9936-4-git-send-email-kwolf@redhat.com>

Patchwork-id: 57799

O-Subject: [RHEL-7.0 qemu-kvm PATCH 3/6] qemu-img convert: Support multiple -o options

Bugzilla: 1065873

RH-Acked-by: Juan Quintela <quintela@redhat.com>

RH-Acked-by: Fam Zheng <famz@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

Instead of ignoring all option values but the last one, multiple -o

options now have the same meaning as having a single option with all

settings in the order of their respective -o options.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Reviewed-by: Jeff Cody <jcody@redhat.com>

Reviewed-by: Eric Blake <eblake@redhat.com>

(cherry picked from commit 2dc8328b4c6aba60f4ad543186f4e8aec2e9287e)

Conflicts:

	qemu-img.c

Conflicts because qemu-img convert doesn't have an -l option in RHEL 7.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

---

 qemu-img.c | 31 +++++++++++++++++++++++--------

 1 file changed, 23 insertions(+), 8 deletions(-)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 qemu-img.c |   31 +++++++++++++++++++++++--------

 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/qemu-img.c b/qemu-img.c

index 12bf996..e7b12c2 100644

--- a/qemu-img.c

+++ b/qemu-img.c

@@ -1159,6 +1159,9 @@ static int img_convert(int argc, char **argv)

     bool quiet = false;

     Error *local_err = NULL;

+    /* Initialize before goto out */

+    qemu_progress_init(progress, 1.0);

+

     fmt = NULL;

     out_fmt = "raw";

     cache = "unsafe";

@@ -1190,13 +1193,26 @@ 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':

-            options = optarg;

+            if (!is_valid_option_list(optarg)) {

+                error_report("Invalid option list: %s", optarg);

+                ret = -1;

+                goto out;

+            }

+            if (!options) {

+                options = g_strdup(optarg);

+            } else {

+                char *old_options = options;

+                options = g_strdup_printf("%s,%s", options, optarg);

+                g_free(old_options);

+            }

             break;

         case 's':

             snapshot_name = optarg;

@@ -1208,7 +1224,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;

@@ -1240,10 +1257,7 @@ 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 && is_help_option(options)) {

+    if (options && has_help_option(options)) {

         ret = print_block_option_help(out_filename, out_fmt);

         goto out;

     }

@@ -1610,6 +1624,7 @@ out:

     free_option_parameters(create_options);

     free_option_parameters(param);

     qemu_vfree(buf);

+    g_free(options);

     if (out_bs) {

         bdrv_unref(out_bs);

     }

-- 

1.7.1