From nobody Wed May 14 16:44:13 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 1520346490872668.5070555796656; Tue, 6 Mar 2018 06:28:10 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8394B7655E; Tue, 6 Mar 2018 14:28:09 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2113260176; 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 86F3E181A87E; 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 w26ES2Nn023093 for ; Tue, 6 Mar 2018 09:28:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5B5F8200AE93; Tue, 6 Mar 2018 14:28:02 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA3692024CAD; Tue, 6 Mar 2018 14:28:01 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 6 Mar 2018 15:27:15 +0100 Message-Id: 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 6/6] conf: Replace virDomainDiskSourceEncryptionParse 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.11 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:10 +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 | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f5bc6148a2..c8d756c45d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8540,30 +8540,6 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, } -static int -virDomainDiskSourceEncryptionParse(xmlNodePtr node, - virStorageEncryptionPtr *encryptionsrc, - xmlXPathContextPtr ctxt) -{ - xmlNodePtr child; - virStorageEncryptionPtr encryption =3D NULL; - - for (child =3D node->children; child; child =3D child->next) { - if (child->type =3D=3D XML_ELEMENT_NODE && - virXMLNodeNameEqual(child, "encryption")) { - - if (!(encryption =3D virStorageEncryptionParseNode(child, ctxt= ))) - return -1; - - *encryptionsrc =3D encryption; - return 0; - } - } - - return 0; -} - - static int virDomainDiskSourcePrivateDataParse(xmlXPathContextPtr ctxt, virStorageSourcePtr src, @@ -8638,7 +8614,8 @@ virDomainDiskSourceParse(xmlNodePtr node, !(src->auth =3D virStorageAuthDefParse(tmp, ctxt))) goto cleanup; - if (virDomainDiskSourceEncryptionParse(node, &src->encryption, ctxt) <= 0) + if ((tmp =3D virXPathNode("./encryption", ctxt)) && + !(src->encryption =3D virStorageEncryptionParseNode(tmp, ctxt))) goto cleanup; if (virDomainDiskSourcePrivateDataParse(ctxt, src, flags, xmlopt) < 0) --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list