From nobody Mon Apr 29 09:28:43 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 1487605081270392.3803283498869; Mon, 20 Feb 2017 07:38:01 -0800 (PST) Received: from localhost ([::1]:39254 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cfq2I-0007kY-0L for importer@patchew.org; Mon, 20 Feb 2017 10:37:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cfpkW-0008Eo-6K for qemu-devel@nongnu.org; Mon, 20 Feb 2017 10:19:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cfpkV-0007EV-C2 for qemu-devel@nongnu.org; Mon, 20 Feb 2017 10:19:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43324) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cfpkT-0007Dc-5g; Mon, 20 Feb 2017 10:19:33 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5BFEC8124D; Mon, 20 Feb 2017 15:19:33 +0000 (UTC) Received: from t460.redhat.com (ovpn-116-165.ams2.redhat.com [10.36.116.165]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1KFJQ5v016477; Mon, 20 Feb 2017 10:19:30 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 20 Feb 2017 15:19:18 +0000 Message-Id: <20170220151921.22842-2-berrange@redhat.com> In-Reply-To: <20170220151921.22842-1-berrange@redhat.com> References: <20170220151921.22842-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 20 Feb 2017 15:19:33 +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 v3 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: Eric Blake Signed-off-by: Daniel P. Berrange --- qemu-img.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/qemu-img.c b/qemu-img.c index cff22e3..739345e 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -3951,6 +3951,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 } }; @@ -3973,6 +3974,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; @@ -4017,6 +4027,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 Mon Apr 29 09:28:43 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 1487605258109687.2350946540907; Mon, 20 Feb 2017 07:40:58 -0800 (PST) Received: from localhost ([::1]:39270 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cfq59-0001qH-HW for importer@patchew.org; Mon, 20 Feb 2017 10:40:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cfpkY-0008GQ-Mi for qemu-devel@nongnu.org; Mon, 20 Feb 2017 10:19:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cfpkX-0007FE-Rt for qemu-devel@nongnu.org; Mon, 20 Feb 2017 10:19:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37048) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cfpkV-0007EP-Pb; Mon, 20 Feb 2017 10:19:35 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 88680624CB; Mon, 20 Feb 2017 15:19:35 +0000 (UTC) Received: from t460.redhat.com (ovpn-116-165.ams2.redhat.com [10.36.116.165]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1KFJQ5w016477; Mon, 20 Feb 2017 10:19:33 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 20 Feb 2017 15:19:19 +0000 Message-Id: <20170220151921.22842-3-berrange@redhat.com> In-Reply-To: <20170220151921.22842-1-berrange@redhat.com> References: <20170220151921.22842-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 20 Feb 2017 15:19:35 +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 v3 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 --- qemu-img.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 739345e..d8a737f 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -4102,8 +4102,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 Mon Apr 29 09:28:43 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 148760534917982.2451298902655; Mon, 20 Feb 2017 07:42:29 -0800 (PST) Received: from localhost ([::1]:39290 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cfq6a-0003Ej-Mh for importer@patchew.org; Mon, 20 Feb 2017 10:42:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cfpkf-0008Ma-4n for qemu-devel@nongnu.org; Mon, 20 Feb 2017 10:19:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cfpkd-0007Gw-Nm for qemu-devel@nongnu.org; Mon, 20 Feb 2017 10:19:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58054) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cfpkY-0007FB-AP; Mon, 20 Feb 2017 10:19:38 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 86A243D94F; Mon, 20 Feb 2017 15:19:38 +0000 (UTC) Received: from t460.redhat.com (ovpn-116-165.ams2.redhat.com [10.36.116.165]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1KFJQ5x016477; Mon, 20 Feb 2017 10:19:35 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 20 Feb 2017 15:19:20 +0000 Message-Id: <20170220151921.22842-4-berrange@redhat.com> In-Reply-To: <20170220151921.22842-1-berrange@redhat.com> References: <20170220151921.22842-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 20 Feb 2017 15:19:38 +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 v3 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. Signed-off-by: Daniel P. Berrange Reviewed-by: Eric Blake --- qemu-img-cmds.hx | 4 +-- qemu-img.c | 84 +++++++++++++++++++++++++++++++++++++++-------------= ---- qemu-img.texi | 12 ++++++-- 3 files changed, 71 insertions(+), 29 deletions(-) diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx index f054599..f838e58 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] filename [filename2 [...]] ou= tput_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] filenam= e [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}] @var{filename} [@var{filename2} [...]] @var{outpu= t_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}] @var{filename} [@var{filena= me2} [...]] @var{output_filename} ETEXI =20 DEF("dd", img_dd, diff --git a/qemu-img.c b/qemu-img.c index d8a737f..e48e676 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 { @@ -1765,7 +1766,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; @@ -1783,9 +1784,10 @@ static int img_convert(int argc, char **argv) QemuOpts *sn_opts =3D NULL; ImgConvertState state; bool image_opts =3D false; + 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; @@ -1796,6 +1798,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:qn", @@ -1900,15 +1903,27 @@ 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)) { goto fail_getopt; } =20 + if (tgt_image_opts && !skip_create) { + error_report("--target-image-opts requires use of -n flag"); + goto fail_getopt; + } + /* Initialize before goto out */ if (quiet) { progress =3D 0; @@ -1919,8 +1934,13 @@ 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"); + goto fail_getopt; + } } =20 if (bs_n < 1) { @@ -1987,22 +2007,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); @@ -2051,7 +2071,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; @@ -2091,18 +2111,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 174aae3..d525e3a 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 target @var{filename} parameter(s) are to be interprete= d a +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 Mon Apr 29 09:28:43 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 1487605522919728.2671557493899; Mon, 20 Feb 2017 07:45:22 -0800 (PST) Received: from localhost ([::1]:39302 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cfq9R-0005zd-Nf for importer@patchew.org; Mon, 20 Feb 2017 10:45:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34877) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cfpkf-0008NW-UJ for qemu-devel@nongnu.org; Mon, 20 Feb 2017 10:19:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cfpke-0007H8-Pa for qemu-devel@nongnu.org; Mon, 20 Feb 2017 10:19:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43354) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cfpkb-0007G2-H8; Mon, 20 Feb 2017 10:19:41 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AFAC7C05681A; Mon, 20 Feb 2017 15:19:41 +0000 (UTC) Received: from t460.redhat.com (ovpn-116-165.ams2.redhat.com [10.36.116.165]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1KFJQ60016477; Mon, 20 Feb 2017 10:19:39 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 20 Feb 2017 15:19:21 +0000 Message-Id: <20170220151921.22842-5-berrange@redhat.com> In-Reply-To: <20170220151921.22842-1-berrange@redhat.com> References: <20170220151921.22842-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 20 Feb 2017 15:19:41 +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 v3 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. Signed-off-by: Daniel P. Berrange --- 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 *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) +{ + BlockBackend *blk; + Error *local_err =3D NULL; + QDict *options =3D NULL; + + options =3D qdict_new(); + if (fmt) { + qdict_put(options, "driver", qstring_from_str(fmt)); + } + + qemu_opt_foreach(create_opts, img_add_key_secrets, options, NULL); + + blk =3D 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 writethroug= h, @@ -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 =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; --=20 2.9.3