qemu-img: add support for --object with 'dd' command
PATCH 1/1 qemu-img: add support for --object with 'dd' command
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.
Signed-off-by Daniel P. Berrange <[email protected]>
--- qemu-img.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
qemu-img.c +16 -0
@@ -3948,6 +3948,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 }, {0 ,0 ,0 ,0 } };
@@ -3970,6 +3971,14 @@ static int img_dd(int argc, char **argv)case 'h' :help ();break ; +case OPTION_OBJECT : { +QemuOpts *opts; + opts =qemu_opts_parse_noisily (&qemu_object_opts, + optarg, true); +if (!opts) { +return 1 ; + } + }break ;case OPTION_IMAGE_OPTS : image_opts = true;break ;
@@ -4014,6 +4023,13 @@ 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 )) { +return 1 ; + } + blk1 =img_open (image_opts, in.filename, fmt,0 , false, false);if (!blk1) {
Signature · 1 line
2.9.3
Quoted 8 lines · Daniel P. Berrange
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.
Signed-off-by Daniel P. Berrange <[email protected]>--- qemu-img.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
Reviewed-by Eric Blake <[email protected]>
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org