From nobody Mon Feb 9 01:48:29 2026 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 1551200907400480.5697355811395; Tue, 26 Feb 2019 09:08:27 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 99FC6A82C; Tue, 26 Feb 2019 17:08:25 +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 6961A67667; Tue, 26 Feb 2019 17:08:25 +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 021FA181A00A; Tue, 26 Feb 2019 17:08:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1QH8LA0029501 for ; Tue, 26 Feb 2019 12:08:21 -0500 Received: by smtp.corp.redhat.com (Postfix) id A088A5D71F; Tue, 26 Feb 2019 17:08:21 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF7B65D6B3; Tue, 26 Feb 2019 17:08:20 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 26 Feb 2019 18:08:11 +0100 Message-Id: <5c70d6a5a162c3de519340b21d0352cf967ab8a5.1551200849.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 4/5] util: XML: Introduce automatic reset of XPath's current node 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: , 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 26 Feb 2019 17:08:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Quite a few parts modify the XPath context current node to shif the scope and allow easier queries. This also means that the node needs to be restored afterwards. Introduce a macro based on 'VIR_AUTOCLEAN' which adds a local structure on the stack remembering the original node along with a function which will make sure that the node is reset when the local structure leaves scope. Signed-off-by: Peter Krempa --- src/libvirt_private.syms | 1 + src/util/virxml.c | 10 ++++++++++ src/util/virxml.h | 22 ++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 038a744981..ee5d9957b0 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3246,6 +3246,7 @@ virXMLValidatorFree; virXMLValidatorInit; virXMLValidatorValidate; virXPathBoolean; +virXPathContextNodeRestore; virXPathInt; virXPathLong; virXPathLongHex; diff --git a/src/util/virxml.c b/src/util/virxml.c index 8eb201fddf..f55b9a362c 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1398,3 +1398,13 @@ virXMLFormatElement(virBufferPtr buf, virBufferFreeAndReset(childBuf); return ret; } + + +void +virXPathContextNodeRestore(virXPathContextNodeSavePtr save) +{ + if (!save->ctxt) + return; + + save->ctxt->node =3D save->node; +} diff --git a/src/util/virxml.h b/src/util/virxml.h index 23a4da1b7e..1bd2c0e518 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -219,4 +219,26 @@ virXMLFormatElement(virBufferPtr buf, virBufferPtr attrBuf, virBufferPtr childBuf); +struct _virXPathContextNodeSave { + xmlXPathContextPtr ctxt; + xmlNodePtr node; +}; +typedef struct _virXPathContextNodeSave virXPathContextNodeSave; +typedef virXPathContextNodeSave *virXPathContextNodeSavePtr; + +void +virXPathContextNodeRestore(virXPathContextNodeSavePtr save); + +VIR_DEFINE_AUTOCLEAN_FUNC(virXPathContextNodeSave, virXPathContextNodeRest= ore); + +/** + * VIR_XPATH_NODE_AUTORESTORE: + * @ctxt: XML XPath context pointer + * + * This macro ensures that when the scope where it's used ends @ctxt's cur= rent + * node pointer is reset to the original value when this macro was used. + */ +# define VIR_XPATH_NODE_AUTORESTORE(ctxt) \ + VIR_AUTOCLEAN(virXPathContextNodeSave) ctxt ## CtxtSave =3D {(ctxt), (= ctxt)->node} + #endif /* LIBVIRT_VIRXML_H */ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list