NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

src/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-18 11:12:42 -05:00 committed by Ján Tomko
parent 55474a8ce7
commit 9dd2915056
18 changed files with 39 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/storage/storage_backend.h
View File

@ -16,14 +16,13 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_STORAGE_BACKEND_H #pragma once
# define LIBVIRT_STORAGE_BACKEND_H
# include <sys/stat.h> #include <sys/stat.h>
# include "internal.h" #include "internal.h"
# include "virstorageobj.h" #include "virstorageobj.h"
# include "storage_driver.h" #include "storage_driver.h"
typedef char * (*virStorageBackendFindPoolSources)(const char *srcSpec, typedef char * (*virStorageBackendFindPoolSources)(const char *srcSpec,
unsigned int flags); unsigned int flags);
@ -128,5 +127,3 @@ int virStorageBackendRegister(virStorageBackendPtr backend);
virCapsPtr virCapsPtr
virStorageBackendGetCapabilities(void); virStorageBackendGetCapabilities(void);
#endif /* LIBVIRT_STORAGE_BACKEND_H */

5
src/storage/storage_backend_disk.h
View File

@ -19,9 +19,6 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_STORAGE_BACKEND_DISK_H #pragma once
# define LIBVIRT_STORAGE_BACKEND_DISK_H
int virStorageBackendDiskRegister(void); int virStorageBackendDiskRegister(void);
#endif /* LIBVIRT_STORAGE_BACKEND_DISK_H */

5
src/storage/storage_backend_fs.h
View File

@ -19,9 +19,6 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_STORAGE_BACKEND_FS_H #pragma once
# define LIBVIRT_STORAGE_BACKEND_FS_H
int virStorageBackendFsRegister(void); int virStorageBackendFsRegister(void);
#endif /* LIBVIRT_STORAGE_BACKEND_FS_H */

5
src/storage/storage_backend_gluster.h
View File

@ -19,9 +19,6 @@
* *
*/ */
#ifndef LIBVIRT_STORAGE_BACKEND_GLUSTER_H #pragma once
# define LIBVIRT_STORAGE_BACKEND_GLUSTER_H
int virStorageBackendGlusterRegister(void); int virStorageBackendGlusterRegister(void);
#endif /* LIBVIRT_STORAGE_BACKEND_GLUSTER_H */

5
src/storage/storage_backend_iscsi.h
View File

@ -19,9 +19,6 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_STORAGE_BACKEND_ISCSI_H #pragma once
# define LIBVIRT_STORAGE_BACKEND_ISCSI_H
int virStorageBackendISCSIRegister(void); int virStorageBackendISCSIRegister(void);
#endif /* LIBVIRT_STORAGE_BACKEND_ISCSI_H */

5
src/storage/storage_backend_iscsi_direct.h
View File

@ -14,9 +14,6 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_STORAGE_BACKEND_ISCSI_DIRECT_H #pragma once
# define LIBVIRT_STORAGE_BACKEND_ISCSI_DIRECT_H
int virStorageBackendISCSIDirectRegister(void); int virStorageBackendISCSIDirectRegister(void);
#endif /* LIBVIRT_STORAGE_BACKEND_ISCSI_DIRECT_H */

5
src/storage/storage_backend_logical.h
View File

@ -19,9 +19,6 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_STORAGE_BACKEND_LOGICAL_H #pragma once
# define LIBVIRT_STORAGE_BACKEND_LOGICAL_H
int virStorageBackendLogicalRegister(void); int virStorageBackendLogicalRegister(void);
#endif /* LIBVIRT_STORAGE_BACKEND_LOGICAL_H */

5
src/storage/storage_backend_mpath.h
View File

@ -19,9 +19,6 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_STORAGE_BACKEND_MPATH_H #pragma once
# define LIBVIRT_STORAGE_BACKEND_MPATH_H
int virStorageBackendMpathRegister(void); int virStorageBackendMpathRegister(void);
#endif /* LIBVIRT_STORAGE_BACKEND_MPATH_H */

5
src/storage/storage_backend_rbd.h
View File

