From nobody Mon Feb 9 12:10:33 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 1490691510018534.168475053005; Tue, 28 Mar 2017 01:58:30 -0700 (PDT) Received: from localhost ([::1]:51686 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csmxQ-0001na-QG for importer@patchew.org; Tue, 28 Mar 2017 04:58:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csmvJ-0000BX-KK for qemu-devel@nongnu.org; Tue, 28 Mar 2017 04:56:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1csmvI-0008Lv-DA for qemu-devel@nongnu.org; Tue, 28 Mar 2017 04:56:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35134) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1csmvF-0008Ic-41; Tue, 28 Mar 2017 04:56:13 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 116C47AE85; Tue, 28 Mar 2017 08:56:12 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C67F594D3F; Tue, 28 Mar 2017 08:56:11 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3D43011385FD; Tue, 28 Mar 2017 10:56:08 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 116C47AE85 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=armbru@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 116C47AE85 From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 28 Mar 2017 10:56:05 +0200 Message-Id: <1490691368-32099-8-git-send-email-armbru@redhat.com> In-Reply-To: <1490691368-32099-1-git-send-email-armbru@redhat.com> References: <1490691368-32099-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 28 Mar 2017 08:56:12 +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 v4 for-2.9 07/10] rbd: Clean up qemu_rbd_create()'s detour through QemuOpts 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: kwolf@redhat.com, jdurgin@redhat.com, qemu-block@nongnu.org, jcody@redhat.com, mreitz@redhat.com 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 conversion from QDict to QemuOpts is pointless. Simply get the stuff straight from the QDict. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Kevin Wolf Reviewed-by: Jeff Cody --- block/rbd.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index b2afe07..16ea60a 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -376,7 +376,6 @@ static int qemu_rbd_create(const char *filename, QemuOp= ts *opts, Error **errp) rados_t cluster; rados_ioctx_t io_ctx; QDict *options =3D NULL; - QemuOpts *rbd_opts =3D NULL; int ret =3D 0; =20 secretid =3D qemu_opt_get(opts, "password-secret"); @@ -407,19 +406,11 @@ static int qemu_rbd_create(const char *filename, Qemu= Opts *opts, Error **errp) goto exit; } =20 - rbd_opts =3D qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); - qemu_opts_absorb_qdict(rbd_opts, options, &local_err); - if (local_err) { - error_propagate(errp, local_err); - ret =3D -EINVAL; - goto exit; - } - - pool =3D qemu_opt_get(rbd_opts, "pool"); - conf =3D qemu_opt_get(rbd_opts, "conf"); - clientname =3D qemu_opt_get(rbd_opts, "user"); - name =3D qemu_opt_get(rbd_opts, "image"); - keypairs =3D qemu_opt_get(rbd_opts, "=3Dkeyvalue-pairs"); + pool =3D qdict_get_try_str(options, "pool"); + conf =3D qdict_get_try_str(options, "conf"); + clientname =3D qdict_get_try_str(options, "user"); + name =3D qdict_get_try_str(options, "image"); + keypairs =3D qdict_get_try_str(options, "=3Dkeyvalue-pairs"); =20 ret =3D rados_create(&cluster, clientname); if (ret < 0) { @@ -470,7 +461,6 @@ shutdown: =20 exit: QDECREF(options); - qemu_opts_del(rbd_opts); return ret; } =20 --=20 2.7.4