From nobody Sun Feb 8 20:58:18 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 ARC-Seal: i=1; a=rsa-sha256; t=1566342965; cv=none; d=zoho.com; s=zohoarc; b=euUMzgxkCtvQtuEpCJfQNjB3ImHmhtkQS4J7aPccqKnvPRzZgRgKI+L6EAxhIPvzHuJj6dgTsDyIO3H6xf/a2lX0Z841rHzppEKZDDueV4srgqFzI1gPmVZEQd2HkHVKk94cdJE6jEMXM0FJzPsoTlkjNugsGN9Oly5PX9V1kZg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566342965; 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:ARC-Authentication-Results; bh=tfiNFP47WBt8Zxz5HoQEBIcUShT/3ml3RZjHKVq41kE=; b=XUfNswdekFrr2zo99uhY3Dl6+oF8WoRThFyQv+pbou6BpDMj9rCFQyIiRwT3sZ0YIR47DydIC8IACXKwudTOU0FChVOcWKi5+LBtHq1P4O6CW/iMKOre7FkszljedWBVwozpZ3jE2aZhIQTXzjkbjAf4wBmSjRjbhyNXsnqhjAM= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 156634296575123.392239954040065; Tue, 20 Aug 2019 16:16:05 -0700 (PDT) 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 8636110F23F2; Tue, 20 Aug 2019 23:16:04 +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 5E8195B82F; Tue, 20 Aug 2019 23:16:04 +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 133FC2551F; Tue, 20 Aug 2019 23:16:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KNFrPe013593 for ; Tue, 20 Aug 2019 19:15:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id C185B60605; Tue, 20 Aug 2019 23:15:53 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4AA592C8DC for ; Tue, 20 Aug 2019 23:15:53 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Wed, 21 Aug 2019 01:15:28 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 06/21] conf: network: use generic XML namespace types 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-Type: text/plain; charset="utf-8" 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.6.2 (mx1.redhat.com [10.5.110.66]); Tue, 20 Aug 2019 23:16:05 +0000 (UTC) There is no need to copy and paste the same types pointing to void all over the place. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Jiri Denemark --- src/conf/network_conf.c | 2 +- src/conf/network_conf.h | 25 ++++--------------------- src/network/bridge_driver.c | 2 +- src/network/bridge_driver.h | 2 +- 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index f55b9e5409..2c3a11fb10 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -93,7 +93,7 @@ virNetworkXMLOnceInit(void) VIR_ONCE_GLOBAL_INIT(virNetworkXML); =20 virNetworkXMLOptionPtr -virNetworkXMLOptionNew(virNetworkXMLNamespacePtr xmlns) +virNetworkXMLOptionNew(virXMLNamespacePtr xmlns) { virNetworkXMLOptionPtr xmlopt; =20 diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index b167b57e85..d5dd8480db 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -23,10 +23,6 @@ =20 #define DNS_RECORD_LENGTH_SRV (512 - 30) /* Limit minus overhead as ment= ioned in RFC-2782 */ =20 -#include -#include -#include - #include "internal.h" #include "virthread.h" #include "virsocketaddr.h" @@ -40,25 +36,12 @@ #include "virobject.h" #include "virmacmap.h" #include "virenum.h" - -typedef int (*virNetworkDefNamespaceParse)(xmlXPathContextPtr, void **); -typedef void (*virNetworkDefNamespaceFree)(void *); -typedef int (*virNetworkDefNamespaceXMLFormat)(virBufferPtr, void *); -typedef const char *(*virNetworkDefNamespaceHref)(void); - -typedef struct _virNetworkXMLNamespace virNetworkXMLNamespace; -typedef virNetworkXMLNamespace *virNetworkXMLNamespacePtr; -struct _virNetworkXMLNamespace { - virNetworkDefNamespaceParse parse; - virNetworkDefNamespaceFree free; - virNetworkDefNamespaceXMLFormat format; - virNetworkDefNamespaceHref href; -}; +#include "virxml.h" =20 struct _virNetworkXMLOption { virObject parent; =20 - virNetworkXMLNamespace ns; + virXMLNamespace ns; }; typedef struct _virNetworkXMLOption virNetworkXMLOption; typedef virNetworkXMLOption *virNetworkXMLOptionPtr; @@ -295,7 +278,7 @@ struct _virNetworkDef { =20 /* Network specific XML namespace data */ void *namespaceData; - virNetworkXMLNamespace ns; + virXMLNamespace ns; }; =20 typedef enum { @@ -317,7 +300,7 @@ enum { }; =20 virNetworkXMLOptionPtr -virNetworkXMLOptionNew(virNetworkXMLNamespacePtr xmlns); +virNetworkXMLOptionNew(virXMLNamespacePtr xmlns); =20 virNetworkDefPtr virNetworkDefCopy(virNetworkDefPtr def, diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 9059296e55..b34b742bfa 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -248,7 +248,7 @@ networkDnsmasqDefNamespaceHref(void) } =20 =20 -virNetworkXMLNamespace networkDnsmasqXMLNamespace =3D { +virXMLNamespace networkDnsmasqXMLNamespace =3D { .parse =3D networkDnsmasqDefNamespaceParse, .free =3D networkDnsmasqDefNamespaceFree, .format =3D networkDnsmasqDefNamespaceFormatXML, diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index b095388a0b..d35850d293 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -27,7 +27,7 @@ #include "virdnsmasq.h" #include "virnetworkobj.h" =20 -extern virNetworkXMLNamespace networkDnsmasqXMLNamespace; +extern virXMLNamespace networkDnsmasqXMLNamespace; =20 typedef struct _networkDnsmasqXmlNsDef networkDnsmasqXmlNsDef; typedef networkDnsmasqXmlNsDef *networkDnsmasqXmlNsDefPtr; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list