@ -18,9 +18,6 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_STORAGE_BACKEND_RBD_H #pragma once
# define LIBVIRT_STORAGE_BACKEND_RBD_H
int virStorageBackendRBDRegister(void); int virStorageBackendRBDRegister(void);
#endif /* LIBVIRT_STORAGE_BACKEND_RBD_H */

5
src/storage/storage_backend_scsi.h
View File

@ -19,9 +19,6 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_STORAGE_BACKEND_SCSI_H #pragma once
# define LIBVIRT_STORAGE_BACKEND_SCSI_H
int virStorageBackendSCSIRegister(void); int virStorageBackendSCSIRegister(void);
#endif /* LIBVIRT_STORAGE_BACKEND_SCSI_H */

5
src/storage/storage_backend_sheepdog.h
View File

@ -20,9 +20,6 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_STORAGE_BACKEND_SHEEPDOG_H #pragma once
# define LIBVIRT_STORAGE_BACKEND_SHEEPDOG_H
int virStorageBackendSheepdogRegister(void); int virStorageBackendSheepdogRegister(void);
#endif /* LIBVIRT_STORAGE_BACKEND_SHEEPDOG_H */

7
src/storage/storage_backend_sheepdog_priv.h
View File

@ -20,14 +20,11 @@
# error "storage_backend_sheepdog_priv.h may only be included by storage_backend_sheepdog.c or test suites" # error "storage_backend_sheepdog_priv.h may only be included by storage_backend_sheepdog.c or test suites"
#endif /* LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H_ALLOW */ #endif /* LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H_ALLOW */
#ifndef LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H #pragma once
# define LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H
# include "conf/storage_conf.h" #include "conf/storage_conf.h"
int virStorageBackendSheepdogParseNodeInfo(virStoragePoolDefPtr pool, int virStorageBackendSheepdogParseNodeInfo(virStoragePoolDefPtr pool,
char *output); char *output);
int virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, int virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol,
char *output); char *output);
#endif /* LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H */

5
src/storage/storage_backend_vstorage.h
View File

@ -18,9 +18,6 @@
* *
*/ */
#ifndef LIBVIRT_STORAGE_BACKEND_VSTORAGE_H #pragma once
# define LIBVIRT_STORAGE_BACKEND_VSTORAGE_H
int virStorageBackendVstorageRegister(void); int virStorageBackendVstorageRegister(void);
#endif /* LIBVIRT_STORAGE_BACKEND_VSTORAGE_H */

5
src/storage/storage_backend_zfs.h
View File

@ -19,9 +19,6 @@
* *
*/ */
#ifndef LIBVIRT_STORAGE_BACKEND_ZFS_H #pragma once
# define LIBVIRT_STORAGE_BACKEND_ZFS_H
int virStorageBackendZFSRegister(void); int virStorageBackendZFSRegister(void);
#endif /* LIBVIRT_STORAGE_BACKEND_ZFS_H */

11
src/storage/storage_driver.h
View File

