From nobody Fri May 3 17:47:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1493025554334574.2546996572282; Mon, 24 Apr 2017 02:19:14 -0700 (PDT) Received: from localhost ([::1]:42864 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2a9H-00046u-Om for importer@patchew.org; Mon, 24 Apr 2017 05:19:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2a7Z-0002vV-Ao for qemu-devel@nongnu.org; Mon, 24 Apr 2017 05:17:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2a7Y-0004BB-Ef for qemu-devel@nongnu.org; Mon, 24 Apr 2017 05:17:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48334) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2a7U-00047g-08; Mon, 24 Apr 2017 05:17:20 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 09EB166CB2; Mon, 24 Apr 2017 09:17:19 +0000 (UTC) Received: from t460.redhat.com (ovpn-117-237.ams2.redhat.com [10.36.117.237]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5630B7DFC3; Mon, 24 Apr 2017 09:17:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 09EB166CB2 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=berrange@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 09EB166CB2 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 24 Apr 2017 10:16:56 +0100 Message-Id: <20170424091659.26708-2-berrange@redhat.com> In-Reply-To: <20170424091659.26708-1-berrange@redhat.com> References: <20170424091659.26708-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 24 Apr 2017 09:17:19 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v5 1/4] qemu-img: add support for --object with 'dd' command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: Max Reitz Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrange Reviewed-by: Fam Zheng --- qemu-img.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/qemu-img.c b/qemu-img.c index b220cf7..2249c21 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -4159,6 +4159,7 @@ static int img_dd(int argc, char **argv) }; const struct option long_options[] =3D { { "help", no_argument, 0, 'h'}, + { "object", required_argument, 0, OPTION_OBJECT}, { "image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, { 0, 0, 0, 0 } }; @@ -4183,6 +4184,15 @@ static int img_dd(int argc, char **argv) case 'h': help(); break; + case OPTION_OBJECT: { + QemuOpts *opts; + opts =3D qemu_opts_parse_noisily(&qemu_object_opts, + optarg, true); + if (!opts) { + ret =3D -1; + goto out; + } + } break; case OPTION_IMAGE_OPTS: image_opts =3D true; break; @@ -4227,6 +4237,14 @@ static int img_dd(int argc, char **argv) ret =3D -1; goto out; } + + if (qemu_opts_foreach(&qemu_object_opts, + user_creatable_add_opts_foreach, + NULL, NULL)) { + ret =3D -1; + goto out; + } + blk1 =3D img_open(image_opts, in.filename, fmt, 0, false, false); =20 if (!blk1) { --=20 2.9.3 From nobody Fri May 3 17:47:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1493025657214373.29565169418504; Mon, 24 Apr 2017 02:20:57 -0700 (PDT) Received: from localhost ([::1]:42878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2aAx-0005UC-Qd for importer@patchew.org; Mon, 24 Apr 2017 05:20:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51264) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2a7a-0002wy-F4 for qemu-devel@nongnu.org; Mon, 24 Apr 2017 05:17:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2a7Z-0004CR-AK for qemu-devel@nongnu.org; Mon, 24 Apr 2017 05:17:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48870) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2a7X-00049z-7Z; Mon, 24 Apr 2017 05:17:23 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 36B6D804E4; Mon, 24 Apr 2017 09:17:22 +0000 (UTC) Received: from t460.redhat.com (ovpn-117-237.ams2.redhat.com [10.36.117.237]) by smtp.corp.redhat.com (Postfix) with ESMTP id A32E27EDE7; Mon, 24 Apr 2017 09:17:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 36B6D804E4 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=berrange@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 36B6D804E4 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 24 Apr 2017 10:16:57 +0100 Message-Id: <20170424091659.26708-3-berrange@redhat.com> In-Reply-To: <20170424091659.26708-1-berrange@redhat.com> References: <20170424091659.26708-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 24 Apr 2017 09:17:22 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v5 2/4] qemu-img: fix --image-opts usage with dd command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The --image-opts flag can only be used to affect the parsing of the source image. The target image has to be specified in the traditional style regardless, since it needs to be passed to the bdrv_create() API which does not support the new style opts. Reviewed-by: Max Reitz Signed-off-by: Daniel P. Berrange Reviewed-by: Fam Zheng --- qemu-img.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 2249c21..83aff5e 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -4312,8 +4312,13 @@ static int img_dd(int argc, char **argv) goto out; } =20 - blk2 =3D img_open(image_opts, out.filename, out_fmt, BDRV_O_RDWR, - false, false); + /* TODO, we can't honour --image-opts for the target, + * since it needs to be given in a format compatible + * with the bdrv_create() call above which does not + * support image-opts style. + */ + blk2 =3D img_open_file(out.filename, out_fmt, BDRV_O_RDWR, + false, false); =20 if (!blk2) { ret =3D -1; --=20 2.9.3 From nobody Fri May 3 17:47:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149302555943069.62338834456273; Mon, 24 Apr 2017 02:19:19 -0700 (PDT) Received: from localhost ([::1]:42865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2a9N-0004CN-LC for importer@patchew.org; Mon, 24 Apr 2017 05:19:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2a7h-00032t-4X for qemu-devel@nongnu.org; Mon, 24 Apr 2017 05:17:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2a7e-0004GL-5o for qemu-devel@nongnu.org; Mon, 24 Apr 2017 05:17:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37628) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2a7a-0004Ch-9l; Mon, 24 Apr 2017 05:17:26 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 49B0781226; Mon, 24 Apr 2017 09:17:25 +0000 (UTC) Received: from t460.redhat.com (ovpn-117-237.ams2.redhat.com [10.36.117.237]) by smtp.corp.redhat.com (Postfix) with ESMTP id C37847DFC3; Mon, 24 Apr 2017 09:17:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 49B0781226 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=berrange@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 49B0781226 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 24 Apr 2017 10:16:58 +0100 Message-Id: <20170424091659.26708-4-berrange@redhat.com> In-Reply-To: <20170424091659.26708-1-berrange@redhat.com> References: <20170424091659.26708-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 24 Apr 2017 09:17:25 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v5 3/4] qemu-img: introduce --target-image-opts for 'convert' command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The '--image-opts' flags indicates whether the source filename includes options. The target filename has to remain in the plain filename format though, since it needs to be passed to bdrv_create(). When using --skip-create though, it would be possible to use image-opts syntax. This adds --target-image-opts to indicate that the target filename includes options. Currently this mandates use of the --skip-create flag too. Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrange Reviewed-by: Fam Zheng --- qemu-img-cmds.hx | 4 +-- qemu-img.c | 86 ++++++++++++++++++++++++++++++++++++++++------------= ---- qemu-img.texi | 12 ++++++-- 3 files changed, 73 insertions(+), 29 deletions(-) diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx index 8ac7822..93b50ef 100644 --- a/qemu-img-cmds.hx +++ b/qemu-img-cmds.hx @@ -40,9 +40,9 @@ STEXI ETEXI =20 DEF("convert", img_convert, - "convert [--object objectdef] [--image-opts] [-c] [-p] [-q] [-n] [-f f= mt] [-t cache] [-T src_cache] [-O output_fmt] [-o options] [-s snapshot_id_= or_name] [-l snapshot_param] [-S sparse_size] [-m num_coroutines] [-W] file= name [filename2 [...]] output_filename") + "convert [--object objectdef] [--image-opts] [--target-image-opts] [-c= ] [-p] [-q] [-n] [-f fmt] [-t cache] [-T src_cache] [-O output_fmt] [-o opt= ions] [-s snapshot_id_or_name] [-l snapshot_param] [-S sparse_size] [-m num= _coroutines] [-W] filename [filename2 [...]] output_filename") STEXI -@item convert [--object @var{objectdef}] [--image-opts] [-c] [-p] [-q] [-n= ] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-O @var{output_fmt}= ] [-o @var{options}] [-s @var{snapshot_id_or_name}] [-l @var{snapshot_param= }] [-S @var{sparse_size}] [-m @var{num_coroutines}] [-W] @var{filename} [@v= ar{filename2} [...]] @var{output_filename} +@item convert [--object @var{objectdef}] [--image-opts] [--target-image-op= ts] [-c] [-p] [-q] [-n] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}= ] [-O @var{output_fmt}] [-o @var{options}] [-s @var{snapshot_id_or_name}] [= -l @var{snapshot_param}] [-S @var{sparse_size}] [-m @var{num_coroutines}] [= -W] @var{filename} [@var{filename2} [...]] @var{output_filename} ETEXI =20 DEF("dd", img_dd, diff --git a/qemu-img.c b/qemu-img.c index 83aff5e..2344e64 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -59,6 +59,7 @@ enum { OPTION_PATTERN =3D 260, OPTION_FLUSH_INTERVAL =3D 261, OPTION_NO_DRAIN =3D 262, + OPTION_TARGET_IMAGE_OPTS =3D 263, }; =20 typedef enum OutputFormat { @@ -1921,7 +1922,7 @@ static int img_convert(int argc, char **argv) int progress =3D 0, flags, src_flags; bool writethrough, src_writethrough; const char *fmt, *out_fmt, *cache, *src_cache, *out_baseimg, *out_file= name; - BlockDriver *drv, *proto_drv; + BlockDriver *drv =3D NULL, *proto_drv =3D NULL; BlockBackend **blk =3D NULL, *out_blk =3D NULL; BlockDriverState **bs =3D NULL, *out_bs =3D NULL; int64_t total_sectors; @@ -1941,9 +1942,10 @@ static int img_convert(int argc, char **argv) bool image_opts =3D false; bool wr_in_order =3D true; long num_coroutines =3D 8; + bool tgt_image_opts =3D false; =20 + out_fmt =3D NULL; fmt =3D NULL; - out_fmt =3D "raw"; cache =3D "unsafe"; src_cache =3D BDRV_DEFAULT_CACHE; out_baseimg =3D NULL; @@ -1954,6 +1956,7 @@ static int img_convert(int argc, char **argv) {"help", no_argument, 0, 'h'}, {"object", required_argument, 0, OPTION_OBJECT}, {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, + {"target-image-opts", no_argument, 0, OPTION_TARGET_IMAGE_OPTS= }, {0, 0, 0, 0} }; c =3D getopt_long(argc, argv, ":hf:O:B:ce6o:s:l:S:pt:T:qnm:W", @@ -2075,9 +2078,16 @@ static int img_convert(int argc, char **argv) case OPTION_IMAGE_OPTS: image_opts =3D true; break; + case OPTION_TARGET_IMAGE_OPTS: + tgt_image_opts =3D true; + break; } } =20 + if (!out_fmt && !tgt_image_opts) { + out_fmt =3D "raw"; + } + if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, NULL, NULL)) { @@ -2090,6 +2100,12 @@ static int img_convert(int argc, char **argv) goto fail_getopt; } =20 + if (tgt_image_opts && !skip_create) { + error_report("--target-image-opts requires use of -n flag"); + ret =3D -1; + goto fail_getopt; + } + /* Initialize before goto out */ if (quiet) { progress =3D 0; @@ -2100,8 +2116,14 @@ static int img_convert(int argc, char **argv) out_filename =3D bs_n >=3D 1 ? argv[argc - 1] : NULL; =20 if (options && has_help_option(options)) { - ret =3D print_block_option_help(out_filename, out_fmt); - goto out; + if (out_fmt) { + ret =3D print_block_option_help(out_filename, out_fmt); + goto out; + } else { + error_report("Option help requires a format be specified"); + ret =3D -1; + goto fail_getopt; + } } =20 if (bs_n < 1) { @@ -2168,22 +2190,22 @@ static int img_convert(int argc, char **argv) goto out; } =20 - /* Find driver and parse its options */ - drv =3D bdrv_find_format(out_fmt); - if (!drv) { - error_report("Unknown file format '%s'", out_fmt); - ret =3D -1; - goto out; - } + if (!skip_create) { + /* Find driver and parse its options */ + drv =3D bdrv_find_format(out_fmt); + if (!drv) { + error_report("Unknown file format '%s'", out_fmt); + ret =3D -1; + goto out; + } =20 - proto_drv =3D bdrv_find_protocol(out_filename, true, &local_err); - if (!proto_drv) { - error_report_err(local_err); - ret =3D -1; - goto out; - } + proto_drv =3D bdrv_find_protocol(out_filename, true, &local_err); + if (!proto_drv) { + error_report_err(local_err); + ret =3D -1; + goto out; + } =20 - if (!skip_create) { if (!drv->create_opts) { error_report("Format driver '%s' does not support image creati= on", drv->format_name); @@ -2232,7 +2254,7 @@ static int img_convert(int argc, char **argv) const char *preallocation =3D qemu_opt_get(opts, BLOCK_OPT_PREALLOC); =20 - if (!drv->bdrv_co_pwritev_compressed) { + if (drv && !drv->bdrv_co_pwritev_compressed) { error_report("Compression not supported for this file format"); ret =3D -1; goto out; @@ -2272,18 +2294,32 @@ static int img_convert(int argc, char **argv) goto out; } =20 - /* XXX we should allow --image-opts to trigger use of - * img_open() here, but then we have trouble with - * the bdrv_create() call which takes different params. - * Not critical right now, so fix can wait... - */ - out_blk =3D img_open_file(out_filename, out_fmt, flags, writethrough, = quiet); + if (skip_create) { + out_blk =3D img_open(tgt_image_opts, out_filename, out_fmt, + flags, writethrough, quiet); + } else { + /* TODO ultimately we should allow --target-image-opts + * to be used even when -n is not given. + * That has to wait for bdrv_create to be improved + * to allow filenames in option syntax + */ + out_blk =3D img_open_file(out_filename, out_fmt, + flags, writethrough, quiet); + } if (!out_blk) { ret =3D -1; goto out; } out_bs =3D blk_bs(out_blk); =20 + if (compress) { + if (!out_bs->drv->bdrv_co_pwritev_compressed) { + error_report("Compression not supported for this file format"); + ret =3D -1; + goto out; + } + } + /* increase bufsectors from the default 4096 (2M) if opt_transfer * or discard_alignment of the out_bs is greater. Limit to 32768 (16MB) * as maximum. */ diff --git a/qemu-img.texi b/qemu-img.texi index c81db3e..f9e3527 100644 --- a/qemu-img.texi +++ b/qemu-img.texi @@ -45,9 +45,17 @@ keys. =20 @item --image-opts =20 -Indicates that the @var{filename} parameter is to be interpreted as a +Indicates that the source @var{filename} parameter is to be interpreted as= a full option string, not a plain filename. This parameter is mutually -exclusive with the @var{-f} and @var{-F} parameters. +exclusive with the @var{-f} parameter. + +@item --target-image-opts + +Indicates that the @var{output_filename} parameter(s) are to be interprete= d as +a full option string, not a plain filename. This parameter is mutually +exclusive with the @var{-O} parameters. It is currently required to also u= se +the @var{-n} parameter to skip image creation. This restriction may be rel= axed +in a future release. =20 @item fmt is the disk image format. It is guessed automatically in most cases. See b= elow --=20 2.9.3 From nobody Fri May 3 17:47:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1493025662161316.8804382054383; Mon, 24 Apr 2017 02:21:02 -0700 (PDT) Received: from localhost ([::1]:42879 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2aB2-0005XJ-Rg for importer@patchew.org; Mon, 24 Apr 2017 05:21:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2a7j-00034s-B4 for qemu-devel@nongnu.org; Mon, 24 Apr 2017 05:17:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2a7i-0004JS-D9 for qemu-devel@nongnu.org; Mon, 24 Apr 2017 05:17:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58768) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2a7c-0004Fc-SO; Mon, 24 Apr 2017 05:17:29 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DC6E6C04B942; Mon, 24 Apr 2017 09:17:27 +0000 (UTC) Received: from t460.redhat.com (ovpn-117-237.ams2.redhat.com [10.36.117.237]) by smtp.corp.redhat.com (Postfix) with ESMTP id AF9627DFC3; Mon, 24 Apr 2017 09:17:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DC6E6C04B942 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=berrange@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com DC6E6C04B942 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 24 Apr 2017 10:16:59 +0100 Message-Id: <20170424091659.26708-5-berrange@redhat.com> In-Reply-To: <20170424091659.26708-1-berrange@redhat.com> References: <20170424091659.26708-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 24 Apr 2017 09:17:28 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v5 4/4] qemu-img: copy *key-secret opts when opening newly created files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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. Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrange Reviewed-by: Fam Zheng Reviewed-by: Max Reitz --- qemu-img.c | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 2344e64..cee28db 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -305,15 +305,17 @@ static BlockBackend *img_open_opts(const char *optstr, } =20 static BlockBackend *img_open_file(const char *filename, + QDict *options, const char *fmt, int flags, bool writethrough, bool quiet) { BlockBackend *blk; Error *local_err =3D NULL; - QDict *options =3D NULL; =20 if (fmt) { - options =3D qdict_new(); + if (!options) { + options =3D qdict_new(); + } qdict_put(options, "driver", qstring_from_str(fmt)); } =20 @@ -332,6 +334,33 @@ static BlockBackend *img_open_file(const char *filenam= e, } =20 =20 +static int img_add_key_secrets(void *opaque, + const char *name, const char *value, + Error **errp) +{ + QDict *options =3D 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 =3D NULL; + + options =3D qdict_new(); + qemu_opt_foreach(create_opts, img_add_key_secrets, options, &error_abo= rt); + + return img_open_file(filename, options, fmt, flags, writethrough, quie= t); +} + + static BlockBackend *img_open(bool image_opts, const char *filename, const char *fmt, int flags, bool writethroug= h, @@ -351,7 +380,7 @@ static BlockBackend *img_open(bool image_opts, } blk =3D img_open_opts(filename, opts, flags, writethrough, quiet); } else { - blk =3D img_open_file(filename, fmt, flags, writethrough, quiet); + blk =3D img_open_file(filename, NULL, fmt, flags, writethrough, qu= iet); } return blk; } @@ -2303,8 +2332,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 =3D img_open_file(out_filename, out_fmt, - flags, writethrough, quiet); + out_blk =3D img_open_new_file(out_filename, opts, out_fmt, + flags, writethrough, quiet); } if (!out_blk) { ret =3D -1; @@ -4353,7 +4382,7 @@ static int img_dd(int argc, char **argv) * with the bdrv_create() call above which does not * support image-opts style. */ - blk2 =3D img_open_file(out.filename, out_fmt, BDRV_O_RDWR, + blk2 =3D img_open_file(out.filename, NULL, out_fmt, BDRV_O_RDWR, false, false); =20 if (!blk2) { --=20 2.9.3