From nobody Mon Feb 9 19:06:39 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1707832637858148.56350499291386; Tue, 13 Feb 2024 05:57:17 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9135D1A8E; Tue, 13 Feb 2024 08:57:16 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 70F9A1A52; Tue, 13 Feb 2024 08:52:22 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 51A3D18F7; Tue, 13 Feb 2024 08:51:53 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 9D6DF19D5 for ; Tue, 13 Feb 2024 08:51:52 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-692-1wJZxBbuMOq72svJu7HYBQ-1; Tue, 13 Feb 2024 08:51:50 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 059FA86794A for ; Tue, 13 Feb 2024 13:51:50 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FA8EC185C1 for ; Tue, 13 Feb 2024 13:51:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: 1wJZxBbuMOq72svJu7HYBQ-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 2/4] secret_conf: Simplify calling of virSecretDefParseUsage() Date: Tue, 13 Feb 2024 14:51:28 +0100 Message-ID: <4438bfe3fa8da8d937f5a65b86c63cb786186d6c.1707832214.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: 2KLKBOQYG2ZJ2BJBMWM4UQCLLRFKCBYH X-Message-ID-Hash: 2KLKBOQYG2ZJ2BJBMWM4UQCLLRFKCBYH X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1707832639800100001 The virSecretDefParseUsage() function is called conditionally. Call it unconditionally and keep pointer to the node as it'll come handy soon. Signed-off-by: Michal Privoznik --- src/conf/secret_conf.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 7463185eb1..d8ce772d3b 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -49,10 +49,17 @@ static int virSecretDefParseUsage(xmlXPathContextPtr ctxt, virSecretDef *def) { + xmlNodePtr node =3D NULL; + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *type_str =3D NULL; int type; =20 - type_str =3D virXPathString("string(./usage/@type)", ctxt); + if (!(node =3D virXPathNode("./usage", ctxt))) + return 0; + + ctxt->node =3D node; + + type_str =3D virXMLPropString(node, "type"); if (type_str =3D=3D NULL) { virReportError(VIR_ERR_XML_ERROR, "%s", _("unknown secret usage type")); @@ -70,7 +77,7 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt, break; =20 case VIR_SECRET_USAGE_TYPE_VOLUME: - def->usage_id =3D virXPathString("string(./usage/volume)", ctxt); + def->usage_id =3D virXPathString("string(./volume)", ctxt); if (!def->usage_id) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("volume usage specified, but volume path is m= issing")); @@ -79,7 +86,7 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt, break; =20 case VIR_SECRET_USAGE_TYPE_CEPH: - def->usage_id =3D virXPathString("string(./usage/name)", ctxt); + def->usage_id =3D virXPathString("string(./name)", ctxt); if (!def->usage_id) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Ceph usage specified, but name is missing")); @@ -88,7 +95,7 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt, break; =20 case VIR_SECRET_USAGE_TYPE_ISCSI: - def->usage_id =3D virXPathString("string(./usage/target)", ctxt); + def->usage_id =3D virXPathString("string(./target)", ctxt); if (!def->usage_id) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("iSCSI usage specified, but target is missing= ")); @@ -97,7 +104,7 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt, break; =20 case VIR_SECRET_USAGE_TYPE_TLS: - def->usage_id =3D virXPathString("string(./usage/name)", ctxt); + def->usage_id =3D virXPathString("string(./name)", ctxt); if (!def->usage_id) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("TLS usage specified, but name is missing")); @@ -106,7 +113,7 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt, break; =20 case VIR_SECRET_USAGE_TYPE_VTPM: - def->usage_id =3D virXPathString("string(./usage/name)", ctxt); + def->usage_id =3D virXPathString("string(./name)", ctxt); if (!def->usage_id) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("vTPM usage specified, but name is missing")); @@ -166,8 +173,8 @@ virSecretParseXML(xmlXPathContext *ctxt) } =20 def->description =3D virXPathString("string(./description)", ctxt); - if (virXPathNode("./usage", ctxt) !=3D NULL - && virSecretDefParseUsage(ctxt, def) < 0) + + if (virSecretDefParseUsage(ctxt, def) < 0) return NULL; =20 return g_steal_pointer(&def); --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org