From nobody Fri Dec 19 20:34:52 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 ARC-Seal: i=1; a=rsa-sha256; t=1559938941; cv=none; d=zoho.com; s=zohoarc; b=QMdqgqwsdV4Z8CVFQuPdXibZ1LLWMD/DTP5n6oBPREfSiERxn+wotMWYm6ftSQIRw+OXMbHv3sX6aLdxfvBrdiPCP8vw2fJ7y+Co/H+HHjU0QjOzZ7yOfJYN9Fay7huCXd0P+13ymKDj0cJsgFsiMtm0wk+8k9K4U5pKGeNmiw8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559938941; 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=U/+O+TYzDYSIJC/0mEHwwKOebcGjyD54lFHbP8P8SqE=; b=ScZYksmg2gilrECtkEH/KU0njv9y3jums4u+Co6NICSjiT1H1L50CE9izk1XY8U865QgaCpsAXiRJsyxR4FEf0Qw14qs5XfOHdF3MJslMjEx99B2ZCjGfT6dOrVWjzLFmxOCC60RTFdn1Ypm06jXXskzCFtGYFJZJfJ0BO/u7Zg= 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 1559938941722829.1811610647105; Fri, 7 Jun 2019 13:22:21 -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 F2AE488317; Fri, 7 Jun 2019 20:21:55 +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 C5F3B600C8; Fri, 7 Jun 2019 20:21:50 +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 90BFB1806B19; Fri, 7 Jun 2019 20:21:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x57KKd0Y025700 for ; Fri, 7 Jun 2019 16:20:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9ACA95C220; Fri, 7 Jun 2019 20:20:39 +0000 (UTC) Received: from aegolius.redhat.com (ovpn-117-185.phx2.redhat.com [10.3.117.185]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 69A5A5C205 for ; Fri, 7 Jun 2019 20:20:39 +0000 (UTC) From: Jonathon Jongsma To: libvir-list@redhat.com Date: Fri, 7 Jun 2019 15:20:17 -0500 Message-Id: <20190607202030.29625-7-jjongsma@redhat.com> In-Reply-To: <20190607202030.29625-1-jjongsma@redhat.com> References: <20190607202030.29625-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 06/19] conf: network: use #pragma once in headers 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 07 Jun 2019 20:22:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jonathon Jongsma --- src/conf/netdev_bandwidth_conf.h | 15 ++++---- src/conf/netdev_vlan_conf.h | 13 +++---- src/conf/netdev_vport_profile_conf.h | 14 +++----- src/conf/network_conf.h | 52 +++++++++++++--------------- src/conf/network_event.h | 11 +++--- src/conf/networkcommon_conf.h | 17 ++++----- src/conf/virnetworkobj.h | 9 ++--- 7 files changed, 55 insertions(+), 76 deletions(-) diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_c= onf.h index 7fe750ce27..c10574d0b6 100644 --- a/src/conf/netdev_bandwidth_conf.h +++ b/src/conf/netdev_bandwidth_conf.h @@ -16,14 +16,13 @@ * . */ =20 -#ifndef LIBVIRT_NETDEV_BANDWIDTH_CONF_H -# define LIBVIRT_NETDEV_BANDWIDTH_CONF_H +#pragma once =20 -# include "internal.h" -# include "virnetdevbandwidth.h" -# include "virbuffer.h" -# include "virxml.h" -# include "domain_conf.h" +#include "internal.h" +#include "virnetdevbandwidth.h" +#include "virbuffer.h" +#include "virxml.h" +#include "domain_conf.h" =20 int virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidth, xmlNodePtr node, @@ -56,5 +55,3 @@ static inline bool virNetDevSupportBandwidth(virDomainNet= Type type) } return false; } - -#endif /* LIBVIRT_NETDEV_BANDWIDTH_CONF_H */ diff --git a/src/conf/netdev_vlan_conf.h b/src/conf/netdev_vlan_conf.h index e3a99790eb..f798c2ae2d 100644 --- a/src/conf/netdev_vlan_conf.h +++ b/src/conf/netdev_vlan_conf.h @@ -16,15 +16,12 @@ * . */ =20 -#ifndef LIBVIRT_NETDEV_VLAN_CONF_H -# define LIBVIRT_NETDEV_VLAN_CONF_H +#pragma once =20 -# include "internal.h" -# include "virnetdevvlan.h" -# include "virbuffer.h" -# include "virxml.h" +#include "internal.h" +#include "virnetdevvlan.h" +#include "virbuffer.h" +#include "virxml.h" =20 int virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDev= VlanPtr def); int virNetDevVlanFormat(const virNetDevVlan *def, virBufferPtr buf); - -#endif /* LIBVIRT_NETDEV_VLAN_CONF_H */ diff --git a/src/conf/netdev_vport_profile_conf.h b/src/conf/netdev_vport_p= rofile_conf.h index 9044217fb0..a2989af81e 100644 --- a/src/conf/netdev_vport_profile_conf.h +++ b/src/conf/netdev_vport_profile_conf.h @@ -16,13 +16,12 @@ * . */ =20 -#ifndef LIBVIRT_NETDEV_VPORT_PROFILE_CONF_H -# define LIBVIRT_NETDEV_VPORT_PROFILE_CONF_H +#pragma once =20 -# include "internal.h" -# include "virnetdevvportprofile.h" -# include "virbuffer.h" -# include "virxml.h" +#include "internal.h" +#include "virnetdevvportprofile.h" +#include "virbuffer.h" +#include "virxml.h" =20 typedef enum { /* generate random defaults for interfaceID/interfaceID @@ -43,6 +42,3 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int = flags); int virNetDevVPortProfileFormat(virNetDevVPortProfilePtr virtPort, virBufferPtr buf); - - -#endif /* LIBVIRT_NETDEV_VPORT_PROFILE_CONF_H */ diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 5410a57c67..424c4b0913 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -19,28 +19,27 @@ * . */ =20 -#ifndef LIBVIRT_NETWORK_CONF_H -# define LIBVIRT_NETWORK_CONF_H - -# define DNS_RECORD_LENGTH_SRV (512 - 30) /* Limit minus overhead as men= tioned in RFC-2782 */ - -# include -# include -# include - -# include "internal.h" -# include "virthread.h" -# include "virsocketaddr.h" -# include "virnetdevbandwidth.h" -# include "virnetdevvportprofile.h" -# include "virnetdevvlan.h" -# include "virmacaddr.h" -# include "device_conf.h" -# include "virbitmap.h" -# include "networkcommon_conf.h" -# include "virobject.h" -# include "virmacmap.h" -# include "virenum.h" +#pragma once + +#define DNS_RECORD_LENGTH_SRV (512 - 30) /* Limit minus overhead as ment= ioned in RFC-2782 */ + +#include +#include +#include + +#include "internal.h" +#include "virthread.h" +#include "virsocketaddr.h" +#include "virnetdevbandwidth.h" +#include "virnetdevvportprofile.h" +#include "virnetdevvlan.h" +#include "virmacaddr.h" +#include "device_conf.h" +#include "virbitmap.h" +#include "networkcommon_conf.h" +#include "virobject.h" +#include "virmacmap.h" +#include "virenum.h" =20 typedef enum { VIR_NETWORK_FORWARD_NONE =3D 0, @@ -358,19 +357,19 @@ virNetworkSetBridgeMacAddr(virNetworkDefPtr def); =20 VIR_ENUM_DECL(virNetworkForward); =20 -# define VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE \ +#define VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE \ (VIR_CONNECT_LIST_NETWORKS_ACTIVE | \ VIR_CONNECT_LIST_NETWORKS_INACTIVE) =20 -# define VIR_CONNECT_LIST_NETWORKS_FILTERS_PERSISTENT \ +#define VIR_CONNECT_LIST_NETWORKS_FILTERS_PERSISTENT \ (VIR_CONNECT_LIST_NETWORKS_PERSISTENT | \ VIR_CONNECT_LIST_NETWORKS_TRANSIENT) =20 -# define VIR_CONNECT_LIST_NETWORKS_FILTERS_AUTOSTART \ +#define VIR_CONNECT_LIST_NETWORKS_FILTERS_AUTOSTART \ (VIR_CONNECT_LIST_NETWORKS_AUTOSTART | \ VIR_CONNECT_LIST_NETWORKS_NO_AUTOSTART) =20 -# define VIR_CONNECT_LIST_NETWORKS_FILTERS_ALL \ +#define VIR_CONNECT_LIST_NETWORKS_FILTERS_ALL \ (VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE | \ VIR_CONNECT_LIST_NETWORKS_FILTERS_PERSISTENT | \ VIR_CONNECT_LIST_NETWORKS_FILTERS_AUTOSTART) @@ -385,4 +384,3 @@ virNetworkDefUpdateSection(virNetworkDefPtr def, unsigned int flags); /* virNetworkUpdateFlags = */ =20 VIR_ENUM_DECL(virNetworkTaint); -#endif /* LIBVIRT_NETWORK_CONF_H */ diff --git a/src/conf/network_event.h b/src/conf/network_event.h index d3d17dd168..2267003970 100644 --- a/src/conf/network_event.h +++ b/src/conf/network_event.h @@ -19,12 +19,11 @@ * . */ =20 -#ifndef LIBVIRT_NETWORK_EVENT_H -# define LIBVIRT_NETWORK_EVENT_H +#pragma once =20 -# include "internal.h" -# include "object_event.h" -# include "object_event_private.h" +#include "internal.h" +#include "object_event.h" +#include "object_event_private.h" =20 int virNetworkEventStateRegisterID(virConnectPtr conn, @@ -55,5 +54,3 @@ virNetworkEventLifecycleNew(const char *name, const unsigned char *uuid, int type, int detail); - -#endif /* LIBVIRT_NETWORK_EVENT_H */ diff --git a/src/conf/networkcommon_conf.h b/src/conf/networkcommon_conf.h index b6c37a5a28..b257ffdd9c 100644 --- a/src/conf/networkcommon_conf.h +++ b/src/conf/networkcommon_conf.h @@ -20,16 +20,15 @@ * . */ =20 -#ifndef LIBVIRT_NETWORKCOMMON_CONF_H -# define LIBVIRT_NETWORKCOMMON_CONF_H +#pragma once =20 -# include -# include +#include +#include =20 -# include "internal.h" -# include "virbuffer.h" -# include "virsocketaddr.h" -# include "virnetdevip.h" +#include "internal.h" +#include "virbuffer.h" +#include "virsocketaddr.h" +#include "virnetdevip.h" =20 virNetDevIPRoutePtr virNetDevIPRouteCreate(const char *networkName, @@ -49,5 +48,3 @@ virNetDevIPRouteParseXML(const char *networkName, int virNetDevIPRouteFormat(virBufferPtr buf, const virNetDevIPRoute *def); - -#endif /* LIBVIRT_NETWORKCOMMON_CONF_H */ diff --git a/src/conf/virnetworkobj.h b/src/conf/virnetworkobj.h index 9c8f141cd9..3b296a10b3 100644 --- a/src/conf/virnetworkobj.h +++ b/src/conf/virnetworkobj.h @@ -17,12 +17,11 @@ * . */ =20 -#ifndef LIBVIRT_VIRNETWORKOBJ_H -# define LIBVIRT_VIRNETWORKOBJ_H +#pragma once =20 -# include "internal.h" +#include "internal.h" =20 -# include "network_conf.h" +#include "network_conf.h" =20 typedef struct _virNetworkObj virNetworkObj; typedef virNetworkObj *virNetworkObjPtr; @@ -220,5 +219,3 @@ virNetworkObjListNumOfNetworks(virNetworkObjListPtr net= s, void virNetworkObjListPrune(virNetworkObjListPtr nets, unsigned int flags); - -#endif /* LIBVIRT_VIRNETWORKOBJ_H */ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list