From nobody Fri Dec 19 20:35:44 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=1559938976; cv=none; d=zoho.com; s=zohoarc; b=dMjghJwBX9rXoVnYDAY+a7YtDDMMY3HzLsBcsUEONVuNKzKp2RbDZtM8SfBYjOTEvrAhFNPb+wiYNLrPBkvix8kS6jzsdoLXPYPGyntn0oqaeRWVVTOD5M13y9KtPpM/Vd5P1GuRsrALWW0baGzznjzzZ/MTjLC2Bhl9XBvEIqI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559938976; 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=mLeQMv2/pg3aRG8FyVSJ29lTp/xZpjeN2g37CzJweKE=; b=ZFXtijYzUtlpuoVSL7LOuOwNYn9xs/oTU/NwTCdp95Mi2/T5rrnCbDIeKA+f657YZpWCgzEVDtbwYSWXyfi+ouJvxoQPBU4wUHA+vlvKfqXD2zY5Es/16soAn9ZZy3Mn/o72tc8rRNgYh4idJmC8oVM8B++2Y+fr6y4MBH/BkOs= 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 1559938976712579.4747749993638; Fri, 7 Jun 2019 13:22:56 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1013630F1BB3; Fri, 7 Jun 2019 20:22:55 +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 DD1045C22D; Fri, 7 Jun 2019 20:22:52 +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 A56F8206D9; Fri, 7 Jun 2019 20:22:52 +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 x57KKfPr025743 for ; Fri, 7 Jun 2019 16:20:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id AC5E75C220; Fri, 7 Jun 2019 20:20:41 +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 7A0085C205 for ; Fri, 7 Jun 2019 20:20:41 +0000 (UTC) From: Jonathon Jongsma To: libvir-list@redhat.com Date: Fri, 7 Jun 2019 15:20:23 -0500 Message-Id: <20190607202030.29625-13-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 12/19] src/datatypes.h: use #pragma once 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 07 Jun 2019 20:22:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jonathon Jongsma --- src/datatypes.h | 89 ++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 46 deletions(-) diff --git a/src/datatypes.h b/src/datatypes.h index 87f3d5e095..36d4cb9314 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -19,15 +19,14 @@ * */ =20 -#ifndef LIBVIRT_DATATYPES_H -# define LIBVIRT_DATATYPES_H +#pragma once =20 -# include "internal.h" +#include "internal.h" =20 -# include "driver.h" -# include "virthread.h" -# include "virobject.h" -# include "viruuid.h" +#include "driver.h" +#include "virthread.h" +#include "virobject.h" +#include "viruuid.h" =20 extern virClassPtr virConnectClass; extern virClassPtr virDomainClass; @@ -47,7 +46,7 @@ extern virClassPtr virAdmConnectClass; extern virClassPtr virAdmServerClass; extern virClassPtr virAdmClientClass; =20 -# define virCheckConnectReturn(obj, retval) \ +#define virCheckConnectReturn(obj, retval) \ do { \ if (!virObjectIsClass(obj, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INVALID_CONN, \ @@ -57,7 +56,7 @@ extern virClassPtr virAdmClientClass; return retval; \ } \ } while (0) -# define virCheckConnectGoto(obj, label) \ +#define virCheckConnectGoto(obj, label) \ do { \ if (!virObjectIsClass(obj, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INVALID_CONN, \ @@ -67,7 +66,7 @@ extern virClassPtr virAdmClientClass; } \ } while (0) =20 -# define virCheckDomainReturn(obj, retval) \ +#define virCheckDomainReturn(obj, retval) \ do { \ virDomainPtr _dom =3D (obj); \ if (!virObjectIsClass(_dom, virDomainClass) || \ @@ -79,7 +78,7 @@ extern virClassPtr virAdmClientClass; return retval; \ } \ } while (0) -# define virCheckDomainGoto(obj, label) \ +#define virCheckDomainGoto(obj, label) \ do { \ virDomainPtr _dom =3D (obj); \ if (!virObjectIsClass(_dom, virDomainClass) || \ @@ -91,7 +90,7 @@ extern virClassPtr virAdmClientClass; } \ } while (0) =20 -# define virCheckNetworkReturn(obj, retval) \ +#define virCheckNetworkReturn(obj, retval) \ do { \ virNetworkPtr _net =3D (obj); \ if (!virObjectIsClass(_net, virNetworkClass) || \ @@ -104,7 +103,7 @@ extern virClassPtr virAdmClientClass; return retval; \ } \ } while (0) -# define virCheckNetworkGoto(obj, label) \ +#define virCheckNetworkGoto(obj, label) \ do { \ virNetworkPtr _net =3D (obj); \ if (!virObjectIsClass(_net, virNetworkClass) || \ @@ -117,7 +116,7 @@ extern virClassPtr virAdmClientClass; } \ } while (0) =20 -# define virCheckInterfaceReturn(obj, retval) \ +#define virCheckInterfaceReturn(obj, retval) \ do { \ virInterfacePtr _iface =3D (obj); \ if (!virObjectIsClass(_iface, virInterfaceClass) || \ @@ -131,7 +130,7 @@ extern virClassPtr virAdmClientClass; } \ } while (0) =20 -# define virCheckStoragePoolReturn(obj, retval) \ +#define virCheckStoragePoolReturn(obj, retval) \ do { \ virStoragePoolPtr _pool =3D (obj); \ if (!virObjectIsClass(_pool, virStoragePoolClass) || \ @@ -145,7 +144,7 @@ extern virClassPtr virAdmClientClass; } \ } while (0) =20 -# define virCheckStoragePoolGoto(obj, label) \ +#define virCheckStoragePoolGoto(obj, label) \ do { \ virStoragePoolPtr _pool=3D (obj); \ if (!virObjectIsClass(_pool, virStoragePoolClass) || \ @@ -158,7 +157,7 @@ extern virClassPtr virAdmClientClass; } \ } while (0) =20 -# define virCheckStorageVolReturn(obj, retval) \ +#define virCheckStorageVolReturn(obj, retval) \ do { \ virStorageVolPtr _vol =3D (obj); \ if (!virObjectIsClass(_vol, virStorageVolClass) || \ @@ -171,7 +170,7 @@ extern virClassPtr virAdmClientClass; return retval; \ } \ } while (0) -# define virCheckStorageVolGoto(obj, label) \ +#define virCheckStorageVolGoto(obj, label) \ do { \ virStorageVolPtr _vol =3D (obj); \ if (!virObjectIsClass(_vol, virStorageVolClass) || \ @@ -184,7 +183,7 @@ extern virClassPtr virAdmClientClass; } \ } while (0) =20 -# define virCheckNodeDeviceReturn(obj, retval) \ +#define virCheckNodeDeviceReturn(obj, retval) \ do { \ virNodeDevicePtr _node =3D (obj); \ if (!virObjectIsClass(_node, virNodeDeviceClass) || \ @@ -198,7 +197,7 @@ extern virClassPtr virAdmClientClass; } \ } while (0) =20 -# define virCheckNodeDeviceGoto(obj, label) \ +#define virCheckNodeDeviceGoto(obj, label) \ do { \ virNodeDevicePtr _dev=3D (obj); \ if (!virObjectIsClass(_dev, virNodeDeviceClass) || \ @@ -211,7 +210,7 @@ extern virClassPtr virAdmClientClass; } \ } while (0) =20 -# define virCheckSecretReturn(obj, retval) \ +#define virCheckSecretReturn(obj, retval) \ do { \ virSecretPtr _secret =3D (obj); \ if (!virObjectIsClass(_secret, virSecretClass) || \ @@ -225,7 +224,7 @@ extern virClassPtr virAdmClientClass; } \ } while (0) =20 -# define virCheckSecretGoto(obj, label) \ +#define virCheckSecretGoto(obj, label) \ do { \ virSecretPtr _secret =3D (obj); \ if (!virObjectIsClass(_secret, virSecretClass) || \ @@ -239,7 +238,7 @@ extern virClassPtr virAdmClientClass; } \ } while (0) =20 -# define virCheckStreamReturn(obj, retval) \ +#define virCheckStreamReturn(obj, retval) \ do { \ virStreamPtr _st =3D (obj); \ if (!virObjectIsClass(_st, virStreamClass) || \ @@ -252,7 +251,7 @@ extern virClassPtr virAdmClientClass; return retval; \ } \ } while (0) -# define virCheckStreamGoto(obj, label) \ +#define virCheckStreamGoto(obj, label) \ do { \ virStreamPtr _st =3D (obj); \ if (!virObjectIsClass(_st, virStreamClass) || \ @@ -265,7 +264,7 @@ extern virClassPtr virAdmClientClass; } \ } while (0) =20 -# define virCheckNWFilterReturn(obj, retval) \ +#define virCheckNWFilterReturn(obj, retval) \ do { \ virNWFilterPtr _nw =3D (obj); \ if (!virObjectIsClass(_nw, virNWFilterClass) || \ @@ -279,7 +278,7 @@ extern virClassPtr virAdmClientClass; } \ } while (0) =20 -# define virCheckNWFilterBindingReturn(obj, retval) \ +#define virCheckNWFilterBindingReturn(obj, retval) \ do { \ virNWFilterBindingPtr _nw =3D (obj); \ if (!virObjectIsClass(_nw, virNWFilterBindingClass) || \ @@ -293,7 +292,7 @@ extern virClassPtr virAdmClientClass; } \ } while (0) =20 -# define virCheckDomainCheckpointReturn(obj, retval) \ +#define virCheckDomainCheckpointReturn(obj, retval) \ do { \ virDomainCheckpointPtr _check =3D (obj); \ if (!virObjectIsClass(_check, virDomainCheckpointClass) || \ @@ -308,7 +307,7 @@ extern virClassPtr virAdmClientClass; } \ } while (0) =20 -# define virCheckDomainSnapshotReturn(obj, retval) \ +#define virCheckDomainSnapshotReturn(obj, retval) \ do { \ virDomainSnapshotPtr _snap =3D (obj); \ if (!virObjectIsClass(_snap, virDomainSnapshotClass) || \ @@ -332,29 +331,29 @@ extern virClassPtr virAdmClientClass; * "define a(b,...) b,##__VA_ARGS__" as a means of eliding a comma * when no var-args are present, but we don't want to require gcc. */ -# define VIR_ARG15(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, \ - _11, _12, _13, _14, _15, ...) _15 -# define VIR_HAS_COMMA(...) VIR_ARG15(__VA_ARGS__, \ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, = 1, 0) +#define VIR_ARG15(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, \ + _11, _12, _13, _14, _15, ...) _15 +#define VIR_HAS_COMMA(...) VIR_ARG15(__VA_ARGS__, \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1= , 0) =20 /* Form the name VIR_DOMAIN_DEBUG_[01], then call that macro, * according to how many arguments are present. Two-phase due to * macro expansion rules. */ -# define VIR_DOMAIN_DEBUG_EXPAND(a, b, ...) \ +#define VIR_DOMAIN_DEBUG_EXPAND(a, b, ...) \ VIR_DOMAIN_DEBUG_PASTE(a, b, __VA_ARGS__) -# define VIR_DOMAIN_DEBUG_PASTE(a, b, ...) \ +#define VIR_DOMAIN_DEBUG_PASTE(a, b, ...) \ a##b(__VA_ARGS__) =20 /* Internal use only, when VIR_DOMAIN_DEBUG has one argument. */ -# define VIR_DOMAIN_DEBUG_0(dom) \ +#define VIR_DOMAIN_DEBUG_0(dom) \ VIR_DOMAIN_DEBUG_2(dom, "%s", "") =20 /* Internal use only, when VIR_DOMAIN_DEBUG has three or more arguments. = */ -# define VIR_DOMAIN_DEBUG_1(dom, fmt, ...) \ +#define VIR_DOMAIN_DEBUG_1(dom, fmt, ...) \ VIR_DOMAIN_DEBUG_2(dom, ", " fmt, __VA_ARGS__) =20 /* Internal use only, with final format. */ -# define VIR_DOMAIN_DEBUG_2(dom, fmt, ...) \ +#define VIR_DOMAIN_DEBUG_2(dom, fmt, ...) \ do { \ char _uuidstr[VIR_UUID_STRING_BUFLEN]; \ const char *_domname =3D NULL; \ @@ -370,7 +369,7 @@ extern virClassPtr virAdmClientClass; dom, NULLSTR(_domname), _uuidstr, __VA_ARGS__); \ } while (0) =20 -# define virCheckAdmConnectReturn(obj, retval) \ +#define virCheckAdmConnectReturn(obj, retval) \ do { \ if (!virObjectIsClass(obj, virAdmConnectClass)) { \ virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INVALID_CONN, \ @@ -380,7 +379,7 @@ extern virClassPtr virAdmClientClass; return retval; \ } \ } while (0) -# define virCheckAdmConnectGoto(obj, label) \ +#define virCheckAdmConnectGoto(obj, label) \ do { \ if (!virObjectIsClass(obj, virAdmConnectClass)) { \ virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INVALID_CONN, \ @@ -390,7 +389,7 @@ extern virClassPtr virAdmClientClass; } \ } while (0) =20 -# define virCheckAdmServerReturn(obj, retval) \ +#define virCheckAdmServerReturn(obj, retval) \ do { \ virAdmServerPtr _srv =3D (obj); \ if (!virObjectIsClass(_srv, virAdmServerClass) || \ @@ -402,7 +401,7 @@ extern virClassPtr virAdmClientClass; return retval; \ } \ } while (0) -# define virCheckAdmServerGoto(obj, label) \ +#define virCheckAdmServerGoto(obj, label) \ do { \ virAdmServerPtr _srv =3D (obj); \ if (!virObjectIsClass(_srv, virAdmServerClass) || \ @@ -414,7 +413,7 @@ extern virClassPtr virAdmClientClass; } \ } while (0); =20 -# define virCheckAdmClientReturn(obj, retval) \ +#define virCheckAdmClientReturn(obj, retval) \ do { \ virAdmClientPtr _clt =3D (obj); \ if (!virObjectIsClass(_clt, virAdmClientClass) || \ @@ -427,7 +426,7 @@ extern virClassPtr virAdmClientClass; return retval; \ } \ } while (0) -# define virCheckAdmClientGoto(obj, label) \ +#define virCheckAdmClientGoto(obj, label) \ do { \ virAdmClientPtr _clt =3D (obj); \ if (!virObjectIsClass(_clt, virAdmClientClass) || \ @@ -446,7 +445,7 @@ extern virClassPtr virAdmClientClass; * @fmt: optional format for additional information * @...: optional arguments corresponding to @fmt. */ -# define VIR_DOMAIN_DEBUG(...) \ +#define VIR_DOMAIN_DEBUG(...) \ VIR_DOMAIN_DEBUG_EXPAND(VIR_DOMAIN_DEBUG_, \ VIR_HAS_COMMA(__VA_ARGS__), \ __VA_ARGS__) @@ -808,5 +807,3 @@ int virAdmConnectCloseCallbackDataRegister(virAdmConnec= tCloseCallbackDataPtr cbd virFreeCallback freecb); int virAdmConnectCloseCallbackDataUnregister(virAdmConnectCloseCallbackDat= aPtr cbdata, virAdmConnectCloseFunc cb); - -#endif /* LIBVIRT_DATATYPES_H */ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list