@ -19,13 +19,12 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_STORAGE_DRIVER_H #pragma once
# define LIBVIRT_STORAGE_DRIVER_H
# include <sys/stat.h> #include <sys/stat.h>
# include "domain_conf.h" #include "domain_conf.h"
# include "virstorageobj.h" #include "virstorageobj.h"
virStoragePoolObjPtr virStoragePoolObjFindPoolByUUID(const unsigned char *uuid) virStoragePoolObjPtr virStoragePoolObjFindPoolByUUID(const unsigned char *uuid)
ATTRIBUTE_NONNULL(1); ATTRIBUTE_NONNULL(1);
@ -41,5 +40,3 @@ char *virStoragePoolObjBuildTempFilePath(virStoragePoolObjPtr obj,
int storageRegister(void); int storageRegister(void);
int storageRegisterAll(void); int storageRegisterAll(void);
#endif /* LIBVIRT_STORAGE_DRIVER_H */

5
src/storage/storage_file_fs.h
View File

@ -18,9 +18,6 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_STORAGE_FILE_FS_H #pragma once
# define LIBVIRT_STORAGE_FILE_FS_H
int virStorageFileFsRegister(void); int virStorageFileFsRegister(void);
#endif /* LIBVIRT_STORAGE_FILE_FS_H */

5
src/storage/storage_file_gluster.h
View File

@ -19,9 +19,6 @@
* *
*/ */
#ifndef LIBVIRT_STORAGE_FILE_GLUSTER_H #pragma once
# define LIBVIRT_STORAGE_FILE_GLUSTER_H
int virStorageFileGlusterRegister(void); int virStorageFileGlusterRegister(void);
#endif /* LIBVIRT_STORAGE_FILE_GLUSTER_H */

31
src/storage/storage_util.h
View File

@ -16,15 +16,14 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_STORAGE_UTIL_H #pragma once
# define LIBVIRT_STORAGE_UTIL_H
# include <sys/stat.h> #include <sys/stat.h>
# include "internal.h" #include "internal.h"
# include "vircommand.h" #include "vircommand.h"
# include "storage_driver.h" #include "storage_driver.h"
# include "storage_backend.h" #include "storage_backend.h"
/* Storage Pool Namespace options to share w/ storage_backend_fs.c and /* Storage Pool Namespace options to share w/ storage_backend_fs.c and
* the virStorageBackendFileSystemMountCmd method */ * the virStorageBackendFileSystemMountCmd method */
@ -138,21 +137,21 @@ enum {
VIR_STORAGE_VOL_READ_NOERROR = 1 << 0, /* ignore *read errors */ VIR_STORAGE_VOL_READ_NOERROR = 1 << 0, /* ignore *read errors */
}; };
# define VIR_STORAGE_VOL_OPEN_DEFAULT (VIR_STORAGE_VOL_OPEN_REG |\ #define VIR_STORAGE_VOL_OPEN_DEFAULT (VIR_STORAGE_VOL_OPEN_REG |\
VIR_STORAGE_VOL_OPEN_BLOCK) VIR_STORAGE_VOL_OPEN_BLOCK)
# define VIR_STORAGE_VOL_FS_OPEN_FLAGS (VIR_STORAGE_VOL_OPEN_DEFAULT | \ #define VIR_STORAGE_VOL_FS_OPEN_FLAGS (VIR_STORAGE_VOL_OPEN_DEFAULT | \
VIR_STORAGE_VOL_OPEN_DIR) VIR_STORAGE_VOL_OPEN_DIR)
# define VIR_STORAGE_VOL_FS_PROBE_FLAGS (VIR_STORAGE_VOL_FS_OPEN_FLAGS | \ #define VIR_STORAGE_VOL_FS_PROBE_FLAGS (VIR_STORAGE_VOL_FS_OPEN_FLAGS | \
VIR_STORAGE_VOL_OPEN_NOERROR) VIR_STORAGE_VOL_OPEN_NOERROR)
int virStorageBackendVolOpen(const char *path, struct stat *sb, int virStorageBackendVolOpen(const char *path, struct stat *sb,
unsigned int flags) unsigned int flags)
ATTRIBUTE_RETURN_CHECK ATTRIBUTE_RETURN_CHECK
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
# define VIR_STORAGE_DEFAULT_POOL_PERM_MODE 0711 #define VIR_STORAGE_DEFAULT_POOL_PERM_MODE 0711
# define VIR_STORAGE_DEFAULT_VOL_PERM_MODE 0600 #define VIR_STORAGE_DEFAULT_VOL_PERM_MODE 0600
int virStorageBackendUpdateVolInfo(virStorageVolDefPtr vol, int virStorageBackendUpdateVolInfo(virStorageVolDefPtr vol,
bool withBlockVolFormat, bool withBlockVolFormat,
@ -203,5 +202,3 @@ virCommandPtr
virStorageBackendLogicalChangeCmd(const char *cmdstr, virStorageBackendLogicalChangeCmd(const char *cmdstr,
virStoragePoolDefPtr def, virStoragePoolDefPtr def,
bool on); bool on);
#endif /* LIBVIRT_STORAGE_UTIL_H */