[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 08/15] qemu-img: add support for --object with 'dd' c
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 08/15] qemu-img: add support for --object with 'dd' command |
Date: |
Mon, 29 May 2017 17:06:47 +0200 |
From: "Daniel P. Berrange" <address@hidden>
The qemu-img dd command added --image-opts support, but missed
the corresponding --object support. This prevented passing
secrets (eg auth passwords) needed by certain disk images.
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
qemu-img.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/qemu-img.c b/qemu-img.c
index b506839..181f499 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -4158,6 +4158,7 @@ static int img_dd(int argc, char **argv)
};
const struct option long_options[] = {
{ "help", no_argument, 0, 'h'},
+ { "object", required_argument, 0, OPTION_OBJECT},
{ "image-opts", no_argument, 0, OPTION_IMAGE_OPTS},
{ "force-share", no_argument, 0, 'U'},
{ 0, 0, 0, 0 }
@@ -4186,6 +4187,15 @@ static int img_dd(int argc, char **argv)
case 'U':
force_share = true;
break;
+ case OPTION_OBJECT: {
+ QemuOpts *opts;
+ opts = qemu_opts_parse_noisily(&qemu_object_opts,
+ optarg, true);
+ if (!opts) {
+ ret = -1;
+ goto out;
+ }
+ } break;
case OPTION_IMAGE_OPTS:
image_opts = true;
break;
@@ -4230,6 +4240,14 @@ static int img_dd(int argc, char **argv)
ret = -1;
goto out;
}
+
+ if (qemu_opts_foreach(&qemu_object_opts,
+ user_creatable_add_opts_foreach,
+ NULL, NULL)) {
+ ret = -1;
+ goto out;
+ }
+
blk1 = img_open(image_opts, in.filename, fmt, 0, false, false,
force_share);
--
1.8.3.1
- [Qemu-block] [PULL 00/15] Block layer patches, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 02/15] qemu-iotests: Test streaming with missing job ID, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 01/15] stream: fix crash in stream_start() when block_job_create() fails, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 03/15] iotests: 147: Don't test inet6 if not available, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 05/15] mirror: Drop permissions on s->target on completion, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 04/15] nvme: Add support for Controller Memory Buffers, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 07/15] qemu-img: Fix documentation of convert, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 08/15] qemu-img: add support for --object with 'dd' command,
Kevin Wolf <=
- [Qemu-block] [PULL 06/15] qcow2: remove extra local_error variable, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 09/15] qemu-img: fix --image-opts usage with dd command, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 10/15] qemu-img: introduce --target-image-opts for 'convert' command, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 12/15] qemu-img: Fix leakage of options on error, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 11/15] qemu-img: copy *key-secret opts when opening newly created files, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 13/15] block: Tweak error message related to qemu-img amend, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 14/15] block: Fix backing paths for filenames with colons, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 15/15] block/file-*: *_parse_filename() and colons, Kevin Wolf, 2017/05/29
- Re: [Qemu-block] [PULL 00/15] Block layer patches, Stefan Hajnoczi, 2017/05/30