[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 4/4] qemu-img: copy *key-secret opts when opening
From: |
Daniel P. Berrange |
Subject: |
[Qemu-block] [PATCH v3 4/4] qemu-img: copy *key-secret opts when opening newly created files |
Date: |
Mon, 20 Feb 2017 15:19:21 +0000 |
The qemu-img dd/convert commands will create a image file and
then try to open it. Historically it has been possible to open
new files without passing any options. With encrypted files
though, the *key-secret options are mandatory, so we need to
provide those options when opening the newly created file.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
qemu-img.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 42 insertions(+), 2 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index e48e676..bad19fd 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -317,6 +317,46 @@ 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)
+{
+ BlockBackend *blk;
+ Error *local_err = NULL;
+ QDict *options = NULL;
+
+ options = qdict_new();
+ if (fmt) {
+ qdict_put(options, "driver", qstring_from_str(fmt));
+ }
+
+ qemu_opt_foreach(create_opts, img_add_key_secrets, options, NULL);
+
+ blk = blk_new_open(filename, NULL, options, flags, &local_err);
+ if (!blk) {
+ error_reportf_err(local_err, "Could not open '%s': ", filename);
+ return NULL;
+ }
+ blk_set_enable_write_cache(blk, !writethrough);
+
+ return blk;
+}
+
+
static BlockBackend *img_open(bool image_opts,
const char *filename,
const char *fmt, int flags, bool writethrough,
@@ -2120,8 +2160,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
*/
- out_blk = img_open_file(out_filename, out_fmt,
- flags, writethrough, quiet);
+ out_blk = img_open_new_file(out_filename, opts, out_fmt,
+ flags, writethrough, quiet);
}
if (!out_blk) {
ret = -1;
--
2.9.3