External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-29 03:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: misc: use #pragma once in headers

Browse Source 
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jonathon Jongsma 2019-06-07 15:20:21 -05:00 committed by Ján Tomko
parent 5ef190a4d2
commit 222e0f0f08
19 changed files with 117 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/conf/capabilities.h
View File

@ -19,19 +19,18 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_CAPABILITIES_H #pragma once
# define LIBVIRT_CAPABILITIES_H
# include "internal.h" #include "internal.h"
# include "virconftypes.h" #include "virconftypes.h"
# include "virbuffer.h" #include "virbuffer.h"
# include "cpu_conf.h" #include "cpu_conf.h"
# include "virarch.h" #include "virarch.h"
# include "virmacaddr.h" #include "virmacaddr.h"
# include "virobject.h" #include "virobject.h"
# include "virresctrl.h" #include "virresctrl.h"
# include <libxml/xpath.h> #include <libxml/xpath.h>
struct _virCapsGuestFeature { struct _virCapsGuestFeature {
char *name; char *name;
@ -328,5 +327,3 @@ void virCapsHostCacheBankFree(virCapsHostCacheBankPtr ptr);
int virCapabilitiesInitCaches(virCapsPtr caps); int virCapabilitiesInitCaches(virCapsPtr caps);
void virCapabilitiesHostInitIOMMU(virCapsPtr caps); void virCapabilitiesHostInitIOMMU(virCapsPtr caps);
#endif /* LIBVIRT_CAPABILITIES_H */

23
src/conf/cpu_conf.h
View File

@ -18,19 +18,18 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_CPU_CONF_H #pragma once
# define LIBVIRT_CPU_CONF_H
# include "virutil.h" #include "virutil.h"
# include "virbuffer.h" #include "virbuffer.h"
# include "virxml.h" #include "virxml.h"
# include "virbitmap.h" #include "virbitmap.h"
# include "virarch.h" #include "virarch.h"
# include "numa_conf.h" #include "numa_conf.h"
# include "virenum.h" #include "virenum.h"
# include "virhostcpu.h" #include "virhostcpu.h"
# define VIR_CPU_VENDOR_ID_LENGTH 12 #define VIR_CPU_VENDOR_ID_LENGTH 12
typedef enum { typedef enum {
VIR_CPU_TYPE_HOST, VIR_CPU_TYPE_HOST,
@ -226,5 +225,3 @@ virCPUDefListParse(const char **xmlCPUs,
virCPUType cpuType); virCPUType cpuType);
void void
virCPUDefListFree(virCPUDefPtr *cpus); virCPUDefListFree(virCPUDefPtr *cpus);
#endif /* LIBVIRT_CPU_CONF_H */

33
src/conf/device_conf.h
View File

@ -18,20 +18,19 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_DEVICE_CONF_H #pragma once
# define LIBVIRT_DEVICE_CONF_H
# include <libxml/parser.h> #include <libxml/parser.h>
# include <libxml/tree.h> #include <libxml/tree.h>
# include <libxml/xpath.h> #include <libxml/xpath.h>
# include "internal.h" #include "internal.h"
# include "virutil.h" #include "virutil.h"
# include "virthread.h" #include "virthread.h"
# include "virbuffer.h" #include "virbuffer.h"
# include "virpci.h" #include "virpci.h"
# include "virnetdev.h" #include "virnetdev.h"
# include "virenum.h" #include "virenum.h"
typedef enum { typedef enum {
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE,
@ -69,9 +68,9 @@ struct _virDomainDeviceVirtioSerialAddress {
unsigned int port; unsigned int port;
}; };
# define VIR_DOMAIN_DEVICE_CCW_MAX_CSSID 254 #define VIR_DOMAIN_DEVICE_CCW_MAX_CSSID 254
# define VIR_DOMAIN_DEVICE_CCW_MAX_SSID 3 #define VIR_DOMAIN_DEVICE_CCW_MAX_SSID 3
# define VIR_DOMAIN_DEVICE_CCW_MAX_DEVNO 65535 #define VIR_DOMAIN_DEVICE_CCW_MAX_DEVNO 65535
typedef struct _virDomainDeviceCCWAddress virDomainDeviceCCWAddress; typedef struct _virDomainDeviceCCWAddress virDomainDeviceCCWAddress;
typedef virDomainDeviceCCWAddress *virDomainDeviceCCWAddressPtr; typedef virDomainDeviceCCWAddress *virDomainDeviceCCWAddressPtr;
@ -89,7 +88,7 @@ struct _virDomainDeviceCcidAddress {
unsigned int slot; unsigned int slot;
}; };
# define VIR_DOMAIN_DEVICE_USB_MAX_PORT_DEPTH 4 #define VIR_DOMAIN_DEVICE_USB_MAX_PORT_DEPTH 4
typedef struct _virDomainDeviceUSBAddress virDomainDeviceUSBAddress; typedef struct _virDomainDeviceUSBAddress virDomainDeviceUSBAddress;
typedef virDomainDeviceUSBAddress *virDomainDeviceUSBAddressPtr; typedef virDomainDeviceUSBAddress *virDomainDeviceUSBAddressPtr;
@ -231,5 +230,3 @@ int virInterfaceLinkParseXML(xmlNodePtr node,
int virInterfaceLinkFormat(virBufferPtr buf, int virInterfaceLinkFormat(virBufferPtr buf,
const virNetDevIfLink *lnk); const virNetDevIfLink *lnk);
#endif /* LIBVIRT_DEVICE_CONF_H */

23
src/conf/interface_conf.h
View File

@ -18,18 +18,17 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_INTERFACE_CONF_H #pragma once
# define LIBVIRT_INTERFACE_CONF_H
# include <libxml/parser.h> #include <libxml/parser.h>
# include <libxml/tree.h> #include <libxml/tree.h>
# include <libxml/xpath.h> #include <libxml/xpath.h>
# include "internal.h" #include "internal.h"
# include "virutil.h" #include "virutil.h"
# include "virthread.h" #include "virthread.h"
# include "device_conf.h" #include "device_conf.h"
# include "virenum.h" #include "virenum.h"
/* There is currently 3 types of interfaces */ /* There is currently 3 types of interfaces */
@ -175,8 +174,6 @@ virInterfaceDefParseNode(xmlDocPtr xml,
char * char *
virInterfaceDefFormat(const virInterfaceDef *def); virInterfaceDefFormat(const virInterfaceDef *def);
# define VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE \ #define VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE \
(VIR_CONNECT_LIST_INTERFACES_ACTIVE | \ (VIR_CONNECT_LIST_INTERFACES_ACTIVE | \
VIR_CONNECT_LIST_INTERFACES_INACTIVE) VIR_CONNECT_LIST_INTERFACES_INACTIVE)
#endif /* LIBVIRT_INTERFACE_CONF_H */

11
src/conf/moment_conf.h
View File

@ -20,12 +20,11 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_MOMENT_CONF_H #pragma once
# define LIBVIRT_MOMENT_CONF_H
# include "internal.h" #include "internal.h"
# include "virconftypes.h" #include "virconftypes.h"
# include "virobject.h" #include "virobject.h"
/* Base class for a domain moment */ /* Base class for a domain moment */
struct _virDomainMomentDef { struct _virDomainMomentDef {
@ -43,5 +42,3 @@ struct _virDomainMomentDef {
virClassPtr virClassForDomainMomentDef(void); virClassPtr virClassForDomainMomentDef(void);
int virDomainMomentDefPostParse(virDomainMomentDefPtr def); int virDomainMomentDefPostParse(virDomainMomentDefPtr def);
#endif /* LIBVIRT_MOMENT_CONF_H */

18
src/conf/numa_conf.h
View File

@ -18,16 +18,15 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_NUMA_CONF_H #pragma once
# define LIBVIRT_NUMA_CONF_H
# include <libxml/xpath.h> #include <libxml/xpath.h>
# include "internal.h" #include "internal.h"
# include "virutil.h" #include "virutil.h"
# include "virbitmap.h" #include "virbitmap.h"
# include "virbuffer.h" #include "virbuffer.h"
# include "virenum.h" #include "virenum.h"
typedef struct _virDomainNuma virDomainNuma; typedef struct _virDomainNuma virDomainNuma;
@ -185,6 +184,3 @@ int virDomainNumaDefCPUParseXML(virDomainNumaPtr def, xmlXPathContextPtr ctxt);
int virDomainNumaDefCPUFormatXML(virBufferPtr buf, virDomainNumaPtr def); int virDomainNumaDefCPUFormatXML(virBufferPtr buf, virDomainNumaPtr def);
unsigned int virDomainNumaGetCPUCountTotal(virDomainNumaPtr numa); unsigned int virDomainNumaGetCPUCountTotal(virDomainNumaPtr numa);
#endif /* LIBVIRT_NUMA_CONF_H */

11
src/conf/object_event.h
View File

@ -20,12 +20,11 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_OBJECT_EVENT_H #pragma once
# define LIBVIRT_OBJECT_EVENT_H
# include "internal.h" #include "internal.h"
# include "virobject.h" #include "virobject.h"
/** /**
* Dispatching domain events that come in while * Dispatching domain events that come in while
@ -54,7 +53,7 @@ typedef void (*virConnectObjectEventGenericCallback)(virConnectPtr conn,
void *obj, void *obj,
void *opaque); void *opaque);
# define VIR_OBJECT_EVENT_CALLBACK(cb) \ #define VIR_OBJECT_EVENT_CALLBACK(cb) \
((virConnectObjectEventGenericCallback)(cb)) ((virConnectObjectEventGenericCallback)(cb))
void void
@ -88,5 +87,3 @@ virObjectEventStateSetRemote(virConnectPtr conn,
int callbackID, int callbackID,
int remoteID) int remoteID)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
#endif /* LIBVIRT_OBJECT_EVENT_H */

7
src/conf/object_event_private.h
View File

@ -20,10 +20,9 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_OBJECT_EVENT_PRIVATE_H #pragma once
# define LIBVIRT_OBJECT_EVENT_PRIVATE_H
# include "datatypes.h" #include "datatypes.h"
struct _virObjectMeta { struct _virObjectMeta {
int id; int id;
@ -105,5 +104,3 @@ virObjectEventNew(virClassPtr klass,
const char *key) const char *key)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5)
ATTRIBUTE_NONNULL(7); ATTRIBUTE_NONNULL(7);
#endif /* LIBVIRT_OBJECT_EVENT_PRIVATE_H */

15
src/conf/secret_conf.h
View File

@ -18,11 +18,10 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_SECRET_CONF_H #pragma once
# define LIBVIRT_SECRET_CONF_H
# include "internal.h" #include "internal.h"
# include "virutil.h" #include "virutil.h"
typedef struct _virSecretDef virSecretDef; typedef struct _virSecretDef virSecretDef;
typedef virSecretDef *virSecretDefPtr; typedef virSecretDef *virSecretDefPtr;
@ -40,16 +39,14 @@ virSecretDefPtr virSecretDefParseString(const char *xml);
virSecretDefPtr virSecretDefParseFile(const char *filename); virSecretDefPtr virSecretDefParseFile(const char *filename);
char *virSecretDefFormat(const virSecretDef *def); char *virSecretDefFormat(const virSecretDef *def);
# define VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL \ #define VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL \
(VIR_CONNECT_LIST_SECRETS_EPHEMERAL | \ (VIR_CONNECT_LIST_SECRETS_EPHEMERAL | \
VIR_CONNECT_LIST_SECRETS_NO_EPHEMERAL) VIR_CONNECT_LIST_SECRETS_NO_EPHEMERAL)
# define VIR_CONNECT_LIST_SECRETS_FILTERS_PRIVATE \ #define VIR_CONNECT_LIST_SECRETS_FILTERS_PRIVATE \
(VIR_CONNECT_LIST_SECRETS_PRIVATE | \ (VIR_CONNECT_LIST_SECRETS_PRIVATE | \
VIR_CONNECT_LIST_SECRETS_NO_PRIVATE) VIR_CONNECT_LIST_SECRETS_NO_PRIVATE)
# define VIR_CONNECT_LIST_SECRETS_FILTERS_ALL \ #define VIR_CONNECT_LIST_SECRETS_FILTERS_ALL \
(VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL | \ (VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL | \
VIR_CONNECT_LIST_SECRETS_FILTERS_PRIVATE) VIR_CONNECT_LIST_SECRETS_FILTERS_PRIVATE)
#endif /* LIBVIRT_SECRET_CONF_H */

11
src/conf/secret_event.h
View File

@ -20,12 +20,11 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_SECRET_EVENT_H #pragma once
# define LIBVIRT_SECRET_EVENT_H
# include "internal.h" #include "internal.h"
# include "object_event.h" #include "object_event.h"
# include "object_event_private.h" #include "object_event_private.h"
int int
virSecretEventStateRegisterID(virConnectPtr conn, virSecretEventStateRegisterID(virConnectPtr conn,
@ -61,5 +60,3 @@ virObjectEventPtr
virSecretEventValueChangedNew(const unsigned char *uuid, virSecretEventValueChangedNew(const unsigned char *uuid,
int usage_type, int usage_type,
const char *usage_id); const char *usage_id);
#endif /* LIBVIRT_SECRET_EVENT_H */

13
src/conf/snapshot_conf.h
View File

@ -19,13 +19,12 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_SNAPSHOT_CONF_H #pragma once
# define LIBVIRT_SNAPSHOT_CONF_H
# include "internal.h" #include "internal.h"
# include "domain_conf.h" #include "domain_conf.h"
# include "moment_conf.h" #include "moment_conf.h"
# include "virenum.h" #include "virenum.h"
/* Items related to snapshot state */ /* Items related to snapshot state */
@ -143,5 +142,3 @@ int virDomainSnapshotRedefineValidate(virDomainSnapshotDefPtr def,
VIR_ENUM_DECL(virDomainSnapshotLocation); VIR_ENUM_DECL(virDomainSnapshotLocation);
VIR_ENUM_DECL(virDomainSnapshotState); VIR_ENUM_DECL(virDomainSnapshotState);
#endif /* LIBVIRT_SNAPSHOT_CONF_H */

9
src/conf/virchrdev.h
View File

@ -19,11 +19,10 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_VIRCHRDEV_H #pragma once
# define LIBVIRT_VIRCHRDEV_H
# include "internal.h" #include "internal.h"
# include "domain_conf.h" #include "domain_conf.h"
typedef struct _virChrdevs virChrdevs; typedef struct _virChrdevs virChrdevs;
typedef virChrdevs *virChrdevsPtr; typedef virChrdevs *virChrdevsPtr;
@ -33,5 +32,3 @@ void virChrdevFree(virChrdevsPtr devs);
int virChrdevOpen(virChrdevsPtr devs, virDomainChrSourceDefPtr source, int virChrdevOpen(virChrdevsPtr devs, virDomainChrSourceDefPtr source,
virStreamPtr st, bool force); virStreamPtr st, bool force);
#endif /* LIBVIRT_VIRCHRDEV_H */

5
src/conf/virconftypes.h
View File

@ -20,8 +20,7 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_VIRCONFTYPES_H #pragma once
# define LIBVIRT_VIRCONFTYPES_H
/* forward declarations of various types required in src/conf */ /* forward declarations of various types required in src/conf */
@ -345,5 +344,3 @@ typedef virDomainXMLPrivateDataCallbacks *virDomainXMLPrivateDataCallbacksPtr;
typedef struct _virDomainXenbusControllerOpts virDomainXenbusControllerOpts; typedef struct _virDomainXenbusControllerOpts virDomainXenbusControllerOpts;
typedef virDomainXenbusControllerOpts *virDomainXenbusControllerOptsPtr; typedef virDomainXenbusControllerOpts *virDomainXenbusControllerOptsPtr;
#endif /* LIBVIRT_VIRCONFTYPES_H */

17
src/conf/virdomainmomentobjlist.h
View File

@ -20,12 +20,11 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_VIRDOMAINMOMENTOBJLIST_H #pragma once
# define LIBVIRT_VIRDOMAINMOMENTOBJLIST_H
# include "internal.h" #include "internal.h"
# include "virconftypes.h" #include "virconftypes.h"
# include "virhash.h" #include "virhash.h"
/* Filter that returns true if a given moment matches the filter flags */ /* Filter that returns true if a given moment matches the filter flags */
typedef bool (*virDomainMomentObjListFilter)(virDomainMomentObjPtr obj, typedef bool (*virDomainMomentObjListFilter)(virDomainMomentObjPtr obj,
@ -83,15 +82,15 @@ typedef enum {
VIR_DOMAIN_MOMENT_LIST_NO_METADATA = (1 << 5), VIR_DOMAIN_MOMENT_LIST_NO_METADATA = (1 << 5),
} virDomainMomentFilters; } virDomainMomentFilters;
# define VIR_DOMAIN_MOMENT_FILTERS_METADATA \ #define VIR_DOMAIN_MOMENT_FILTERS_METADATA \
(VIR_DOMAIN_MOMENT_LIST_METADATA | \ (VIR_DOMAIN_MOMENT_LIST_METADATA | \
VIR_DOMAIN_MOMENT_LIST_NO_METADATA) VIR_DOMAIN_MOMENT_LIST_NO_METADATA)
# define VIR_DOMAIN_MOMENT_FILTERS_LEAVES \ #define VIR_DOMAIN_MOMENT_FILTERS_LEAVES \
(VIR_DOMAIN_MOMENT_LIST_LEAVES | \ (VIR_DOMAIN_MOMENT_LIST_LEAVES | \
VIR_DOMAIN_MOMENT_LIST_NO_LEAVES) VIR_DOMAIN_MOMENT_LIST_NO_LEAVES)
# define VIR_DOMAIN_MOMENT_FILTERS_ALL \ #define VIR_DOMAIN_MOMENT_FILTERS_ALL \
(VIR_DOMAIN_MOMENT_LIST_ROOTS | \ (VIR_DOMAIN_MOMENT_LIST_ROOTS | \
VIR_DOMAIN_MOMENT_LIST_TOPOLOGICAL | \ VIR_DOMAIN_MOMENT_LIST_TOPOLOGICAL | \
VIR_DOMAIN_MOMENT_FILTERS_METADATA | \ VIR_DOMAIN_MOMENT_FILTERS_METADATA | \
@ -118,5 +117,3 @@ int virDomainMomentForEach(virDomainMomentObjListPtr moments,
virHashIterator iter, virHashIterator iter,
void *data); void *data);
int virDomainMomentUpdateRelations(virDomainMomentObjListPtr moments); int virDomainMomentUpdateRelations(virDomainMomentObjListPtr moments);
#endif /* LIBVIRT_VIRDOMAINMOMENTOBJLIST_H */

21
src/conf/virdomainobjlist.h
View File

@ -20,10 +20,9 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_VIRDOMAINOBJLIST_H #pragma once
# define LIBVIRT_VIRDOMAINOBJLIST_H
# include "domain_conf.h" #include "domain_conf.h"
typedef struct _virDomainObjList virDomainObjList; typedef struct _virDomainObjList virDomainObjList;
typedef virDomainObjList *virDomainObjListPtr; typedef virDomainObjList *virDomainObjListPtr;
@ -95,33 +94,33 @@ int virDomainObjListForEach(virDomainObjListPtr doms,
virDomainObjListIterator callback, virDomainObjListIterator callback,
void *opaque); void *opaque);
# define VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE \ #define VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE \
(VIR_CONNECT_LIST_DOMAINS_ACTIVE | \ (VIR_CONNECT_LIST_DOMAINS_ACTIVE | \
VIR_CONNECT_LIST_DOMAINS_INACTIVE) VIR_CONNECT_LIST_DOMAINS_INACTIVE)
# define VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT \ #define VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT \
(VIR_CONNECT_LIST_DOMAINS_PERSISTENT | \ (VIR_CONNECT_LIST_DOMAINS_PERSISTENT | \
VIR_CONNECT_LIST_DOMAINS_TRANSIENT) VIR_CONNECT_LIST_DOMAINS_TRANSIENT)
# define VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE \ #define VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE \
(VIR_CONNECT_LIST_DOMAINS_RUNNING | \ (VIR_CONNECT_LIST_DOMAINS_RUNNING | \
VIR_CONNECT_LIST_DOMAINS_PAUSED | \ VIR_CONNECT_LIST_DOMAINS_PAUSED | \
VIR_CONNECT_LIST_DOMAINS_SHUTOFF | \ VIR_CONNECT_LIST_DOMAINS_SHUTOFF | \
VIR_CONNECT_LIST_DOMAINS_OTHER) VIR_CONNECT_LIST_DOMAINS_OTHER)
# define VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE \ #define VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE \
(VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE | \ (VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE | \
VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE) VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE)
# define VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART \ #define VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART \
(VIR_CONNECT_LIST_DOMAINS_AUTOSTART | \ (VIR_CONNECT_LIST_DOMAINS_AUTOSTART | \
VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART) VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART)
# define VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT \ #define VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT \
(VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT | \ (VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT | \
VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT) VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT)
# define VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL \ #define VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL \
(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | \ (VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | \
VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | \ VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | \
VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE | \ VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE | \
@ -149,5 +148,3 @@ int virDomainObjListConvert(virDomainObjListPtr domlist,
virDomainObjListACLFilter filter, virDomainObjListACLFilter filter,
unsigned int flags, unsigned int flags,
bool skip_missing); bool skip_missing);
#endif /* LIBVIRT_VIRDOMAINOBJLIST_H */

21
src/conf/virdomainsnapshotobjlist.h
View File

@ -20,12 +20,11 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_VIRDOMAINSNAPSHOTOBJLIST_H #pragma once
# define LIBVIRT_VIRDOMAINSNAPSHOTOBJLIST_H
# include "internal.h" #include "internal.h"
# include "virdomainmomentobjlist.h" #include "virdomainmomentobjlist.h"
# include "virbuffer.h" #include "virbuffer.h"
virDomainSnapshotObjListPtr virDomainSnapshotObjListNew(void); virDomainSnapshotObjListPtr virDomainSnapshotObjListNew(void);
void virDomainSnapshotObjListFree(virDomainSnapshotObjListPtr snapshots); void virDomainSnapshotObjListFree(virDomainSnapshotObjListPtr snapshots);
@ -54,24 +53,24 @@ int virDomainSnapshotForEach(virDomainSnapshotObjListPtr snapshots,
void *data); void *data);
int virDomainSnapshotUpdateRelations(virDomainSnapshotObjListPtr snapshots); int virDomainSnapshotUpdateRelations(virDomainSnapshotObjListPtr snapshots);
# define VIR_DOMAIN_SNAPSHOT_FILTERS_METADATA \ #define VIR_DOMAIN_SNAPSHOT_FILTERS_METADATA \
(VIR_DOMAIN_SNAPSHOT_LIST_METADATA | \ (VIR_DOMAIN_SNAPSHOT_LIST_METADATA | \
VIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA) VIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA)
# define VIR_DOMAIN_SNAPSHOT_FILTERS_LEAVES \ #define VIR_DOMAIN_SNAPSHOT_FILTERS_LEAVES \
(VIR_DOMAIN_SNAPSHOT_LIST_LEAVES | \ (VIR_DOMAIN_SNAPSHOT_LIST_LEAVES | \
VIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES) VIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES)
# define VIR_DOMAIN_SNAPSHOT_FILTERS_STATUS \ #define VIR_DOMAIN_SNAPSHOT_FILTERS_STATUS \
(VIR_DOMAIN_SNAPSHOT_LIST_INACTIVE | \ (VIR_DOMAIN_SNAPSHOT_LIST_INACTIVE | \
VIR_DOMAIN_SNAPSHOT_LIST_ACTIVE | \ VIR_DOMAIN_SNAPSHOT_LIST_ACTIVE | \
VIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY) VIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY)
# define VIR_DOMAIN_SNAPSHOT_FILTERS_LOCATION \ #define VIR_DOMAIN_SNAPSHOT_FILTERS_LOCATION \
(VIR_DOMAIN_SNAPSHOT_LIST_INTERNAL | \ (VIR_DOMAIN_SNAPSHOT_LIST_INTERNAL | \
VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL) VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL)
# define VIR_DOMAIN_SNAPSHOT_FILTERS_ALL \ #define VIR_DOMAIN_SNAPSHOT_FILTERS_ALL \
(VIR_DOMAIN_SNAPSHOT_FILTERS_METADATA | \ (VIR_DOMAIN_SNAPSHOT_FILTERS_METADATA | \
VIR_DOMAIN_SNAPSHOT_FILTERS_LEAVES | \ VIR_DOMAIN_SNAPSHOT_FILTERS_LEAVES | \
VIR_DOMAIN_SNAPSHOT_FILTERS_STATUS | \ VIR_DOMAIN_SNAPSHOT_FILTERS_STATUS | \
@ -89,5 +88,3 @@ virDomainSnapshotObjGetDef(virDomainMomentObjPtr obj)
{ {
return (virDomainSnapshotDefPtr) obj->def; return (virDomainSnapshotDefPtr) obj->def;
} }
#endif /* LIBVIRT_VIRDOMAINSNAPSHOTOBJLIST_H */

7
src/conf/virinterfaceobj.h
View File

@ -17,10 +17,9 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_VIRINTERFACEOBJ_H #pragma once
# define LIBVIRT_VIRINTERFACEOBJ_H
# include "internal.h" #include "internal.h"
typedef struct _virInterfaceObj virInterfaceObj; typedef struct _virInterfaceObj virInterfaceObj;
typedef virInterfaceObj *virInterfaceObjPtr; typedef virInterfaceObj *virInterfaceObjPtr;
@ -88,5 +87,3 @@ virInterfaceObjListExport(virConnectPtr conn,
virInterfacePtr **ifaces, virInterfacePtr **ifaces,
virInterfaceObjListFilter filter, virInterfaceObjListFilter filter,
unsigned int flags); unsigned int flags);
#endif /* LIBVIRT_VIRINTERFACEOBJ_H */

13
src/conf/virsavecookie.h
View File

@ -18,14 +18,13 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_VIRSAVECOOKIE_H #pragma once
# define LIBVIRT_VIRSAVECOOKIE_H
# include <libxml/xpath.h> #include <libxml/xpath.h>
# include "internal.h" #include "internal.h"
# include "virobject.h" #include "virobject.h"
# include "virbuffer.h" #include "virbuffer.h"
typedef int (*virSaveCookieParseFunc)(xmlXPathContextPtr ctxt, typedef int (*virSaveCookieParseFunc)(xmlXPathContextPtr ctxt,
@ -59,5 +58,3 @@ virSaveCookieFormatBuf(virBufferPtr buf,
char * char *
virSaveCookieFormat(virObjectPtr obj, virSaveCookieFormat(virObjectPtr obj,
virSaveCookieCallbacksPtr saveCookie); virSaveCookieCallbacksPtr saveCookie);
#endif /* LIBVIRT_VIRSAVECOOKIE_H */

11
src/conf/virsecretobj.h
View File

@ -18,13 +18,12 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_VIRSECRETOBJ_H #pragma once
# define LIBVIRT_VIRSECRETOBJ_H
# include "internal.h" #include "internal.h"
# include "secret_conf.h" #include "secret_conf.h"
# include "virobject.h" #include "virobject.h"
typedef struct _virSecretObj virSecretObj; typedef struct _virSecretObj virSecretObj;
typedef virSecretObj *virSecretObjPtr; typedef virSecretObj *virSecretObjPtr;
@ -117,5 +116,3 @@ virSecretObjSetValueSize(virSecretObjPtr obj,
int int
virSecretLoadAllConfigs(virSecretObjListPtr secrets, virSecretLoadAllConfigs(virSecretObjListPtr secrets,
const char *configDir); const char *configDir);
#endif /* LIBVIRT_VIRSECRETOBJ_H */