From patchwork Tue May 2 14:18:58 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: 9708155 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 972C36021C for ; Tue, 2 May 2017 14:24:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 882BC20700 for ; Tue, 2 May 2017 14:24:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D11026E56; Tue, 2 May 2017 14:24:52 +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 2440E20700 for ; Tue, 2 May 2017 14:24:52 +0000 (UTC) Received: from localhost ([::1]:59242 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5YjT-0007zP-EA for patchwork-qemu-devel@patchwork.kernel.org; Tue, 02 May 2017 10:24:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45212) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5YeY-0004o6-Kr for qemu-devel@nongnu.org; Tue, 02 May 2017 10:19:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5YeX-0001bK-LV for qemu-devel@nongnu.org; Tue, 02 May 2017 10:19:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60922) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d5YeS-0001Zd-AO; Tue, 02 May 2017 10:19:40 -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 517EC1024DF; Tue, 2 May 2017 14:19:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 517EC1024DF Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=berrange@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 517EC1024DF Received: from t460.redhat.com (ovpn-117-189.ams2.redhat.com [10.36.117.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8FB818408; Tue, 2 May 2017 14:19:34 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Tue, 2 May 2017 15:18:58 +0100 Message-Id: <20170502141858.24805-6-berrange@redhat.com> In-Reply-To: <20170502141858.24805-1-berrange@redhat.com> References: <20170502141858.24805-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.26]); Tue, 02 May 2017 14:19:39 +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 v6 5/5] Revert "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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit 37d7772f6b81613620a333862dc67e34b2fda1a9. --- qemu-img.c | 41 ++++++----------------------------------- 1 file changed, 6 insertions(+), 35 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index cbf05b4..94c8cea 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -305,17 +305,15 @@ static BlockBackend *img_open_opts(const char *optstr, } static BlockBackend *img_open_file(const char *filename, - QDict *options, const char *fmt, int flags, bool writethrough, bool quiet) { BlockBackend *blk; Error *local_err = NULL; + QDict *options = NULL; if (fmt) { - if (!options) { - options = qdict_new(); - } + options = qdict_new(); qdict_put(options, "driver", qstring_from_str(fmt)); } @@ -334,33 +332,6 @@ 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")) { - 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 = NULL; - - options = qdict_new(); - qemu_opt_foreach(create_opts, img_add_key_secrets, options, &error_abort); - - return img_open_file(filename, options, fmt, flags, writethrough, quiet); -} - - static BlockBackend *img_open(bool image_opts, const char *filename, const char *fmt, int flags, bool writethrough, @@ -380,7 +351,7 @@ static BlockBackend *img_open(bool image_opts, } blk = img_open_opts(filename, opts, flags, writethrough, quiet); } else { - blk = img_open_file(filename, NULL, fmt, flags, writethrough, quiet); + blk = img_open_file(filename, fmt, flags, writethrough, quiet); } return blk; } @@ -2285,8 +2256,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 */ - s.target = img_open_new_file(out_filename, opts, out_fmt, - flags, writethrough, quiet); + s.target = img_open_file(out_filename, out_fmt, flags, + writethrough, quiet); } if (!s.target) { ret = -1; @@ -4298,7 +4269,7 @@ static int img_dd(int argc, char **argv) * with the bdrv_create() call above which does not * support image-opts style. */ - blk2 = img_open_file(out.filename, NULL, out_fmt, BDRV_O_RDWR, + blk2 = img_open_file(out.filename, out_fmt, BDRV_O_RDWR, false, false); if (!blk2) {