diff mbox

[v6,5/5] Revert "qemu-img: copy *key-secret opts when opening newly created files"

Message ID 20170502141858.24805-6-berrange@redhat.com
State New
Headers show

Commit Message

Daniel P. Berrangé May 2, 2017, 2:18 p.m. UTC 
This reverts commit 37d7772f6b81613620a333862dc67e34b2fda1a9.
---
 qemu-img.c | 41 ++++++-----------------------------------
 1 file changed, 6 insertions(+), 35 deletions(-)

Comments

Eric Blake May 2, 2017, 2:29 p.m. UTC | #1 
On 05/02/2017 09:18 AM, Daniel P. Berrange wrote:
> This reverts commit 37d7772f6b81613620a333862dc67e34b2fda1a9.
> ---
>  qemu-img.c | 41 ++++++-----------------------------------
>  1 file changed, 6 insertions(+), 35 deletions(-)

Is this intentional, given that 4/5 just installed it?
Daniel P. Berrangé May 2, 2017, 2:32 p.m. UTC | #2 
On Tue, May 02, 2017 at 09:29:24AM -0500, Eric Blake wrote:
> On 05/02/2017 09:18 AM, Daniel P. Berrange wrote:
> > This reverts commit 37d7772f6b81613620a333862dc67e34b2fda1a9.
> > ---
> >  qemu-img.c | 41 ++++++-----------------------------------
> >  1 file changed, 6 insertions(+), 35 deletions(-)
> 
> Is this intentional, given that 4/5 just installed it?

Urgh, absolutely not. I thought I had killed that commit left over from
testing before I sent it, but I guess not :-(


Regards,
Daniel
diff mbox

Patch

diff --git a/qemu-img.c b/qemu-img.c
index cbf05b4..94c8cea 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -305,17 +305,15 @@  static BlockBackend *img_open_opts(const char *optstr,
 }
 
 static BlockBackend *img_open_file(const char *filename,
-                                   QDict *options,
                                    const char *fmt, int flags,
                                    bool writethrough, bool quiet)
 {
     BlockBackend *blk;
     Error *local_err = NULL;
+    QDict *options = NULL;
 
     if (fmt) {
-        if (!options) {
-            options = qdict_new();
-        }
+        options = qdict_new();
         qdict_put(options, "driver", qstring_from_str(fmt));
     }
 
@@ -334,33 +332,6 @@  static BlockBackend *img_open_file(const char *filename,
 }
 
 
-static int img_add_key_secrets(void *opaque,
-                               const char *name, const char *value,
-                               Error **errp)
-{
-    QDict *options = opaque;
-
-    if (g_str_has_suffix(name, "key-secret")) {
-        qdict_put(options, name, qstring_from_str(value));
-    }
-
-    return 0;
-}
-
-static BlockBackend *img_open_new_file(const char *filename,
-                                       QemuOpts *create_opts,
-                                       const char *fmt, int flags,
-                                       bool writethrough, bool quiet)
-{
-    QDict *options = NULL;
-
-    options = qdict_new();
-    qemu_opt_foreach(create_opts, img_add_key_secrets, options, &error_abort);
-
-    return img_open_file(filename, options, fmt, flags, writethrough, quiet);
-}
-
-
 static BlockBackend *img_open(bool image_opts,
                               const char *filename,
                               const char *fmt, int flags, bool writethrough,
@@ -380,7 +351,7 @@  static BlockBackend *img_open(bool image_opts,
         }
         blk = img_open_opts(filename, opts, flags, writethrough, quiet);
     } else {
-        blk = img_open_file(filename, NULL, fmt, flags, writethrough, quiet);
+        blk = img_open_file(filename, fmt, flags, writethrough, quiet);
     }
     return blk;
 }
@@ -2285,8 +2256,8 @@  static int img_convert(int argc, char **argv)
          * That has to wait for bdrv_create to be improved
          * to allow filenames in option syntax
          */
-        s.target = img_open_new_file(out_filename, opts, out_fmt,
-                                     flags, writethrough, quiet);
+        s.target = img_open_file(out_filename, out_fmt, flags,
+                                 writethrough, quiet);
     }
     if (!s.target) {
         ret = -1;
@@ -4298,7 +4269,7 @@  static int img_dd(int argc, char **argv)
      * with the bdrv_create() call above which does not
      * support image-opts style.
      */
-    blk2 = img_open_file(out.filename, NULL, out_fmt, BDRV_O_RDWR,
+    blk2 = img_open_file(out.filename, out_fmt, BDRV_O_RDWR,
                          false, false);
 
     if (!blk2) {