From patchwork Thu Jan 26 11:04:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 9538877 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B05B3604A0 for ; Thu, 26 Jan 2017 11:05:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E5E228178 for ; Thu, 26 Jan 2017 11:05:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93414281C3; Thu, 26 Jan 2017 11:05:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9497E28178 for ; Thu, 26 Jan 2017 11:05:35 +0000 (UTC) Received: from localhost ([::1]:37603 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cWhry-0008DZ-MO for patchwork-qemu-devel@patchwork.kernel.org; Thu, 26 Jan 2017 06:05:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cWhrT-0008BK-AA for qemu-devel@nongnu.org; Thu, 26 Jan 2017 06:05:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cWhrS-0003ne-EC for qemu-devel@nongnu.org; Thu, 26 Jan 2017 06:05:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56094) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cWhrO-0003lC-E4; Thu, 26 Jan 2017 06:04:58 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (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 94E724ACBF; Thu, 26 Jan 2017 11:04:58 +0000 (UTC) Received: from t460.redhat.com (ovpn-117-50.ams2.redhat.com [10.36.117.50]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v0QB4cPY021575; Thu, 26 Jan 2017 06:04:55 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Thu, 26 Jan 2017 11:04:35 +0000 Message-Id: <20170126110435.2777-7-berrange@redhat.com> In-Reply-To: <20170126110435.2777-1-berrange@redhat.com> References: <20170126110435.2777-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 26 Jan 2017 11:04:58 +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 v1 6/6] 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 , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 newlky created file. Signed-off-by: Daniel P. Berrange --- qemu-img.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index a751781..130cec7 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -317,6 +317,49 @@ static BlockBackend *img_open_file(const char *filename, } +static int img_add_key_secrets(void *opaque, + const char *name, const char *value, + Error **errp) +{ + QDict **options = opaque; + + if (g_str_has_suffix(name, "key-secret")) { + if (!*options) { + *options = qdict_new(); + } + 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 = NULL; + QDict *options = NULL; + + if (fmt) { + options = qdict_new(); + qdict_put(options, "driver", qstring_from_str(fmt)); + } + + qemu_opt_foreach(create_opts, img_add_key_secrets, &options, NULL); + + blk = 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 writethrough, @@ -2113,8 +2156,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 = img_open_file(out_filename, out_fmt, - flags, writethrough, quiet); + out_blk = img_open_new_file(out_filename, opts, out_fmt, + flags, writethrough, quiet); } if (!out_blk) { ret = -1; @@ -4179,8 +4222,8 @@ static int img_dd(int argc, char **argv) * That has to wait for bdrv_create to be improved * to allow filenames in option syntax */ - blk2 = img_open_file(out.filename, out_fmt, - BDRV_O_RDWR, false, false); + blk2 = img_open_new_file(out.filename, opts, out_fmt, + BDRV_O_RDWR, false, false); } if (!blk2) {