From nobody Mon Feb 9 08:30:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677767945; cv=none; d=zohomail.com; s=zohoarc; b=mp/lgPbF4T2eSV9+RuRjIlBfUnknh5E3quBNsX1KP+6U3Jdto+uZvOxd/hatcZvLU6FQDwWouWCbM/O8kgEnm9B+/jZLeZ7I0KJIV0LViNHAVGNOUUYHb9MFFMvGvjZ5B5wnuoCQfFN7+py7pGJzvPGFg94eckp2PSsEojQwlx4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677767945; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Y+U3NIC+oOIItq+xR7l91rFis5RIUAupC0KAswMKjOw=; b=Q0vFxHcvmlC1zQxi6yfLj+3NUO/CJ9mkYnfZeok4uDNuWVtmPNLX+KUgR2rQuZ7gbLHRB5N5iSwoVRltSvPhPCyr+UsE2LAoSNx+3RscvjCP8/LzWW/1bkgPBXhq/ZnF4Q8/o/6kjhtmWjJbgOFeNV91Kw+QdxtF9cvwjQCvCi4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1677767945906875.023131897813; Thu, 2 Mar 2023 06:39:05 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-46-mqfKDR7oPL-KOfYAhC8akQ-1; Thu, 02 Mar 2023 09:38:59 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6CF1D824040; Thu, 2 Mar 2023 14:38:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 57CB02166B2E; Thu, 2 Mar 2023 14:38:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3B68A194866E; Thu, 2 Mar 2023 14:38:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 036FD19452CD for ; Thu, 2 Mar 2023 14:38:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CBCD81454528; Thu, 2 Mar 2023 14:38:25 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8381B140EBF6 for ; Thu, 2 Mar 2023 14:38:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677767944; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Y+U3NIC+oOIItq+xR7l91rFis5RIUAupC0KAswMKjOw=; b=AsyM7G4BN4AFZuW6eqhZEIflUxPF0U7To2ifDxJhf4K7w/P1ExsE+bXUvvluEz5kKOqndg HbkavT4rA0pNtn1Ih1dyOaYw1vjNCngVcxY+GPHvmQnmwTKxBQ3FHWfC/9pSkJH7X3hRds la6s69lrAXIHClO46Y/fQ5Td1xrKDXg= X-MC-Unique: mqfKDR7oPL-KOfYAhC8akQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH RFC 17/21] util: xml: Introduce virXMLNodeGetSubelement Date: Thu, 2 Mar 2023 15:37:59 +0100 Message-Id: <059cdad196c6691bd0436c26c4562b632f8c22eb.1677767499.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677767947481100007 Content-Type: text/plain; charset="utf-8" The new helper is similar to virXPathNode list but for cases where we want to get subelements directly rather than using XPath. Signed-off-by: Peter Krempa --- src/libvirt_private.syms | 1 + src/util/virxml.c | 29 +++++++++++++++++++++++++++++ src/util/virxml.h | 4 ++++ 3 files changed, 34 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index f1bed27ba7..951b3691cf 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3691,6 +3691,7 @@ virXMLFormatMetadata; virXMLNewNode; virXMLNodeContentString; virXMLNodeGetSubelement; +virXMLNodeGetSubelementList; virXMLNodeNameEqual; virXMLNodeSanitizeNamespaces; virXMLNodeToString; diff --git a/src/util/virxml.c b/src/util/virxml.c index 9b6ccfd6c9..7c853a591a 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -872,6 +872,35 @@ virXMLNodeGetSubelement(xmlNodePtr node, } +/** + * virXMLNodeGetSubelementList: + * @node: node to get subelement of + * @name: name of subelement to fetch (NULL to fetch all sub-elements) + * + * Find and return a sub-elements node of @node named @name in a GPtrArray + * populated with the xmlNodePtr objects. Caller is responsible for freein= g the + * array but not the contained xmlNode objects. + */ +GPtrArray * +virXMLNodeGetSubelementList(xmlNodePtr node, + const char *name) +{ + GPtrArray *ret =3D g_ptr_array_new(); + xmlNodePtr n; + + for (n =3D node->children; n; n =3D n->next) { + if (n->type =3D=3D XML_ELEMENT_NODE) { + if (name && !virXMLNodeNameEqual(n, name)) + continue; + + g_ptr_array_add(ret, n); + } + } + + return ret; +} + + /** * virXPathNode: * @xpath: the XPath string to evaluate diff --git a/src/util/virxml.h b/src/util/virxml.h index d5b998263c..46a4550788 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -77,6 +77,10 @@ xmlNodePtr virXMLNodeGetSubelement(xmlNodePtr node, const char *name); +GPtrArray * +virXMLNodeGetSubelementList(xmlNodePtr node, + const char *name); + xmlNodePtr virXPathNode(const char *xpath, xmlXPathContextPtr ctxt); --=20 2.39.2