From nobody Mon Feb 9 07:38:58 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=1664872429; cv=none; d=zohomail.com; s=zohoarc; b=Iqpid9aPd5jnzSqZ+xIQSfcqVMif/mwjWsfocuObQFHoYQslZ3oHjz9mi8tsQGOjN4erTlNX9b6nplODXWObhs68XMmNLDIAzsLLiPRa921lHfflojJMuzJ3OUYw6XPFySOys/Ps09DHl+UFlQsP1VApZ96sk2kjXr2ACokPJS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664872429; 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=2ofLmMlXu77B6BNQ9k3XpXSVtprfWJmVJZkdgzn8r+s=; b=WkuuDbbIkQsemgXH8uy6aEFHinQ7LfA9bDy0yp3lz8vTC+bAGLGiJU8DczSVCTd6kPj1feG79PjuSHb5AQTsefts6jWh8qH0tK/CwlvcANjvAaucoJIjEeTvCMW7fsSFFOVvMAn+SIMLdBpvXRyusmhk5a4T3a91e0MzOlwFWXI= 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 1664872429189630.8380052130136; Tue, 4 Oct 2022 01:33:49 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-424-YV2BMSJYP6m86rcxPfCx1w-1; Tue, 04 Oct 2022 04:33:46 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9CEB2299E751; Tue, 4 Oct 2022 08:33:43 +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 8A3BE492B06; Tue, 4 Oct 2022 08:33:43 +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 658DE1947049; Tue, 4 Oct 2022 08:33:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7E27419465B5 for ; Tue, 4 Oct 2022 08:33:41 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4186D40C6EC3; Tue, 4 Oct 2022 08:33:41 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADCD540C6EC2 for ; Tue, 4 Oct 2022 08:33:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664872428; 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=2ofLmMlXu77B6BNQ9k3XpXSVtprfWJmVJZkdgzn8r+s=; b=boLouVjudRciIrR1qhf8r0/800OWAQkT7BB+FoTwFkQNueRZugyAF6JleZskR634JjYIjs NRU8fyaia4E1Q8HKBxqRCbUW81xOov3eiX/R8+dt3l0HC7H/jFmiNmq65aukSX5J9DUbav QDQkzTqnsZvqlxcwlhDDaDipzyu1wlA= X-MC-Unique: YV2BMSJYP6m86rcxPfCx1w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 24/43] conf: nwfilter: Remove virNWFilterDefParseNode Date: Tue, 4 Oct 2022 10:32:58 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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.10 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: 1664872431223100001 Content-Type: text/plain; charset="utf-8" Use virXMLParse to fetch the XML context and validate the top level XML element name so that virNWFilterDefParseNode is no longer needed. Signed-off-by: Peter Krempa --- src/conf/nwfilter_conf.c | 32 +++++--------------------------- src/conf/nwfilter_conf.h | 4 ---- 2 files changed, 5 insertions(+), 31 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 44ea056823..00728782d1 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2685,42 +2685,20 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) } -virNWFilterDef * -virNWFilterDefParseNode(xmlDocPtr xml, - xmlNodePtr root) -{ - g_autoptr(xmlXPathContext) ctxt =3D NULL; - - if (STRNEQ((const char *)root->name, "filter")) { - virReportError(VIR_ERR_XML_ERROR, - "%s", - _("unknown root element for nw filter")); - return NULL; - } - - if (!(ctxt =3D virXMLXPathContextNew(xml))) - return NULL; - - ctxt->node =3D root; - return virNWFilterDefParseXML(ctxt); -} - - static virNWFilterDef * virNWFilterDefParse(const char *xmlStr, const char *filename, unsigned int flags) { - virNWFilterDef *def =3D NULL; g_autoptr(xmlDoc) xml =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; bool validate =3D flags & VIR_NWFILTER_DEFINE_VALIDATE; - if ((xml =3D virXMLParse(filename, xmlStr, _("(nwfilter_definition)"), - NULL, NULL, "nwfilter.rng", validate))) { - def =3D virNWFilterDefParseNode(xml, xmlDocGetRootElement(xml)); - } + if (!(xml =3D virXMLParse(filename, xmlStr, _("(nwfilter_definition)"), + "filter", &ctxt, "nwfilter.rng", validate))) + return NULL; - return def; + return virNWFilterDefParseXML(ctxt); } diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index b67364714a..b8a970f00b 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -533,10 +533,6 @@ int virNWFilterDeleteDef(const char *configDir, virNWFilterDef *def); -virNWFilterDef * -virNWFilterDefParseNode(xmlDocPtr xml, - xmlNodePtr root); - char * virNWFilterDefFormat(const virNWFilterDef *def); --=20 2.37.3