From nobody Wed May 14 20:54:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 152034649213224.797626660235096; Tue, 6 Mar 2018 06:28:12 -0800 (PST) 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 F0CD8757D9; Tue, 6 Mar 2018 14:28:09 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 883B361F55; Tue, 6 Mar 2018 14:28:09 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id ED75B4A475; Tue, 6 Mar 2018 14:28:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w26ES05O023066 for ; Tue, 6 Mar 2018 09:28:00 -0500 Received: by smtp.corp.redhat.com (Postfix) id 359982024CAE; Tue, 6 Mar 2018 14:28:00 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id B45A12024CAB; Tue, 6 Mar 2018 14:27:59 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 6 Mar 2018 15:27:12 +0100 Message-Id: <7463c79e81846344a58a101d3a0d60485b3d199b.1520346349.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 3/6] conf: Replace virDomainDiskSourceAuthParse by an XPath query X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@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, 06 Mar 2018 14:28:11 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Remove the rather bulky function in favor of an XPath query. Signed-off-by: Peter Krempa --- src/conf/domain_conf.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a8be0db7e4..31b2590a13 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8540,30 +8540,6 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, } -static int -virDomainDiskSourceAuthParse(xmlNodePtr node, - virStorageAuthDefPtr *authdefsrc, - xmlXPathContextPtr ctxt) -{ - xmlNodePtr child; - virStorageAuthDefPtr authdef; - - for (child =3D node->children; child; child =3D child->next) { - if (child->type =3D=3D XML_ELEMENT_NODE && - virXMLNodeNameEqual(child, "auth")) { - - if (!(authdef =3D virStorageAuthDefParse(child, ctxt))) - return -1; - - *authdefsrc =3D authdef; - return 0; - } - } - - return 0; -} - - static int virDomainDiskSourceEncryptionParse(xmlNodePtr node, virStorageEncryptionPtr *encryptionsrc) @@ -8627,6 +8603,7 @@ virDomainDiskSourceParse(xmlNodePtr node, { int ret =3D -1; xmlNodePtr saveNode =3D ctxt->node; + xmlNodePtr tmp; ctxt->node =3D node; @@ -8656,7 +8633,8 @@ virDomainDiskSourceParse(xmlNodePtr node, goto cleanup; } - if (virDomainDiskSourceAuthParse(node, &src->auth, ctxt) < 0) + if ((tmp =3D virXPathNode("./auth", ctxt)) && + !(src->auth =3D virStorageAuthDefParse(tmp, ctxt))) goto cleanup; if (virDomainDiskSourceEncryptionParse(node, &src->encryption) < 0) --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list