conf: use typedefs for enums in "src/conf/storage_conf.h"

In "src/conf/" there are many enumeration (enum) declarations.
Similar to the recent cleanup to "src/util" directory, it's
better to use a typedef for variable types, function types and
other usages. Other enumeration and folders will be changed to
typedef's in the future. Most of the files changed in this
commit are related to storage (storage_conf) enums.

Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index a92f0f3a1fdf86d06f03526a4779dcecbf834d2b..63c4577ff65fa85452c59571be3b104e6c37c2c2 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -607,7 +607,7 @@ struct _virDomainDiskDef {
     int removable; /* enum virDomainFeatureState */
 
     char *mirror;
-    int mirrorFormat; /* enum virStorageFileFormat */
+    int mirrorFormat; /* virStorageFileFormat */
     bool mirroring;
 
     struct {
@@ -776,7 +776,7 @@ struct _virDomainFSDef {
     int fsdriver; /* enum virDomainFSDriverType */
     int accessmode; /* enum virDomainFSAccessMode */
     int wrpolicy; /* enum virDomainFSWrpolicy */
-    int format; /* enum virStorageFileFormat */
+    int format; /* virStorageFileFormat */
     unsigned long long usage; /* in bytes */
     char *src;
     char *dst;

diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index eae959c9ffc830ff4d197c0b31498241f7568ddb..b10d4f26b096c859bb3500ba08d98209999a327b 100644 (file)
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -51,7 +51,7 @@ struct _virStorageVolSource {
     int nextent;
     virStorageVolSourceExtentPtr extents;
 
-    int partType; /* enum virStorageVolTypeDisk, only used by disk
+    int partType; /* virStorageVolTypeDisk, only used by disk
                    * backend for partition type creation */
 };
 
@@ -61,7 +61,7 @@ typedef virStorageVolDef *virStorageVolDefPtr;
 struct _virStorageVolDef {
     char *name;
     char *key;
-    int type; /* enum virStorageVolType */
+    int type; /* virStorageVolType */
 
     unsigned int building;
     unsigned int in_use;
@@ -80,7 +80,7 @@ struct _virStorageVolDefList {
 
 VIR_ENUM_DECL(virStorageVol)
 
-enum virStoragePoolType {
+typedef enum {
     VIR_STORAGE_POOL_DIR,      /* Local directory */
     VIR_STORAGE_POOL_FS,       /* Local filesystem */
     VIR_STORAGE_POOL_NETFS,    /* Networked filesystem - eg NFS, GFS, etc */
@@ -94,25 +94,25 @@ enum virStoragePoolType {
     VIR_STORAGE_POOL_GLUSTER,  /* Gluster device */
 
     VIR_STORAGE_POOL_LAST,
-};
+} virStoragePoolType;
 
 VIR_ENUM_DECL(virStoragePool)
 
-enum virStoragePoolDeviceType {
+typedef enum {
     VIR_STORAGE_DEVICE_TYPE_DISK = 0x00,
     VIR_STORAGE_DEVICE_TYPE_ROM = 0x05,
 
     VIR_STORAGE_DEVICE_TYPE_LAST,
-};
+} virStoragePoolDeviceType;
 
 
-enum virStoragePoolAuthType {
+typedef enum {
     VIR_STORAGE_POOL_AUTH_NONE,
     VIR_STORAGE_POOL_AUTH_CHAP,
     VIR_STORAGE_POOL_AUTH_CEPHX,
 
     VIR_STORAGE_POOL_AUTH_LAST,
-};
+} virStoragePoolAuthType;
 VIR_ENUM_DECL(virStoragePoolAuthType)
 
 typedef struct _virStoragePoolAuthSecret virStoragePoolAuthSecret;
@@ -152,12 +152,12 @@ struct _virStoragePoolSourceHost {
  * For MSDOS partitions, the free area is important when
  * creating logical partitions
  */
-enum virStorageFreeType {
+typedef enum {
     VIR_STORAGE_FREE_NONE = 0,
     VIR_STORAGE_FREE_NORMAL,
     VIR_STORAGE_FREE_LOGICAL,
     VIR_STORAGE_FREE_LAST
-};
+} virStorageFreeType;
 
 /*
  * Available extents on the underlying storage
@@ -167,7 +167,7 @@ typedef virStoragePoolSourceDeviceExtent *virStoragePoolSourceDeviceExtentPtr;
 struct _virStoragePoolSourceDeviceExtent {
     unsigned long long start;
     unsigned long long end;
-    int type; /* enum virStorageFreeType */
+    int type; /* virStorageFreeType */
 };
 
 typedef struct _virStoragePoolSourceInitiatorAttr virStoragePoolSourceInitiatorAttr;
@@ -197,18 +197,18 @@ struct _virStoragePoolSourceDevice {
     } geometry;
 };
 
-enum virStoragePoolSourceAdapterType {
+typedef enum {
     VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_DEFAULT = 0,
     VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_SCSI_HOST,
     VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_FC_HOST,
 
     VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_LAST,
-};
+} virStoragePoolSourceAdapterType;
 VIR_ENUM_DECL(virStoragePoolSourceAdapterType)
 
 typedef struct _virStoragePoolSourceAdapter virStoragePoolSourceAdapter;
 struct _virStoragePoolSourceAdapter {
-    int type; /* enum virStoragePoolSourceAdapterType */
+    int type; /* virStoragePoolSourceAdapterType */
 
     union {
         char *name;
@@ -273,7 +273,7 @@ typedef virStoragePoolDef *virStoragePoolDefPtr;
 struct _virStoragePoolDef {
     char *name;
     unsigned char uuid[VIR_UUID_BUFLEN];
-    int type; /* enum virStoragePoolType */
+    int type; /* virStoragePoolType */
 
     unsigned long long allocation; /* bytes */
     unsigned long long capacity; /* bytes */
@@ -420,7 +420,7 @@ void virStoragePoolObjLock(virStoragePoolObjPtr obj);
 void virStoragePoolObjUnlock(virStoragePoolObjPtr obj);
 
 
-enum virStoragePoolFormatFileSystem {
+typedef enum {
     VIR_STORAGE_POOL_FS_AUTO = 0,
     VIR_STORAGE_POOL_FS_EXT2,
     VIR_STORAGE_POOL_FS_EXT3,
@@ -435,19 +435,19 @@ enum virStoragePoolFormatFileSystem {
     VIR_STORAGE_POOL_FS_XFS,
     VIR_STORAGE_POOL_FS_OCFS2,
     VIR_STORAGE_POOL_FS_LAST,
-};
+} virStoragePoolFormatFileSystem;
 VIR_ENUM_DECL(virStoragePoolFormatFileSystem)
 
-enum virStoragePoolFormatFileSystemNet {
+typedef enum {
     VIR_STORAGE_POOL_NETFS_AUTO = 0,
     VIR_STORAGE_POOL_NETFS_NFS,
     VIR_STORAGE_POOL_NETFS_GLUSTERFS,
     VIR_STORAGE_POOL_NETFS_CIFS,
     VIR_STORAGE_POOL_NETFS_LAST,
-};
+} virStoragePoolFormatFileSystemNet;
 VIR_ENUM_DECL(virStoragePoolFormatFileSystemNet)
 
-enum virStoragePoolFormatDisk {
+typedef enum {
     VIR_STORAGE_POOL_DISK_UNKNOWN = 0,
     VIR_STORAGE_POOL_DISK_DOS = 1,
     VIR_STORAGE_POOL_DISK_DVH,
@@ -458,14 +458,14 @@ enum virStoragePoolFormatDisk {
     VIR_STORAGE_POOL_DISK_SUN,
     VIR_STORAGE_POOL_DISK_LVM2,
     VIR_STORAGE_POOL_DISK_LAST,
-};
+} virStoragePoolFormatDisk;
 VIR_ENUM_DECL(virStoragePoolFormatDisk)
 
-enum virStoragePoolFormatLogical {
+typedef enum {
     VIR_STORAGE_POOL_LOGICAL_UNKNOWN = 0,
     VIR_STORAGE_POOL_LOGICAL_LVM2 = 1,
     VIR_STORAGE_POOL_LOGICAL_LAST,
-};
+} virStoragePoolFormatLogical;
 VIR_ENUM_DECL(virStoragePoolFormatLogical)
 
 /*
@@ -477,7 +477,7 @@ VIR_ENUM_DECL(virStoragePoolFormatLogical)
  *
  * So this is a semi-generic set
  */
-enum virStorageVolFormatDisk {
+typedef enum {
     VIR_STORAGE_VOL_DISK_NONE = 0,
     VIR_STORAGE_VOL_DISK_LINUX,
     VIR_STORAGE_VOL_DISK_FAT16,
@@ -487,22 +487,22 @@ enum virStorageVolFormatDisk {
     VIR_STORAGE_VOL_DISK_LINUX_RAID,
     VIR_STORAGE_VOL_DISK_EXTENDED,
     VIR_STORAGE_VOL_DISK_LAST,
-};
+} virStorageVolFormatDisk;
 VIR_ENUM_DECL(virStorageVolFormatDisk)
 
-enum virStorageVolTypeDisk {
+typedef enum {
     VIR_STORAGE_VOL_DISK_TYPE_NONE = 0,
     VIR_STORAGE_VOL_DISK_TYPE_PRIMARY,
     VIR_STORAGE_VOL_DISK_TYPE_LOGICAL,
     VIR_STORAGE_VOL_DISK_TYPE_EXTENDED,
     VIR_STORAGE_VOL_DISK_TYPE_LAST,
-};
+} virStorageVolTypeDisk;
 
 /*
  * Mapping of Parted fs-types MUST be kept in the
  * same order as virStorageVolFormatDisk
  */
-enum virStoragePartedFsType {
+typedef enum {
     VIR_STORAGE_PARTED_FS_TYPE_NONE = 0,
     VIR_STORAGE_PARTED_FS_TYPE_LINUX,
     VIR_STORAGE_PARTED_FS_TYPE_FAT16,
@@ -512,7 +512,7 @@ enum virStoragePartedFsType {
     VIR_STORAGE_PARTED_FS_TYPE_LINUX_RAID,
     VIR_STORAGE_PARTED_FS_TYPE_EXTENDED,
     VIR_STORAGE_PARTED_FS_TYPE_LAST,
-};
+} virStoragePartedFsType;
 VIR_ENUM_DECL(virStoragePartedFsType)
 
 # define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE   \

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index e487f5e1ffb0cc1826881acad45ff935aa774efe..400c99ca51ec0a158bad8d8180ea92ce35c3f090 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -1316,7 +1316,7 @@ qemuTranslateDiskSourcePool(virConnectPtr conn,
     virStorageNetHostDefFree(def->src.nhosts, def->src.hosts);
     virStorageSourceAuthClear(&def->src);
 
-    switch ((enum virStoragePoolType) pooldef->type) {
+    switch ((virStoragePoolType) pooldef->type) {
     case VIR_STORAGE_POOL_DIR:
     case VIR_STORAGE_POOL_FS:
     case VIR_STORAGE_POOL_NETFS:

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 67494a3aefabcd8e48873a33bb8c4b462b0b32f3..f58e0a4ec6a8162f990dbce92e2f7e682c2fb80f 100644 (file)
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -1483,7 +1483,7 @@ storageVolLookupByPath(virConnectPtr conn,
            continue;
         }
 
-        switch ((enum virStoragePoolType) pool->def->type) {
+        switch ((virStoragePoolType) pool->def->type) {
             case VIR_STORAGE_POOL_DIR:
             case VIR_STORAGE_POOL_FS:
             case VIR_STORAGE_POOL_NETFS:
@@ -2096,7 +2096,7 @@ storageVolUpload(virStorageVolPtr obj,
         goto cleanup;
     }
 
-    switch ((enum virStoragePoolType) pool->def->type) {
+    switch ((virStoragePoolType) pool->def->type) {
     case VIR_STORAGE_POOL_DIR:
     case VIR_STORAGE_POOL_FS:
     case VIR_STORAGE_POOL_NETFS:

diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 60724098822c5793e8c088e7fafdeb02e5dcc14e..e32389e36fc2eb52eb724b063da42675bafe4c1d 100644 (file)
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -150,7 +150,7 @@ typedef virStorageNetHostDef *virStorageNetHostDefPtr;
 struct _virStorageNetHostDef {
     char *name;
     char *port;
-    int transport; /* enum virStorageNetHostTransport */
+    int transport; /* virStorageNetHostTransport */
     char *socket;  /* path to unix socket */
 };
 
@@ -182,10 +182,10 @@ typedef struct _virStorageSourcePoolDef virStorageSourcePoolDef;
 struct _virStorageSourcePoolDef {
     char *pool; /* pool name */
     char *volume; /* volume name */
-    int voltype; /* enum virStorageVolType, internal only */
-    int pooltype; /* enum virStoragePoolType, internal only */
-    int actualtype; /* enum virStorageType, internal only */
-    int mode; /* enum virStorageSourcePoolMode */
+    int voltype; /* virStorageVolType, internal only */
+    int pooltype; /* virStoragePoolType, internal only */
+    int actualtype; /* virStorageType, internal only */
+    int mode; /* virStorageSourcePoolMode */
 };
 typedef virStorageSourcePoolDef *virStorageSourcePoolDefPtr;
 
@@ -208,15 +208,15 @@ typedef virStorageSource *virStorageSourcePtr;
  * backing chains, multiple source disks join to form a single guest
  * view.  */
 struct _virStorageSource {
-    int type; /* enum virStorageType */
+    int type; /* virStorageType */
     char *path;
-    int protocol; /* enum virStorageNetProtocol */
+    int protocol; /* virStorageNetProtocol */
     size_t nhosts;
     virStorageNetHostDefPtr hosts;
     virStorageSourcePoolDefPtr srcpool;
     struct {
         char *username;
-        int secretType; /* enum virStorageSecretType */
+        int secretType; /* virStorageSecretType */
         union {
             unsigned char uuid[VIR_UUID_BUFLEN];
             char *usage;
@@ -225,7 +225,7 @@ struct _virStorageSource {
     virStorageEncryptionPtr encryption;
 
     char *driverName;
-    int format; /* enum virStorageFileFormat */
+    int format; /* virStorageFileFormat */
     virBitmapPtr features;
     char *compat;
 

diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index 0d35cf5df4f6a282073cbdf6c064988caabd42b5..7c40b5bb09a45615a8343968f9c96d4465e6627e 100644 (file)
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -1029,7 +1029,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
                 return false;
             }
 
-            switch ((enum virStoragePoolType) poolType) {
+            switch ((virStoragePoolType) poolType) {
             case VIR_STORAGE_POOL_DIR:
                 flags |= VIR_CONNECT_LIST_STORAGE_POOLS_DIR;
                 break;