External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: storage: 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:20 -05:00 committed by Ján Tomko
parent 787be820f3
commit 5ef190a4d2
5 changed files with 31 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/conf/storage_adapter_conf.h
View File

@ -17,12 +17,11 @@
* <http://www.gnu.org/licenses/>.
*/
#ifndef LIBVIRT_STORAGE_ADAPTER_CONF_H
# define LIBVIRT_STORAGE_ADAPTER_CONF_H
#pragma once
# include "virpci.h"
# include "virxml.h"
# include "virenum.h"
#include "virpci.h"
#include "virxml.h"
#include "virenum.h"
typedef enum {
@ -81,5 +80,3 @@ virStorageAdapterValidate(virStorageAdapterPtr adapter);
void
virStorageAdapterFormat(virBufferPtr buf,
virStorageAdapterPtr adapter);
#endif /* LIBVIRT_STORAGE_ADAPTER_CONF_H */

8
src/conf/storage_capabilities.h
View File

@ -18,10 +18,9 @@
* <http://www.gnu.org/licenses/>.
*/
#ifndef LIBVIRT_STORAGE_CAPABILITIES_H
# define LIBVIRT_STORAGE_CAPABILITIES_H
#pragma once
# include "internal.h"
#include "internal.h"
typedef struct _virStoragePoolCaps virStoragePoolCaps;
typedef virStoragePoolCaps *virStoragePoolCapsPtr;
@ -36,6 +35,3 @@ virStoragePoolCapsNew(virCapsPtr driverCaps);
char *
virStoragePoolCapsFormat(virStoragePoolCapsPtr const caps);
#endif /* LIBVIRT_STORAGE_CAPABILITIES_H */

37
src/conf/storage_conf.h
View File

@ -19,21 +19,20 @@
* <http://www.gnu.org/licenses/>.
*/
#ifndef LIBVIRT_STORAGE_CONF_H
# define LIBVIRT_STORAGE_CONF_H
#pragma once
# include "internal.h"
# include "virstorageencryption.h"
# include "virstoragefile.h"
# include "virbitmap.h"
# include "virthread.h"
# include "device_conf.h"
# include "object_event.h"
# include "storage_adapter_conf.h"
# include "virautoclean.h"
# include "virenum.h"
#include "internal.h"
#include "virstorageencryption.h"
#include "virstoragefile.h"
#include "virbitmap.h"
#include "virthread.h"
#include "device_conf.h"
#include "object_event.h"
#include "storage_adapter_conf.h"
#include "virautoclean.h"
#include "virenum.h"
# include <libxml/tree.h>
#include <libxml/tree.h>
/* Various callbacks needed to parse/create Storage Pool XML's using
* a private namespace */
@ -460,19 +459,19 @@ typedef enum {
} virStoragePartedFsType;
VIR_ENUM_DECL(virStoragePartedFs);
# define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE \
#define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE \
(VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE | \
VIR_CONNECT_LIST_STORAGE_POOLS_INACTIVE)
# define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_PERSISTENT \
#define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_PERSISTENT \
(VIR_CONNECT_LIST_STORAGE_POOLS_PERSISTENT | \
VIR_CONNECT_LIST_STORAGE_POOLS_TRANSIENT)
# define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_AUTOSTART \
#define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_AUTOSTART \
(VIR_CONNECT_LIST_STORAGE_POOLS_AUTOSTART | \
VIR_CONNECT_LIST_STORAGE_POOLS_NO_AUTOSTART)
# define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_POOL_TYPE \
#define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_POOL_TYPE \
(VIR_CONNECT_LIST_STORAGE_POOLS_DIR | \
VIR_CONNECT_LIST_STORAGE_POOLS_FS | \
VIR_CONNECT_LIST_STORAGE_POOLS_NETFS | \
@ -487,7 +486,7 @@ VIR_ENUM_DECL(virStoragePartedFs);
VIR_CONNECT_LIST_STORAGE_POOLS_ZFS | \
VIR_CONNECT_LIST_STORAGE_POOLS_VSTORAGE)
# define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ALL \
#define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ALL \
(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE | \
VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_PERSISTENT | \
VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_AUTOSTART | \
@ -496,5 +495,3 @@ VIR_ENUM_DECL(virStoragePartedFs);
VIR_DEFINE_AUTOPTR_FUNC(virStoragePoolSource, virStoragePoolSourceFree);
VIR_DEFINE_AUTOPTR_FUNC(virStoragePoolDef, virStoragePoolDefFree);
VIR_DEFINE_AUTOPTR_FUNC(virStorageVolDef, virStorageVolDefFree);
#endif /* LIBVIRT_STORAGE_CONF_H */

11
src/conf/storage_event.h
View File

@ -20,12 +20,11 @@
* <http://www.gnu.org/licenses/>.
*/
#ifndef LIBVIRT_STORAGE_EVENT_H
# define LIBVIRT_STORAGE_EVENT_H
#pragma once
# include "internal.h"
# include "object_event.h"
# include "object_event_private.h"
#include "internal.h"
#include "object_event.h"
#include "object_event_private.h"
int
virStoragePoolEventStateRegisterID(virConnectPtr conn,
@ -60,5 +59,3 @@ virStoragePoolEventLifecycleNew(const char *name,
virObjectEventPtr
virStoragePoolEventRefreshNew(const char *name,
const unsigned char *uuid);
#endif /* LIBVIRT_STORAGE_EVENT_H */

11
src/conf/virstorageobj.h
View File

@ -17,14 +17,13 @@
* <http://www.gnu.org/licenses/>.
*/
#ifndef LIBVIRT_VIRSTORAGEOBJ_H
# define LIBVIRT_VIRSTORAGEOBJ_H
#pragma once
# include "internal.h"
#include "internal.h"
# include "storage_conf.h"
#include "storage_conf.h"
# include "capabilities.h"
#include "capabilities.h"
typedef struct _virStoragePoolObj virStoragePoolObj;
typedef virStoragePoolObj *virStoragePoolObjPtr;
@ -256,5 +255,3 @@ virStoragePoolObjListExport(virConnectPtr conn,
virStoragePoolPtr **pools,
virStoragePoolObjListFilter filter,
unsigned int flags);
#endif /* LIBVIRT_VIRSTORAGEOBJ_H */