From nobody Sun Feb 8 18:30:16 2026 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: 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