[libvirt] [PATCH] util: changing all the "enum" structures into typedef's in "src/util/" directory.
In "src/util/" there are many enumeration (enum) structures. Sometimes, it's better using a typedef for variable types, function types and other usages. Other enumeration will be changed to typedef's in the future. Signed-off-by: Julio Faracco <jcfaracco@gmail.com> --- src/conf/domain_conf.c | 4 ++-- src/qemu/qemu_command.c | 12 ++++++------ src/qemu/qemu_command.h | 4 ++-- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 16 ++++++++-------- src/qemu/qemu_process.c | 2 +- src/qemu/qemu_process.h | 2 +- src/storage/storage_backend.c | 2 +- src/util/viraudit.c | 2 +- src/util/viraudit.h | 6 +++--- src/util/virfile.c | 4 ++-- src/util/virfile.h | 8 ++++---- src/util/virhook.h | 24 ++++++++++++------------ src/util/virinitctl.h | 5 ++--- src/util/virnetdevmacvlan.c | 10 +++++----- src/util/virnetdevmacvlan.h | 12 ++++++------ src/util/virnetdevvportprofile.c | 4 ++-- src/util/virnetdevvportprofile.h | 8 ++++---- src/util/virnuma.h | 4 ++-- src/util/virseclabel.h | 4 ++-- src/util/virstorageencryption.h | 4 ++-- src/util/virstoragefile.h | 28 ++++++++++++++-------------- src/util/virsysinfo.h | 4 ++-- tests/virstoragetest.c | 2 +- 24 files changed, 86 insertions(+), 87 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c655bcf..402c234 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4972,7 +4972,7 @@ virDomainDiskSourceParse(xmlNodePtr node, memset(&host, 0, sizeof(host)); - switch ((enum virStorageType)src->type) { + switch ((virStorageType)src->type) { case VIR_STORAGE_TYPE_FILE: src->path = virXMLPropString(node, "file"); break; @@ -14847,7 +14847,7 @@ virDomainDiskSourceFormat(virBufferPtr buf, startupPolicy = virDomainStartupPolicyTypeToString(policy); if (src->path || src->nhosts > 0 || src->srcpool || startupPolicy) { - switch ((enum virStorageType)src->type) { + switch ((virStorageType)src->type) { case VIR_STORAGE_TYPE_FILE: virBufferAddLit(buf, "<source"); virBufferEscapeString(buf, " file='%s'", src->path); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6d80042..474b8db 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -163,7 +163,7 @@ qemuPhysIfaceConnect(virDomainDefPtr def, virQEMUDriverPtr driver, virDomainNetDefPtr net, virQEMUCapsPtr qemuCaps, - enum virNetDevVPortProfileOp vmop) + virNetDevVPortProfileOp vmop) { int rc; char *res_ifname = NULL; @@ -3567,7 +3567,7 @@ qemuNetworkDriveGetPort(int protocol, return ret; } - switch ((enum virStorageNetProtocol) protocol) { + switch ((virStorageNetProtocol) protocol) { case VIR_STORAGE_NET_PROTOCOL_HTTP: return 80; @@ -3618,7 +3618,7 @@ qemuBuildNetworkDriveURI(int protocol, virURIPtr uri = NULL; size_t i; - switch ((enum virStorageNetProtocol) protocol) { + switch ((virStorageNetProtocol) protocol) { case VIR_STORAGE_NET_PROTOCOL_NBD: if (nhosts != 1) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3856,7 +3856,7 @@ qemuGetDriveSourceString(virStorageSourcePtr src, } } - switch ((enum virStorageType) actualType) { + switch ((virStorageType) actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: case VIR_STORAGE_TYPE_DIR: @@ -7509,7 +7509,7 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps, int vlan, int bootindex, - enum virNetDevVPortProfileOp vmop, + virNetDevVPortProfileOp vmop, bool standalone) { int ret = -1; @@ -7704,7 +7704,7 @@ qemuBuildCommandLine(virConnectPtr conn, const char *migrateFrom, int migrateFd, virDomainSnapshotObjPtr snapshot, - enum virNetDevVPortProfileOp vmop, + virNetDevVPortProfileOp vmop, qemuBuildCommandLineCallbacksPtr callbacks, bool standalone) { diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 0866c6b..ecd1d45 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -75,7 +75,7 @@ virCommandPtr qemuBuildCommandLine(virConnectPtr conn, const char *migrateFrom, int migrateFd, virDomainSnapshotObjPtr current_snapshot, - enum virNetDevVPortProfileOp vmop, + virNetDevVPortProfileOp vmop, qemuBuildCommandLineCallbacksPtr callbacks, bool forXMLToArgv) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(11); @@ -195,7 +195,7 @@ int qemuPhysIfaceConnect(virDomainDefPtr def, virQEMUDriverPtr driver, virDomainNetDefPtr net, virQEMUCapsPtr qemuCaps, - enum virNetDevVPortProfileOp vmop); + virNetDevVPortProfileOp vmop); int qemuOpenVhostNet(virDomainDefPtr def, virDomainNetDefPtr net, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ab19738..3345474 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2269,7 +2269,7 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver, for (i = vm->def->ndisks; i > 0; i--) { disk = vm->def->disks[i - 1]; const char *path = virDomainDiskGetSource(disk); - enum virStorageFileFormat format = virDomainDiskGetFormat(disk); + virStorageFileFormat format = virDomainDiskGetFormat(disk); if (!path) continue; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 69a7053..c87ae45 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12307,13 +12307,13 @@ qemuDomainSnapshotPrepareDiskExternalBackingInactive(virDomainDiskDefPtr disk) { int actualType = virStorageSourceGetActualType(&disk->src); - switch ((enum virStorageType) actualType) { + switch ((virStorageType) actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: return 0; case VIR_STORAGE_TYPE_NETWORK: - switch ((enum virStorageNetProtocol) disk->src.protocol) { + switch ((virStorageNetProtocol) disk->src.protocol) { case VIR_STORAGE_NET_PROTOCOL_NBD: case VIR_STORAGE_NET_PROTOCOL_RBD: case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: @@ -12369,13 +12369,13 @@ qemuDomainSnapshotPrepareDiskExternalOverlayActive(virDomainSnapshotDiskDefPtr d { int actualType = virStorageSourceGetActualType(&disk->src); - switch ((enum virStorageType) actualType) { + switch ((virStorageType) actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: return 0; case VIR_STORAGE_TYPE_NETWORK: - switch ((enum virStorageNetProtocol) disk->src.protocol) { + switch ((virStorageNetProtocol) disk->src.protocol) { case VIR_STORAGE_NET_PROTOCOL_GLUSTER: return 0; @@ -12417,7 +12417,7 @@ qemuDomainSnapshotPrepareDiskExternalOverlayInactive(virDomainSnapshotDiskDefPtr { int actualType = virStorageSourceGetActualType(&disk->src); - switch ((enum virStorageType) actualType) { + switch ((virStorageType) actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: return 0; @@ -12514,13 +12514,13 @@ qemuDomainSnapshotPrepareDiskInternal(virConnectPtr conn, actualType = virStorageSourceGetActualType(&disk->src); - switch ((enum virStorageType) actualType) { + switch ((virStorageType) actualType) { case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: return 0; case VIR_STORAGE_TYPE_NETWORK: - switch ((enum virStorageNetProtocol) disk->src.protocol) { + switch ((virStorageNetProtocol) disk->src.protocol) { case VIR_STORAGE_NET_PROTOCOL_NBD: case VIR_STORAGE_NET_PROTOCOL_RBD: case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: @@ -12747,7 +12747,7 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver, VIR_STRDUP(persistSource, snap->src.path) < 0) goto cleanup; - switch ((enum virStorageType)snap->src.type) { + switch ((virStorageType)snap->src.type) { case VIR_STORAGE_TYPE_BLOCK: reuse = true; /* fallthrough */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0afad9d..bfabbc5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3606,7 +3606,7 @@ int qemuProcessStart(virConnectPtr conn, int stdin_fd, const char *stdin_path, virDomainSnapshotObjPtr snapshot, - enum virNetDevVPortProfileOp vmop, + virNetDevVPortProfileOp vmop, unsigned int flags) { int ret; diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 4176815..d99978f 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -57,7 +57,7 @@ int qemuProcessStart(virConnectPtr conn, int stdin_fd, const char *stdin_path, virDomainSnapshotObjPtr snapshot, - enum virNetDevVPortProfileOp vmop, + virNetDevVPortProfileOp vmop, unsigned int flags); typedef enum { diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 946196b..5eec90d 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -736,7 +736,7 @@ virStorageBackendCreateQemuImgOpts(char **opts, for (i = 0; i < VIR_STORAGE_FILE_FEATURE_LAST; i++) { ignore_value(virBitmapGetBit(features, i, &b)); if (b) { - switch ((enum virStorageFileFeature) i) { + switch ((virStorageFileFeature) i) { case VIR_STORAGE_FILE_FEATURE_LAZY_REFCOUNTS: if (STREQ_NULLABLE(compat, "0.10")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/src/util/viraudit.c b/src/util/viraudit.c index 33ed2f6..8023c60 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -82,7 +82,7 @@ void virAuditSend(virLogSourcePtr source, const char *funcname, const char *clienttty ATTRIBUTE_UNUSED, const char *clientaddr ATTRIBUTE_UNUSED, - enum virAuditRecordType type ATTRIBUTE_UNUSED, bool success, + virAuditRecordType type ATTRIBUTE_UNUSED, bool success, const char *fmt, ...) { char *str = NULL; diff --git a/src/util/viraudit.h b/src/util/viraudit.h index cf3da6c..8101e50 100644 --- a/src/util/viraudit.h +++ b/src/util/viraudit.h @@ -26,11 +26,11 @@ # include "internal.h" # include "virlog.h" -enum virAuditRecordType { +typedef enum { VIR_AUDIT_RECORD_MACHINE_CONTROL, VIR_AUDIT_RECORD_MACHINE_ID, VIR_AUDIT_RECORD_RESOURCE, -}; +} virAuditRecordType; int virAuditOpen(void); @@ -39,7 +39,7 @@ void virAuditLog(int enabled); void virAuditSend(virLogSourcePtr source, const char *filename, size_t linenr, const char *funcname, const char *clienttty, const char *clientaddr, - enum virAuditRecordType type, bool success, + virAuditRecordType type, bool success, const char *fmt, ...) ATTRIBUTE_FMT_PRINTF(9, 10); diff --git a/src/util/virfile.c b/src/util/virfile.c index da4e0a0..dc2f2b2 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -818,7 +818,7 @@ virFileNBDDeviceFindUnused(void) int virFileNBDDeviceAssociate(const char *file, - enum virStorageFileFormat fmt, + virStorageFileFormat fmt, bool readonly, char **dev) { @@ -887,7 +887,7 @@ int virFileLoopDeviceAssociate(const char *file, } int virFileNBDDeviceAssociate(const char *file, - enum virStorageFileFormat fmt ATTRIBUTE_UNUSED, + virStorageFileFormat fmt ATTRIBUTE_UNUSED, bool readonly ATTRIBUTE_UNUSED, char **dev ATTRIBUTE_UNUSED) { diff --git a/src/util/virfile.h b/src/util/virfile.h index 5d0d699..25678df 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -31,7 +31,7 @@ # include "internal.h" # include "virstoragefile.h" -typedef enum virFileCloseFlags { +typedef enum { VIR_FILE_CLOSE_PRESERVE_ERRNO = 1 << 0, VIR_FILE_CLOSE_IGNORE_EBADF = 1 << 1, VIR_FILE_CLOSE_DONT_LOG = 1 << 2, @@ -83,10 +83,10 @@ typedef virFileWrapperFd *virFileWrapperFdPtr; int virFileDirectFdFlag(void); -enum virFileWrapperFdFlags { +typedef enum { VIR_FILE_WRAPPER_BYPASS_CACHE = (1 << 0), VIR_FILE_WRAPPER_NON_BLOCKING = (1 << 1), -}; +} virFileWrapperFdFlags; virFileWrapperFdPtr virFileWrapperFdNew(int *fd, const char *name, @@ -116,7 +116,7 @@ int virFileLoopDeviceAssociate(const char *file, char **dev); int virFileNBDDeviceAssociate(const char *file, - enum virStorageFileFormat fmt, + virStorageFileFormat fmt, bool readonly, char **dev); diff --git a/src/util/virhook.h b/src/util/virhook.h index 7b09ac5..5bc0a5f 100644 --- a/src/util/virhook.h +++ b/src/util/virhook.h @@ -26,32 +26,32 @@ # include "internal.h" -enum virHookDriverType { +typedef enum { VIR_HOOK_DRIVER_DAEMON = 0, /* Daemon related events */ VIR_HOOK_DRIVER_QEMU, /* QEmu domains related events */ VIR_HOOK_DRIVER_LXC, /* LXC domains related events */ VIR_HOOK_DRIVER_NETWORK, /* network related events */ VIR_HOOK_DRIVER_LAST, -}; +} virHookDriverType; -enum virHookDaemonOpType { +typedef enum { VIR_HOOK_DAEMON_OP_START, /* daemon is about to start */ VIR_HOOK_DAEMON_OP_SHUTDOWN, /* daemon is about to shutdown */ VIR_HOOK_DAEMON_OP_RELOAD, /* driver reload with SIGHUP */ VIR_HOOK_DAEMON_OP_LAST, -}; +} virHookDaemonOpType; -enum virHookSubopType { +typedef enum { VIR_HOOK_SUBOP_NONE, /* no sub-operation */ VIR_HOOK_SUBOP_BEGIN, /* beginning of the operation */ VIR_HOOK_SUBOP_END, /* end of the operation */ VIR_HOOK_SUBOP_LAST, -}; +} virHookSubopType; -enum virHookQemuOpType { +typedef enum { VIR_HOOK_QEMU_OP_START, /* domain is about to start */ VIR_HOOK_QEMU_OP_STOPPED, /* domain has stopped */ VIR_HOOK_QEMU_OP_PREPARE, /* domain startup initiated */ @@ -62,9 +62,9 @@ enum virHookQemuOpType { VIR_HOOK_QEMU_OP_ATTACH, /* domain is being attached to be libvirt */ VIR_HOOK_QEMU_OP_LAST, -}; +} virHookQemuOpType; -enum virHookLxcOpType { +typedef enum { VIR_HOOK_LXC_OP_START, /* domain is about to start */ VIR_HOOK_LXC_OP_STOPPED, /* domain has stopped */ VIR_HOOK_LXC_OP_PREPARE, /* domain startup initiated */ @@ -73,9 +73,9 @@ enum virHookLxcOpType { VIR_HOOK_LXC_OP_RECONNECT, /* domain is being reconnected by libvirt */ VIR_HOOK_LXC_OP_LAST, -}; +} virHookLxcOpType; -enum virHookNetworkOpType { +typedef enum { VIR_HOOK_NETWORK_OP_START, /* network is about to start */ VIR_HOOK_NETWORK_OP_STARTED, /* network has start */ VIR_HOOK_NETWORK_OP_STOPPED, /* network has stopped */ @@ -83,7 +83,7 @@ enum virHookNetworkOpType { VIR_HOOK_NETWORK_OP_IFACE_UNPLUGGED, /* an interface was unplugged from the network */ VIR_HOOK_NETWORK_OP_LAST, -}; +} virHookNetworkOpType; int virHookInitialize(void); diff --git a/src/util/virinitctl.h b/src/util/virinitctl.h index 6aeb1a6..75a9a50 100644 --- a/src/util/virinitctl.h +++ b/src/util/virinitctl.h @@ -24,8 +24,7 @@ #ifndef __VIR_INITCTL_H__ # define __VIR_INITCTL_H__ -typedef enum virInitctlRunLevel virInitctlRunLevel; -enum virInitctlRunLevel { +typedef enum { VIR_INITCTL_RUNLEVEL_POWEROFF = 0, VIR_INITCTL_RUNLEVEL_1 = 1, VIR_INITCTL_RUNLEVEL_2 = 2, @@ -35,7 +34,7 @@ enum virInitctlRunLevel { VIR_INITCTL_RUNLEVEL_REBOOT = 6, VIR_INITCTL_RUNLEVEL_LAST -}; +} virInitctlRunLevel; int virInitctlSetRunLevel(virInitctlRunLevel level); diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 7bbf540..56a5f6b 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -434,7 +434,7 @@ struct virNetlinkCallbackData { char *linkdev; int vf; unsigned char vmuuid[VIR_UUID_BUFLEN]; - enum virNetDevVPortProfileOp vmOp; + virNetDevVPortProfileOp vmOp; unsigned int linkState; }; @@ -748,7 +748,7 @@ virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, const char *linkdev, const unsigned char *vmuuid, virNetDevVPortProfilePtr virtPortProfile, - enum virNetDevVPortProfileOp vmOp) + virNetDevVPortProfileOp vmOp) { virNetlinkCallbackDataPtr calld = NULL; @@ -803,13 +803,13 @@ virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, const virMacAddr *macaddress, const char *linkdev, - enum virNetDevMacVLanMode mode, + virNetDevMacVLanMode mode, bool withTap, int vnet_hdr, const unsigned char *vmuuid, virNetDevVPortProfilePtr virtPortProfile, char **res_ifname, - enum virNetDevVPortProfileOp vmOp, + virNetDevVPortProfileOp vmOp, char *stateDir, virNetDevBandwidthPtr bandwidth) { @@ -1022,7 +1022,7 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname, const char *linkdev, const unsigned char *vmuuid, virNetDevVPortProfilePtr virtPortProfile, - enum virNetDevVPortProfileOp vmOp) + virNetDevVPortProfileOp vmOp) { int rc = 0; diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 225ddba..9b15a31 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -30,14 +30,14 @@ # include "virnetdevvportprofile.h" /* the mode type for macvtap devices */ -enum virNetDevMacVLanMode { +typedef enum { VIR_NETDEV_MACVLAN_MODE_VEPA, VIR_NETDEV_MACVLAN_MODE_PRIVATE, VIR_NETDEV_MACVLAN_MODE_BRIDGE, VIR_NETDEV_MACVLAN_MODE_PASSTHRU, VIR_NETDEV_MACVLAN_MODE_LAST, -}; +} virNetDevMacVLanMode; VIR_ENUM_DECL(virNetDevMacVLanMode) int virNetDevMacVLanCreate(const char *ifname, @@ -55,13 +55,13 @@ int virNetDevMacVLanDelete(const char *ifname) int virNetDevMacVLanCreateWithVPortProfile(const char *ifname, const virMacAddr *macaddress, const char *linkdev, - enum virNetDevMacVLanMode mode, + virNetDevMacVLanMode mode, bool withTap, int vnet_hdr, const unsigned char *vmuuid, virNetDevVPortProfilePtr virtPortProfile, char **res_ifname, - enum virNetDevVPortProfileOp vmop, + virNetDevVPortProfileOp vmop, char *stateDir, virNetDevBandwidthPtr bandwidth) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(7) @@ -81,7 +81,7 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname, const char *linkdev, const unsigned char *vmuuid, virNetDevVPortProfilePtr virtPortProfile, - enum virNetDevVPortProfileOp vmOp) + virNetDevVPortProfileOp vmOp) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; @@ -90,7 +90,7 @@ int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, const char *linkdev, const unsigned char *vmuuid, virNetDevVPortProfilePtr virtPortProfile, - enum virNetDevVPortProfileOp vmOp) + virNetDevVPortProfileOp vmOp) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; #endif /* __UTIL_MACVTAP_H__ */ diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index 8977275..7354b2c 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -1139,7 +1139,7 @@ virNetDevVPortProfileAssociate(const char *macvtap_ifname, const char *linkdev, int vf, const unsigned char *vmuuid, - enum virNetDevVPortProfileOp vmOp, + virNetDevVPortProfileOp vmOp, bool setlink_only) { int rc = 0; @@ -1202,7 +1202,7 @@ virNetDevVPortProfileDisassociate(const char *macvtap_ifname, const virMacAddr *macvtap_macaddr, const char *linkdev, int vf, - enum virNetDevVPortProfileOp vmOp) + virNetDevVPortProfileOp vmOp) { int rc = 0; diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h index 3febf3a..ad063c5 100644 --- a/src/util/virnetdevvportprofile.h +++ b/src/util/virnetdevvportprofile.h @@ -40,7 +40,7 @@ enum virNetDevVPortProfile { }; VIR_ENUM_DECL(virNetDevVPort) -enum virNetDevVPortProfileOp { +typedef enum { VIR_NETDEV_VPORT_PROFILE_OP_CREATE, VIR_NETDEV_VPORT_PROFILE_OP_SAVE, VIR_NETDEV_VPORT_PROFILE_OP_RESTORE, @@ -51,7 +51,7 @@ enum virNetDevVPortProfileOp { VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, VIR_NETDEV_VPORT_PROFILE_OP_LAST -}; +} virNetDevVPortProfileOp; VIR_ENUM_DECL(virNetDevVPortProfileOp) /* profile data for macvtap (VEPA) and openvswitch */ @@ -98,7 +98,7 @@ int virNetDevVPortProfileAssociate(const char *ifname, const char *linkdev, int vf, const unsigned char *vmuuid, - enum virNetDevVPortProfileOp vmOp, + virNetDevVPortProfileOp vmOp, bool setlink_only) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(6) ATTRIBUTE_RETURN_CHECK; @@ -108,7 +108,7 @@ int virNetDevVPortProfileDisassociate(const char *ifname, const virMacAddr *macaddr, const char *linkdev, int vf, - enum virNetDevVPortProfileOp vmOp) + virNetDevVPortProfileOp vmOp) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; diff --git a/src/util/virnuma.h b/src/util/virnuma.h index eee0225..8464b19 100644 --- a/src/util/virnuma.h +++ b/src/util/virnuma.h @@ -26,13 +26,13 @@ # include "virbitmap.h" # include "virutil.h" -enum virNumaTuneMemPlacementMode { +typedef enum { VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_DEFAULT = 0, VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_STATIC, VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_AUTO, VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_LAST -}; +} virNumaTuneMemPlacementMode; VIR_ENUM_DECL(virNumaTuneMemPlacementMode) diff --git a/src/util/virseclabel.h b/src/util/virseclabel.h index 41b90bc..9e970a5 100644 --- a/src/util/virseclabel.h +++ b/src/util/virseclabel.h @@ -22,14 +22,14 @@ #ifndef __SECLABEL_H # define __SECLABEL_H -enum virDomainSeclabelType { +typedef enum { VIR_DOMAIN_SECLABEL_DEFAULT, VIR_DOMAIN_SECLABEL_NONE, VIR_DOMAIN_SECLABEL_DYNAMIC, VIR_DOMAIN_SECLABEL_STATIC, VIR_DOMAIN_SECLABEL_LAST -}; +} virDomainSeclabelType; /* Security configuration for domain */ typedef struct _virSecurityLabelDef virSecurityLabelDef; diff --git a/src/util/virstorageencryption.h b/src/util/virstorageencryption.h index 03c38a5..bf83d34 100644 --- a/src/util/virstorageencryption.h +++ b/src/util/virstorageencryption.h @@ -29,11 +29,11 @@ # include <libxml/tree.h> -enum virStorageEncryptionSecretType { +typedef enum { VIR_STORAGE_ENCRYPTION_SECRET_TYPE_PASSPHRASE = 0, VIR_STORAGE_ENCRYPTION_SECRET_TYPE_LAST -}; +} virStorageEncryptionSecretType; VIR_ENUM_DECL(virStorageEncryptionSecretType) typedef struct _virStorageEncryptionSecret virStorageEncryptionSecret; diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 148776e..8d6e610 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -42,7 +42,7 @@ * virStorageVolType, except we have an undetermined state, don't have * a netdir type, and add a volume type for reference through a * storage pool. */ -enum virStorageType { +typedef enum { VIR_STORAGE_TYPE_NONE, VIR_STORAGE_TYPE_FILE, VIR_STORAGE_TYPE_BLOCK, @@ -51,12 +51,12 @@ enum virStorageType { VIR_STORAGE_TYPE_VOLUME, VIR_STORAGE_TYPE_LAST -}; +} virStorageType; VIR_ENUM_DECL(virStorage) -enum virStorageFileFormat { +typedef enum { VIR_STORAGE_FILE_AUTO_SAFE = -2, VIR_STORAGE_FILE_AUTO = -1, VIR_STORAGE_FILE_NONE = 0, @@ -84,15 +84,15 @@ enum virStorageFileFormat { VIR_STORAGE_FILE_VMDK, VIR_STORAGE_FILE_LAST, -}; +} virStorageFileFormat; VIR_ENUM_DECL(virStorageFileFormat); -enum virStorageFileFeature { +typedef enum { VIR_STORAGE_FILE_FEATURE_LAZY_REFCOUNTS = 0, VIR_STORAGE_FILE_FEATURE_LAST -}; +} virStorageFileFeature; VIR_ENUM_DECL(virStorageFileFeature); @@ -117,7 +117,7 @@ struct _virStorageTimestamps { /* Information related to network storage */ -enum virStorageNetProtocol { +typedef enum { VIR_STORAGE_NET_PROTOCOL_NBD, VIR_STORAGE_NET_PROTOCOL_RBD, VIR_STORAGE_NET_PROTOCOL_SHEEPDOG, @@ -130,18 +130,18 @@ enum virStorageNetProtocol { VIR_STORAGE_NET_PROTOCOL_TFTP, VIR_STORAGE_NET_PROTOCOL_LAST -}; +} virStorageNetProtocol; VIR_ENUM_DECL(virStorageNetProtocol) -enum virStorageNetHostTransport { +typedef enum { VIR_STORAGE_NET_HOST_TRANS_TCP, VIR_STORAGE_NET_HOST_TRANS_UNIX, VIR_STORAGE_NET_HOST_TRANS_RDMA, VIR_STORAGE_NET_HOST_TRANS_LAST -}; +} virStorageNetHostTransport; VIR_ENUM_DECL(virStorageNetHostTransport) @@ -160,7 +160,7 @@ struct _virStorageNetHostDef { * Used for volume "type" disk to indicate how to represent * the disk source if the specified "pool" is of iscsi type. */ -enum virStorageSourcePoolMode { +typedef enum { VIR_STORAGE_SOURCE_POOL_MODE_DEFAULT = 0, /* Use the path as it shows up on host, e.g. @@ -174,7 +174,7 @@ enum virStorageSourcePoolMode { VIR_STORAGE_SOURCE_POOL_MODE_DIRECT, VIR_STORAGE_SOURCE_POOL_MODE_LAST -}; +} virStorageSourcePoolMode; VIR_ENUM_DECL(virStorageSourcePoolMode) @@ -190,13 +190,13 @@ struct _virStorageSourcePoolDef { typedef virStorageSourcePoolDef *virStorageSourcePoolDefPtr; -enum virStorageSecretType { +typedef enum { VIR_STORAGE_SECRET_TYPE_NONE, VIR_STORAGE_SECRET_TYPE_UUID, VIR_STORAGE_SECRET_TYPE_USAGE, VIR_STORAGE_SECRET_TYPE_LAST -}; +} virStorageSecretType; typedef struct _virStorageDriverData virStorageDriverData; typedef virStorageDriverData *virStorageDriverDataPtr; diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h index fbb505b..6236ca6 100644 --- a/src/util/virsysinfo.h +++ b/src/util/virsysinfo.h @@ -28,11 +28,11 @@ # include "virutil.h" # include "virbuffer.h" -enum virSysinfoType { +typedef enum { VIR_SYSINFO_SMBIOS, VIR_SYSINFO_LAST -}; +} virSysinfoType; typedef struct _virSysinfoProcessorDef virSysinfoProcessorDef; typedef virSysinfoProcessorDef *virSysinfoProcessorDefPtr; diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 018469a..d49098e 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -294,7 +294,7 @@ enum { struct testChainData { const char *start; - enum virStorageFileFormat format; + virStorageFileFormat format; const testFileData *files[4]; int nfiles; unsigned int flags; -- 1.7.10.4
On 04/26/2014 06:15 PM, Julio Faracco wrote:
In "src/util/" there are many enumeration (enum) structures. Sometimes, it's better using a typedef for variable types, function types and other usages. Other enumeration will be changed to typedef's in the future.
Please wrap your commit messages around 70 characters ('git log' likes to add indentation, and a lot of us still stick to 80-char columns, where any lines longer than 70 chars cause weird artifacts in terminals). I'll review this after 1.2.4 is out, but this is just to let you know that your message was seen and will be acted on. Thanks again for doing this. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Ok Eric. The commit message has 82 columns. I tryed to use a short message but It exceeded the limit of 80 chars. Daniel Veillard explained to me the release process. Thanks everybody. -- Julio Cesar Faracco
On 04/26/2014 06:15 PM, Julio Faracco wrote:
In "src/util/" there are many enumeration (enum) structures. Sometimes, it's better using a typedef for variable types, function types and other usages. Other enumeration will be changed to typedef's in the future.
I line wrapped this and fixed a merge conflict in qemu_domain.c that got introduced in the meantime. Also, I shortened the subject line to fit in 60 columns (for that matter, 'enum structure' doesn't make sense; 'enum type' or 'enum declaration' is closer to the C standard naming). util: use typedefs for enums in "src/util/" directory
Signed-off-by: Julio Faracco <jcfaracco@gmail.com> ---
24 files changed, 86 insertions(+), 87 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c655bcf..402c234 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4972,7 +4972,7 @@ virDomainDiskSourceParse(xmlNodePtr node,
memset(&host, 0, sizeof(host));
- switch ((enum virStorageType)src->type) { + switch ((virStorageType)src->type) {
Most of your patch is mechanical changes of types that are now typedef'd...
+++ b/src/util/viraudit.h @@ -26,11 +26,11 @@ # include "internal.h" # include "virlog.h"
-enum virAuditRecordType { +typedef enum { VIR_AUDIT_RECORD_MACHINE_CONTROL, VIR_AUDIT_RECORD_MACHINE_ID, VIR_AUDIT_RECORD_RESOURCE, -}; +} virAuditRecordType;
...the remainder is the change to use typedefs. It may have been cleaner to do one type per header file converted, but the overall diffstat was still manageable for the types you converted.
+++ b/src/util/virfile.h @@ -31,7 +31,7 @@ # include "internal.h" # include "virstoragefile.h"
-typedef enum virFileCloseFlags { +typedef enum { VIR_FILE_CLOSE_PRESERVE_ERRNO = 1 << 0, VIR_FILE_CLOSE_IGNORE_EBADF = 1 << 1, VIR_FILE_CLOSE_DONT_LOG = 1 << 2, @@ -83,10 +83,10 @@ typedef virFileWrapperFd *virFileWrapperFdPtr;
Huh - that one was already a typedef, with the enum name used twice. Once the conversions are all complete, I can help you write a syntax check to ensure we use the same consistent style in new code. ACK and pushed. Congrats on your first libvirt patch. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Yes, I choose to do all this mechanical changes first and after I would change some particular modifications according the previous those mechanical changes. First, I would like to change enum's to typedef's. Thanks for your suggestions, Eric. It was so helpful. Specially for the short commit message. I forgot to check it when I sent my patch. -- Julio Cesar Faracco
participants (2)
-
Eric Blake -
Julio Faracco