Missing semicolon at the end of macros can confuse some analyzers (like cppcheck <filename>), and we have a mix of semicolon and non-semicolon usage through the code. Let's standardize on using a semicolon for VIR_ENUM_DECL calls. Signed-off-by: Cole Robinson <crobinso@redhat.com> --- src/conf/capabilities.c | 2 +- src/conf/cpu_conf.h | 12 +- src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 220 +++++++++++++++---------------- src/conf/interface_conf.h | 2 +- src/conf/network_conf.c | 2 +- src/conf/network_conf.h | 8 +- src/conf/node_device_conf.h | 8 +- src/conf/numa_conf.h | 6 +- src/conf/snapshot_conf.h | 4 +- src/conf/storage_adapter_conf.h | 2 +- src/conf/storage_conf.h | 16 +-- src/libxl/libxl_domain.h | 2 +- src/locking/lock_daemon.c | 2 +- src/logging/log_daemon.c | 2 +- src/lxc/lxc_domain.h | 6 +- src/qemu/qemu_command.c | 16 +-- src/qemu/qemu_command.h | 2 +- src/qemu/qemu_domain.h | 8 +- src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_migration.h | 2 +- src/qemu/qemu_migration_params.c | 4 +- src/qemu/qemu_migration_params.h | 2 +- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor.h | 8 +- src/qemu/qemu_monitor_json.c | 6 +- src/remote/remote_daemon.c | 2 +- src/util/virconf.h | 2 +- src/util/virerror.c | 2 +- src/util/virfirewall.c | 4 +- src/util/virhook.c | 14 +- src/util/virmdev.h | 2 +- src/util/virnetdev.h | 6 +- src/util/virnetdevmacvlan.h | 2 +- src/util/virnetdevvlan.h | 2 +- src/util/virnetdevvportprofile.h | 4 +- src/util/virpci.h | 4 +- src/util/virresctrl.c | 2 +- src/util/virsecret.h | 2 +- src/util/virstorageencryption.h | 4 +- src/util/virstoragefile.h | 10 +- src/util/virsysinfo.h | 2 +- src/util/virtypedparam.h | 2 +- src/util/virutil.h | 4 +- src/vmware/vmware_conf.h | 2 +- src/vmx/vmx.c | 2 +- tools/virsh-domain-monitor.c | 24 ++-- tools/virsh-domain.c | 48 +++---- tools/virsh-network.c | 8 +- tools/virsh-nodedev.c | 2 +- tools/virsh-pool.c | 4 +- tools/virsh-secret.c | 2 +- tools/virsh-volume.c | 4 +- tools/virt-admin.c | 2 +- 54 files changed, 259 insertions(+), 259 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 8e9bba0dbe..fffae23b28 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -47,7 +47,7 @@ VIR_LOG_INIT("conf.capabilities") -VIR_ENUM_DECL(virCapsHostPMTarget) +VIR_ENUM_DECL(virCapsHostPMTarget); VIR_ENUM_IMPL(virCapsHostPMTarget, VIR_NODE_SUSPEND_TARGET_LAST, "suspend_mem", "suspend_disk", "suspend_hybrid"); diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index 0b2b63f5e4..6e810e5486 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -38,7 +38,7 @@ typedef enum { VIR_CPU_TYPE_LAST } virCPUType; -VIR_ENUM_DECL(virCPU) +VIR_ENUM_DECL(virCPU); typedef enum { VIR_CPU_MODE_CUSTOM, @@ -48,7 +48,7 @@ typedef enum { VIR_CPU_MODE_LAST } virCPUMode; -VIR_ENUM_DECL(virCPUMode) +VIR_ENUM_DECL(virCPUMode); typedef enum { VIR_CPU_MATCH_MINIMUM, @@ -58,7 +58,7 @@ typedef enum { VIR_CPU_MATCH_LAST } virCPUMatch; -VIR_ENUM_DECL(virCPUMatch) +VIR_ENUM_DECL(virCPUMatch); typedef enum { VIR_CPU_CHECK_DEFAULT, @@ -69,7 +69,7 @@ typedef enum { VIR_CPU_CHECK_LAST } virCPUCheck; -VIR_ENUM_DECL(virCPUCheck) +VIR_ENUM_DECL(virCPUCheck); typedef enum { VIR_CPU_FALLBACK_ALLOW, @@ -78,7 +78,7 @@ typedef enum { VIR_CPU_FALLBACK_LAST } virCPUFallback; -VIR_ENUM_DECL(virCPUFallback) +VIR_ENUM_DECL(virCPUFallback); typedef enum { VIR_CPU_FEATURE_FORCE, @@ -90,7 +90,7 @@ typedef enum { VIR_CPU_FEATURE_LAST } virCPUFeaturePolicy; -VIR_ENUM_DECL(virCPUFeaturePolicy) +VIR_ENUM_DECL(virCPUFeaturePolicy); typedef struct _virCPUFeatureDef virCPUFeatureDef; typedef virCPUFeatureDef *virCPUFeatureDefPtr; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 54d6364f4f..41d345a23e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -927,7 +927,7 @@ VIR_ENUM_IMPL(virDomainHPTResizing, /* Internal mapping: subset of block job types that can be present in * <mirror> XML (remaining types are not two-phase). */ -VIR_ENUM_DECL(virDomainBlockJob) +VIR_ENUM_DECL(virDomainBlockJob); VIR_ENUM_IMPL(virDomainBlockJob, VIR_DOMAIN_BLOCK_JOB_TYPE_LAST, "", "", "copy", "", "active-commit") diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 7776a3afb2..9afbd055d4 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -257,7 +257,7 @@ typedef enum { VIR_DOMAIN_OSTYPE_LAST } virDomainOSType; -VIR_ENUM_DECL(virDomainOS) +VIR_ENUM_DECL(virDomainOS); typedef struct _virDomainHostdevOrigStates virDomainHostdevOrigStates; @@ -320,7 +320,7 @@ typedef enum { VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST } virDomainHostdevSubsysPCIBackendType; -VIR_ENUM_DECL(virDomainHostdevSubsysPCIBackend) +VIR_ENUM_DECL(virDomainHostdevSubsysPCIBackend); typedef enum { VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE, @@ -329,7 +329,7 @@ typedef enum { VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_LAST, } virDomainHostdevSCSIProtocolType; -VIR_ENUM_DECL(virDomainHostdevSubsysSCSIProtocol) +VIR_ENUM_DECL(virDomainHostdevSubsysSCSIProtocol); typedef struct _virDomainHostdevSubsysUSB virDomainHostdevSubsysUSB; typedef virDomainHostdevSubsysUSB *virDomainHostdevSubsysUSBPtr; @@ -392,7 +392,7 @@ typedef enum { VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_LAST, } virDomainHostdevSubsysSCSIHostProtocolType; -VIR_ENUM_DECL(virDomainHostdevSubsysSCSIHostProtocol) +VIR_ENUM_DECL(virDomainHostdevSubsysSCSIHostProtocol); typedef struct _virDomainHostdevSubsysSCSIVHost virDomainHostdevSubsysSCSIVHost; typedef virDomainHostdevSubsysSCSIVHost *virDomainHostdevSubsysSCSIVHostPtr; @@ -1078,7 +1078,7 @@ typedef enum { VIR_DOMAIN_CHR_DEVICE_STATE_LAST } virDomainChrDeviceState; -VIR_ENUM_DECL(virDomainChrDeviceState) +VIR_ENUM_DECL(virDomainChrDeviceState); typedef enum { VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL = 0, @@ -1439,7 +1439,7 @@ typedef enum { VIR_DOMAIN_VIDEO_VGACONF_LAST } virDomainVideoVGAConf; -VIR_ENUM_DECL(virDomainVideoVGAConf) +VIR_ENUM_DECL(virDomainVideoVGAConf); typedef struct _virDomainVideoAccelDef virDomainVideoAccelDef; typedef virDomainVideoAccelDef *virDomainVideoAccelDefPtr; @@ -1873,7 +1873,7 @@ typedef enum { VIR_DOMAIN_LOCK_FAILURE_LAST } virDomainLockFailureAction; -VIR_ENUM_DECL(virDomainLockFailure) +VIR_ENUM_DECL(virDomainLockFailure); typedef struct _virDomainBIOSDef virDomainBIOSDef; typedef virDomainBIOSDef *virDomainBIOSDefPtr; @@ -1891,7 +1891,7 @@ typedef enum { VIR_DOMAIN_LOADER_TYPE_LAST } virDomainLoader; -VIR_ENUM_DECL(virDomainLoader) +VIR_ENUM_DECL(virDomainLoader); typedef struct _virDomainLoaderDef virDomainLoaderDef; typedef virDomainLoaderDef *virDomainLoaderDefPtr; @@ -3394,115 +3394,115 @@ bool virDomainVsockDefEquals(const virDomainVsockDef *a, const virDomainVsockDef *b) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; -VIR_ENUM_DECL(virDomainTaint) -VIR_ENUM_DECL(virDomainVirt) -VIR_ENUM_DECL(virDomainBoot) -VIR_ENUM_DECL(virDomainFeature) -VIR_ENUM_DECL(virDomainCapabilitiesPolicy) -VIR_ENUM_DECL(virDomainCapsFeature) -VIR_ENUM_DECL(virDomainLifecycle) -VIR_ENUM_DECL(virDomainLifecycleAction) -VIR_ENUM_DECL(virDomainDevice) -VIR_ENUM_DECL(virDomainDiskDevice) -VIR_ENUM_DECL(virDomainDiskGeometryTrans) -VIR_ENUM_DECL(virDomainDiskBus) -VIR_ENUM_DECL(virDomainDiskCache) -VIR_ENUM_DECL(virDomainDiskErrorPolicy) -VIR_ENUM_DECL(virDomainDiskIo) -VIR_ENUM_DECL(virDomainDeviceSGIO) -VIR_ENUM_DECL(virDomainDiskTray) -VIR_ENUM_DECL(virDomainDiskDiscard) -VIR_ENUM_DECL(virDomainDiskDetectZeroes) -VIR_ENUM_DECL(virDomainDiskMirrorState) -VIR_ENUM_DECL(virDomainController) -VIR_ENUM_DECL(virDomainControllerModelPCI) -VIR_ENUM_DECL(virDomainControllerPCIModelName) -VIR_ENUM_DECL(virDomainControllerModelSCSI) -VIR_ENUM_DECL(virDomainControllerModelUSB) -VIR_ENUM_DECL(virDomainControllerModelIDE) -VIR_ENUM_DECL(virDomainFS) -VIR_ENUM_DECL(virDomainFSDriver) -VIR_ENUM_DECL(virDomainFSAccessMode) -VIR_ENUM_DECL(virDomainFSWrpolicy) -VIR_ENUM_DECL(virDomainNet) -VIR_ENUM_DECL(virDomainNetBackend) -VIR_ENUM_DECL(virDomainNetVirtioTxMode) -VIR_ENUM_DECL(virDomainNetInterfaceLinkState) -VIR_ENUM_DECL(virDomainChrDevice) -VIR_ENUM_DECL(virDomainChrChannelTarget) -VIR_ENUM_DECL(virDomainChrConsoleTarget) -VIR_ENUM_DECL(virDomainChrSerialTarget) -VIR_ENUM_DECL(virDomainSmartcard) -VIR_ENUM_DECL(virDomainChr) -VIR_ENUM_DECL(virDomainChrTcpProtocol) -VIR_ENUM_DECL(virDomainChrSpicevmc) -VIR_ENUM_DECL(virDomainSoundCodec) -VIR_ENUM_DECL(virDomainSoundModel) -VIR_ENUM_DECL(virDomainKeyWrapCipherName) -VIR_ENUM_DECL(virDomainMemballoonModel) -VIR_ENUM_DECL(virDomainSmbiosMode) -VIR_ENUM_DECL(virDomainWatchdogModel) -VIR_ENUM_DECL(virDomainWatchdogAction) -VIR_ENUM_DECL(virDomainPanicModel) -VIR_ENUM_DECL(virDomainVideo) -VIR_ENUM_DECL(virDomainHostdevMode) -VIR_ENUM_DECL(virDomainHostdevSubsys) -VIR_ENUM_DECL(virDomainHostdevCaps) -VIR_ENUM_DECL(virDomainHub) -VIR_ENUM_DECL(virDomainRedirdevBus) -VIR_ENUM_DECL(virDomainInput) -VIR_ENUM_DECL(virDomainInputBus) -VIR_ENUM_DECL(virDomainGraphics) -VIR_ENUM_DECL(virDomainGraphicsListen) -VIR_ENUM_DECL(virDomainGraphicsAuthConnected) -VIR_ENUM_DECL(virDomainGraphicsSpiceChannelName) -VIR_ENUM_DECL(virDomainGraphicsSpiceChannelMode) -VIR_ENUM_DECL(virDomainGraphicsSpiceImageCompression) -VIR_ENUM_DECL(virDomainGraphicsSpiceJpegCompression) -VIR_ENUM_DECL(virDomainGraphicsSpiceZlibCompression) -VIR_ENUM_DECL(virDomainGraphicsSpiceStreamingMode) -VIR_ENUM_DECL(virDomainGraphicsSpiceMouseMode) -VIR_ENUM_DECL(virDomainGraphicsVNCSharePolicy) -VIR_ENUM_DECL(virDomainHyperv) -VIR_ENUM_DECL(virDomainKVM) -VIR_ENUM_DECL(virDomainRNGModel) -VIR_ENUM_DECL(virDomainRNGBackend) -VIR_ENUM_DECL(virDomainTPMModel) -VIR_ENUM_DECL(virDomainTPMBackend) -VIR_ENUM_DECL(virDomainTPMVersion) -VIR_ENUM_DECL(virDomainMemoryModel) -VIR_ENUM_DECL(virDomainMemoryBackingModel) -VIR_ENUM_DECL(virDomainMemorySource) -VIR_ENUM_DECL(virDomainMemoryAllocation) -VIR_ENUM_DECL(virDomainIOMMUModel) -VIR_ENUM_DECL(virDomainVsockModel) -VIR_ENUM_DECL(virDomainShmemModel) -VIR_ENUM_DECL(virDomainLaunchSecurity) +VIR_ENUM_DECL(virDomainTaint); +VIR_ENUM_DECL(virDomainVirt); +VIR_ENUM_DECL(virDomainBoot); +VIR_ENUM_DECL(virDomainFeature); +VIR_ENUM_DECL(virDomainCapabilitiesPolicy); +VIR_ENUM_DECL(virDomainCapsFeature); +VIR_ENUM_DECL(virDomainLifecycle); +VIR_ENUM_DECL(virDomainLifecycleAction); +VIR_ENUM_DECL(virDomainDevice); +VIR_ENUM_DECL(virDomainDiskDevice); +VIR_ENUM_DECL(virDomainDiskGeometryTrans); +VIR_ENUM_DECL(virDomainDiskBus); +VIR_ENUM_DECL(virDomainDiskCache); +VIR_ENUM_DECL(virDomainDiskErrorPolicy); +VIR_ENUM_DECL(virDomainDiskIo); +VIR_ENUM_DECL(virDomainDeviceSGIO); +VIR_ENUM_DECL(virDomainDiskTray); +VIR_ENUM_DECL(virDomainDiskDiscard); +VIR_ENUM_DECL(virDomainDiskDetectZeroes); +VIR_ENUM_DECL(virDomainDiskMirrorState); +VIR_ENUM_DECL(virDomainController); +VIR_ENUM_DECL(virDomainControllerModelPCI); +VIR_ENUM_DECL(virDomainControllerPCIModelName); +VIR_ENUM_DECL(virDomainControllerModelSCSI); +VIR_ENUM_DECL(virDomainControllerModelUSB); +VIR_ENUM_DECL(virDomainControllerModelIDE); +VIR_ENUM_DECL(virDomainFS); +VIR_ENUM_DECL(virDomainFSDriver); +VIR_ENUM_DECL(virDomainFSAccessMode); +VIR_ENUM_DECL(virDomainFSWrpolicy); +VIR_ENUM_DECL(virDomainNet); +VIR_ENUM_DECL(virDomainNetBackend); +VIR_ENUM_DECL(virDomainNetVirtioTxMode); +VIR_ENUM_DECL(virDomainNetInterfaceLinkState); +VIR_ENUM_DECL(virDomainChrDevice); +VIR_ENUM_DECL(virDomainChrChannelTarget); +VIR_ENUM_DECL(virDomainChrConsoleTarget); +VIR_ENUM_DECL(virDomainChrSerialTarget); +VIR_ENUM_DECL(virDomainSmartcard); +VIR_ENUM_DECL(virDomainChr); +VIR_ENUM_DECL(virDomainChrTcpProtocol); +VIR_ENUM_DECL(virDomainChrSpicevmc); +VIR_ENUM_DECL(virDomainSoundCodec); +VIR_ENUM_DECL(virDomainSoundModel); +VIR_ENUM_DECL(virDomainKeyWrapCipherName); +VIR_ENUM_DECL(virDomainMemballoonModel); +VIR_ENUM_DECL(virDomainSmbiosMode); +VIR_ENUM_DECL(virDomainWatchdogModel); +VIR_ENUM_DECL(virDomainWatchdogAction); +VIR_ENUM_DECL(virDomainPanicModel); +VIR_ENUM_DECL(virDomainVideo); +VIR_ENUM_DECL(virDomainHostdevMode); +VIR_ENUM_DECL(virDomainHostdevSubsys); +VIR_ENUM_DECL(virDomainHostdevCaps); +VIR_ENUM_DECL(virDomainHub); +VIR_ENUM_DECL(virDomainRedirdevBus); +VIR_ENUM_DECL(virDomainInput); +VIR_ENUM_DECL(virDomainInputBus); +VIR_ENUM_DECL(virDomainGraphics); +VIR_ENUM_DECL(virDomainGraphicsListen); +VIR_ENUM_DECL(virDomainGraphicsAuthConnected); +VIR_ENUM_DECL(virDomainGraphicsSpiceChannelName); +VIR_ENUM_DECL(virDomainGraphicsSpiceChannelMode); +VIR_ENUM_DECL(virDomainGraphicsSpiceImageCompression); +VIR_ENUM_DECL(virDomainGraphicsSpiceJpegCompression); +VIR_ENUM_DECL(virDomainGraphicsSpiceZlibCompression); +VIR_ENUM_DECL(virDomainGraphicsSpiceStreamingMode); +VIR_ENUM_DECL(virDomainGraphicsSpiceMouseMode); +VIR_ENUM_DECL(virDomainGraphicsVNCSharePolicy); +VIR_ENUM_DECL(virDomainHyperv); +VIR_ENUM_DECL(virDomainKVM); +VIR_ENUM_DECL(virDomainRNGModel); +VIR_ENUM_DECL(virDomainRNGBackend); +VIR_ENUM_DECL(virDomainTPMModel); +VIR_ENUM_DECL(virDomainTPMBackend); +VIR_ENUM_DECL(virDomainTPMVersion); +VIR_ENUM_DECL(virDomainMemoryModel); +VIR_ENUM_DECL(virDomainMemoryBackingModel); +VIR_ENUM_DECL(virDomainMemorySource); +VIR_ENUM_DECL(virDomainMemoryAllocation); +VIR_ENUM_DECL(virDomainIOMMUModel); +VIR_ENUM_DECL(virDomainVsockModel); +VIR_ENUM_DECL(virDomainShmemModel); +VIR_ENUM_DECL(virDomainLaunchSecurity); /* from libvirt.h */ -VIR_ENUM_DECL(virDomainState) -VIR_ENUM_DECL(virDomainNostateReason) -VIR_ENUM_DECL(virDomainRunningReason) -VIR_ENUM_DECL(virDomainBlockedReason) -VIR_ENUM_DECL(virDomainPausedReason) -VIR_ENUM_DECL(virDomainShutdownReason) -VIR_ENUM_DECL(virDomainShutoffReason) -VIR_ENUM_DECL(virDomainCrashedReason) -VIR_ENUM_DECL(virDomainPMSuspendedReason) +VIR_ENUM_DECL(virDomainState); +VIR_ENUM_DECL(virDomainNostateReason); +VIR_ENUM_DECL(virDomainRunningReason); +VIR_ENUM_DECL(virDomainBlockedReason); +VIR_ENUM_DECL(virDomainPausedReason); +VIR_ENUM_DECL(virDomainShutdownReason); +VIR_ENUM_DECL(virDomainShutoffReason); +VIR_ENUM_DECL(virDomainCrashedReason); +VIR_ENUM_DECL(virDomainPMSuspendedReason); const char *virDomainStateReasonToString(virDomainState state, int reason); int virDomainStateReasonFromString(virDomainState state, const char *reason); -VIR_ENUM_DECL(virDomainSeclabel) -VIR_ENUM_DECL(virDomainClockOffset) -VIR_ENUM_DECL(virDomainClockBasis) +VIR_ENUM_DECL(virDomainSeclabel); +VIR_ENUM_DECL(virDomainClockOffset); +VIR_ENUM_DECL(virDomainClockBasis); -VIR_ENUM_DECL(virDomainTimerName) -VIR_ENUM_DECL(virDomainTimerTrack) -VIR_ENUM_DECL(virDomainTimerTickpolicy) -VIR_ENUM_DECL(virDomainTimerMode) -VIR_ENUM_DECL(virDomainCpuPlacementMode) +VIR_ENUM_DECL(virDomainTimerName); +VIR_ENUM_DECL(virDomainTimerTrack); +VIR_ENUM_DECL(virDomainTimerTickpolicy); +VIR_ENUM_DECL(virDomainTimerMode); +VIR_ENUM_DECL(virDomainCpuPlacementMode); -VIR_ENUM_DECL(virDomainStartupPolicy) +VIR_ENUM_DECL(virDomainStartupPolicy); virDomainControllerDefPtr virDomainDefAddController(virDomainDefPtr def, int type, int idx, int model); diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h index fb7bf932f1..fd3fc7cba0 100644 --- a/src/conf/interface_conf.h +++ b/src/conf/interface_conf.h @@ -41,7 +41,7 @@ typedef enum { VIR_INTERFACE_TYPE_LAST, } virInterfaceType; -VIR_ENUM_DECL(virInterface) +VIR_ENUM_DECL(virInterface); /* types of start mode */ diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index e035d8aba7..743a1e0851 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -53,7 +53,7 @@ VIR_ENUM_IMPL(virNetworkBridgeMACTableManager, VIR_NETWORK_BRIDGE_MAC_TABLE_MANAGER_LAST, "default", "kernel", "libvirt") -VIR_ENUM_DECL(virNetworkForwardHostdevDevice) +VIR_ENUM_DECL(virNetworkForwardHostdevDevice); VIR_ENUM_IMPL(virNetworkForwardHostdevDevice, VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_LAST, "none", "pci", "netdev") diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index c630674300..2b08f6b615 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -63,7 +63,7 @@ typedef enum { VIR_NETWORK_BRIDGE_MAC_TABLE_MANAGER_LAST, } virNetworkBridgeMACTableManagerType; -VIR_ENUM_DECL(virNetworkBridgeMACTableManager) +VIR_ENUM_DECL(virNetworkBridgeMACTableManager); typedef enum { VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NONE = 0, @@ -86,7 +86,7 @@ typedef enum { VIR_NETWORK_FORWARD_DRIVER_NAME_LAST } virNetworkForwardDriverNameType; -VIR_ENUM_DECL(virNetworkForwardDriverName) +VIR_ENUM_DECL(virNetworkForwardDriverName); typedef struct _virNetworkDHCPHostDef virNetworkDHCPHostDef; typedef virNetworkDHCPHostDef *virNetworkDHCPHostDefPtr; @@ -354,7 +354,7 @@ virNetworkConfigFile(const char *dir, void virNetworkSetBridgeMacAddr(virNetworkDefPtr def); -VIR_ENUM_DECL(virNetworkForward) +VIR_ENUM_DECL(virNetworkForward); # define VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE \ (VIR_CONNECT_LIST_NETWORKS_ACTIVE | \ @@ -382,5 +382,5 @@ virNetworkDefUpdateSection(virNetworkDefPtr def, const char *xml, unsigned int flags); /* virNetworkUpdateFlags */ -VIR_ENUM_DECL(virNetworkTaint) +VIR_ENUM_DECL(virNetworkTaint); #endif /* LIBVIRT_NETWORK_CONF_H */ diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index 6412ac6472..ce789e9ee9 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -45,7 +45,7 @@ typedef enum { VIR_NODE_DEV_DEVNODE_LAST } virNodeDevDevnodeType; -VIR_ENUM_DECL(virNodeDevDevnode) +VIR_ENUM_DECL(virNodeDevDevnode); typedef enum { /* Keep in sync with VIR_ENUM_IMPL in node_device_conf.c */ @@ -76,8 +76,8 @@ typedef enum { VIR_NODE_DEV_CAP_NET_LAST } virNodeDevNetCapType; -VIR_ENUM_DECL(virNodeDevCap) -VIR_ENUM_DECL(virNodeDevNetCap) +VIR_ENUM_DECL(virNodeDevCap); +VIR_ENUM_DECL(virNodeDevNetCap); typedef enum { VIR_NODE_DEV_CAP_STORAGE_REMOVABLE = (1 << 0), @@ -110,7 +110,7 @@ typedef enum { VIR_NODE_DEV_DRM_LAST } virNodeDevDRMType; -VIR_ENUM_DECL(virNodeDevDRM) +VIR_ENUM_DECL(virNodeDevDRM); typedef struct _virNodeDevCapSystemHardware virNodeDevCapSystemHardware; typedef virNodeDevCapSystemHardware *virNodeDevCapSystemHardwarePtr; diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h index 5bb149bc12..1e389397a7 100644 --- a/src/conf/numa_conf.h +++ b/src/conf/numa_conf.h @@ -40,8 +40,8 @@ typedef enum { VIR_DOMAIN_NUMATUNE_PLACEMENT_LAST } virDomainNumatunePlacement; -VIR_ENUM_DECL(virDomainNumatunePlacement) -VIR_ENUM_DECL(virDomainNumatuneMemMode) +VIR_ENUM_DECL(virDomainNumatunePlacement); +VIR_ENUM_DECL(virDomainNumatuneMemMode); typedef enum { VIR_DOMAIN_MEMORY_ACCESS_DEFAULT = 0, /* No memory access defined */ @@ -50,7 +50,7 @@ typedef enum { VIR_DOMAIN_MEMORY_ACCESS_LAST, } virDomainMemoryAccess; -VIR_ENUM_DECL(virDomainMemoryAccess) +VIR_ENUM_DECL(virDomainMemoryAccess); virDomainNumaPtr virDomainNumaNew(void); diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h index 5ac1ba74a2..cc25164261 100644 --- a/src/conf/snapshot_conf.h +++ b/src/conf/snapshot_conf.h @@ -186,7 +186,7 @@ int virDomainSnapshotRedefinePrep(virDomainPtr domain, bool *update_current, unsigned int flags); -VIR_ENUM_DECL(virDomainSnapshotLocation) -VIR_ENUM_DECL(virDomainSnapshotState) +VIR_ENUM_DECL(virDomainSnapshotLocation); +VIR_ENUM_DECL(virDomainSnapshotState); #endif /* LIBVIRT_SNAPSHOT_CONF_H */ diff --git a/src/conf/storage_adapter_conf.h b/src/conf/storage_adapter_conf.h index 139674e8b4..763e4ba0e9 100644 --- a/src/conf/storage_adapter_conf.h +++ b/src/conf/storage_adapter_conf.h @@ -31,7 +31,7 @@ typedef enum { VIR_STORAGE_ADAPTER_TYPE_LAST, } virStorageAdapterType; -VIR_ENUM_DECL(virStorageAdapter) +VIR_ENUM_DECL(virStorageAdapter); typedef struct _virStorageAdapterSCSIHost virStorageAdapterSCSIHost; typedef virStorageAdapterSCSIHost *virStorageAdapterSCSIHostPtr; diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index dc0aa2ab29..953cdd5fce 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -74,7 +74,7 @@ struct _virStorageVolDef { typedef struct _virStorageVolDefList virStorageVolDefList; typedef virStorageVolDefList *virStorageVolDefListPtr; -VIR_ENUM_DECL(virStorageVol) +VIR_ENUM_DECL(virStorageVol); typedef enum { VIR_STORAGE_POOL_DIR, /* Local directory */ @@ -95,7 +95,7 @@ typedef enum { VIR_STORAGE_POOL_LAST, } virStoragePoolType; -VIR_ENUM_DECL(virStoragePool) +VIR_ENUM_DECL(virStoragePool); typedef enum { VIR_STORAGE_DEVICE_TYPE_DISK = 0x00, @@ -321,7 +321,7 @@ typedef enum { VIR_STORAGE_POOL_FS_OCFS2, VIR_STORAGE_POOL_FS_LAST, } virStoragePoolFormatFileSystem; -VIR_ENUM_DECL(virStoragePoolFormatFileSystem) +VIR_ENUM_DECL(virStoragePoolFormatFileSystem); typedef enum { VIR_STORAGE_POOL_NETFS_AUTO = 0, @@ -330,7 +330,7 @@ typedef enum { VIR_STORAGE_POOL_NETFS_CIFS, VIR_STORAGE_POOL_NETFS_LAST, } virStoragePoolFormatFileSystemNet; -VIR_ENUM_DECL(virStoragePoolFormatFileSystemNet) +VIR_ENUM_DECL(virStoragePoolFormatFileSystemNet); typedef enum { VIR_STORAGE_POOL_DISK_UNKNOWN = 0, @@ -344,14 +344,14 @@ typedef enum { VIR_STORAGE_POOL_DISK_LVM2, VIR_STORAGE_POOL_DISK_LAST, } virStoragePoolFormatDisk; -VIR_ENUM_DECL(virStoragePoolFormatDisk) +VIR_ENUM_DECL(virStoragePoolFormatDisk); typedef enum { VIR_STORAGE_POOL_LOGICAL_UNKNOWN = 0, VIR_STORAGE_POOL_LOGICAL_LVM2 = 1, VIR_STORAGE_POOL_LOGICAL_LAST, } virStoragePoolFormatLogical; -VIR_ENUM_DECL(virStoragePoolFormatLogical) +VIR_ENUM_DECL(virStoragePoolFormatLogical); /* * XXX: these are basically partition types. @@ -373,7 +373,7 @@ typedef enum { VIR_STORAGE_VOL_DISK_EXTENDED, VIR_STORAGE_VOL_DISK_LAST, } virStorageVolFormatDisk; -VIR_ENUM_DECL(virStorageVolFormatDisk) +VIR_ENUM_DECL(virStorageVolFormatDisk); typedef enum { VIR_STORAGE_VOL_DISK_TYPE_NONE = 0, @@ -398,7 +398,7 @@ typedef enum { VIR_STORAGE_PARTED_FS_TYPE_EXTENDED, VIR_STORAGE_PARTED_FS_TYPE_LAST, } virStoragePartedFsType; -VIR_ENUM_DECL(virStoragePartedFs) +VIR_ENUM_DECL(virStoragePartedFs); # define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE \ (VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE | \ diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index a3f7a3e04b..8ce5e9b2a9 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -43,7 +43,7 @@ enum libxlDomainJob { LIBXL_JOB_LAST }; -VIR_ENUM_DECL(libxlDomainJob) +VIR_ENUM_DECL(libxlDomainJob); struct libxlDomainJobObj { diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 06616310b1..dd38077a88 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -83,7 +83,7 @@ enum { VIR_LOCK_DAEMON_ERR_LAST }; -VIR_ENUM_DECL(virDaemonErr) +VIR_ENUM_DECL(virDaemonErr); VIR_ENUM_IMPL(virDaemonErr, VIR_LOCK_DAEMON_ERR_LAST, "Initialization successful", "Unable to obtain pidfile", diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index b84d7dc737..c9a05bd12b 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -79,7 +79,7 @@ enum { VIR_LOG_DAEMON_ERR_LAST }; -VIR_ENUM_DECL(virDaemonErr) +VIR_ENUM_DECL(virDaemonErr); VIR_ENUM_IMPL(virDaemonErr, VIR_LOG_DAEMON_ERR_LAST, "Initialization successful", "Unable to obtain pidfile", diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h index 364b8e5a44..07b850f8a1 100644 --- a/src/lxc/lxc_domain.h +++ b/src/lxc/lxc_domain.h @@ -43,8 +43,8 @@ typedef enum { VIR_LXC_DOMAIN_NAMESPACE_SOURCE_LAST, } virLXCDomainNamespaceSource; -VIR_ENUM_DECL(virLXCDomainNamespace) -VIR_ENUM_DECL(virLXCDomainNamespaceSource) +VIR_ENUM_DECL(virLXCDomainNamespace); +VIR_ENUM_DECL(virLXCDomainNamespaceSource); typedef struct _lxcDomainDef lxcDomainDef; typedef lxcDomainDef *lxcDomainDefPtr; @@ -65,7 +65,7 @@ enum virLXCDomainJob { LXC_JOB_MODIFY, /* May change state */ LXC_JOB_LAST }; -VIR_ENUM_DECL(virLXCDomainJob) +VIR_ENUM_DECL(virLXCDomainJob); struct virLXCDomainJobObj { diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2fb7d32dd4..3a36aeaf98 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -70,7 +70,7 @@ VIR_LOG_INIT("qemu.qemu_command"); -VIR_ENUM_DECL(virDomainDiskQEMUBus) +VIR_ENUM_DECL(virDomainDiskQEMUBus); VIR_ENUM_IMPL(virDomainDiskQEMUBus, VIR_DOMAIN_DISK_BUS_LAST, "ide", "floppy", @@ -83,7 +83,7 @@ VIR_ENUM_IMPL(virDomainDiskQEMUBus, VIR_DOMAIN_DISK_BUS_LAST, "sd") -VIR_ENUM_DECL(qemuDiskCacheV2) +VIR_ENUM_DECL(qemuDiskCacheV2); VIR_ENUM_IMPL(qemuDiskCacheV2, VIR_DOMAIN_DISK_CACHE_LAST, "default", @@ -106,7 +106,7 @@ VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "" /* don't support gop */, "" /* 'none' doesn't make sense here */); -VIR_ENUM_DECL(qemuDeviceVideo) +VIR_ENUM_DECL(qemuDeviceVideo); VIR_ENUM_IMPL(qemuDeviceVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "", /* default value, we shouldn't see this */ @@ -121,7 +121,7 @@ VIR_ENUM_IMPL(qemuDeviceVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "" /* don't support gop */, "" /* 'none' doesn't make sense here */); -VIR_ENUM_DECL(qemuDeviceVideoSecondary) +VIR_ENUM_DECL(qemuDeviceVideoSecondary); VIR_ENUM_IMPL(qemuDeviceVideoSecondary, VIR_DOMAIN_VIDEO_TYPE_LAST, "", /* default value, we shouldn't see this */ @@ -136,14 +136,14 @@ VIR_ENUM_IMPL(qemuDeviceVideoSecondary, VIR_DOMAIN_VIDEO_TYPE_LAST, "" /* don't support gop */, "" /* 'none' doesn't make sense here */); -VIR_ENUM_DECL(qemuSoundCodec) +VIR_ENUM_DECL(qemuSoundCodec); VIR_ENUM_IMPL(qemuSoundCodec, VIR_DOMAIN_SOUND_CODEC_TYPE_LAST, "hda-duplex", "hda-micro", "hda-output"); -VIR_ENUM_DECL(qemuControllerModelUSB) +VIR_ENUM_DECL(qemuControllerModelUSB); VIR_ENUM_IMPL(qemuControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST, "piix3-usb-uhci", @@ -161,7 +161,7 @@ VIR_ENUM_IMPL(qemuControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST, "qemu-xhci", "none"); -VIR_ENUM_DECL(qemuDomainFSDriver) +VIR_ENUM_DECL(qemuDomainFSDriver); VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "local", "local", @@ -170,7 +170,7 @@ VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, NULL, NULL); -VIR_ENUM_DECL(qemuNumaPolicy) +VIR_ENUM_DECL(qemuNumaPolicy); VIR_ENUM_IMPL(qemuNumaPolicy, VIR_DOMAIN_NUMATUNE_MEM_LAST, "bind", "preferred", diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 1a4f1f5da4..d6622a82fe 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -40,7 +40,7 @@ # define QEMU_BLOCK_IOTUNE_MAX 1000000000000000LL -VIR_ENUM_DECL(qemuVideo) +VIR_ENUM_DECL(qemuVideo); virCommandPtr qemuBuildCommandLine(virQEMUDriverPtr driver, virLogManagerPtr logManager, diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index defbffbf94..dd32746df9 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -79,7 +79,7 @@ typedef enum { QEMU_JOB_LAST } qemuDomainJob; -VIR_ENUM_DECL(qemuDomainJob) +VIR_ENUM_DECL(qemuDomainJob); typedef enum { QEMU_AGENT_JOB_NONE = 0, /* No agent job. */ @@ -88,7 +88,7 @@ typedef enum { QEMU_AGENT_JOB_LAST } qemuDomainAgentJob; -VIR_ENUM_DECL(qemuDomainAgentJob) +VIR_ENUM_DECL(qemuDomainAgentJob); /* Async job consists of a series of jobs that may change state. Independent * jobs that do not change state (and possibly others if explicitly allowed by @@ -105,7 +105,7 @@ typedef enum { QEMU_ASYNC_JOB_LAST } qemuDomainAsyncJob; -VIR_ENUM_DECL(qemuDomainAsyncJob) +VIR_ENUM_DECL(qemuDomainAsyncJob); typedef enum { QEMU_DOMAIN_JOB_STATUS_NONE = 0, @@ -225,7 +225,7 @@ typedef enum { QEMU_DOMAIN_NS_MOUNT = 0, QEMU_DOMAIN_NS_LAST } qemuDomainNamespace; -VIR_ENUM_DECL(qemuDomainNamespace) +VIR_ENUM_DECL(qemuDomainNamespace); bool qemuDomainNamespaceEnabled(virDomainObjPtr vm, qemuDomainNamespace ns); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 90319261ff..65c7eb44f4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2747,7 +2747,7 @@ typedef enum { QEMU_SAVE_FORMAT_LAST } virQEMUSaveFormat; -VIR_ENUM_DECL(qemuSaveCompression) +VIR_ENUM_DECL(qemuSaveCompression); VIR_ENUM_IMPL(qemuSaveCompression, QEMU_SAVE_FORMAT_LAST, "raw", "gzip", @@ -2755,7 +2755,7 @@ VIR_ENUM_IMPL(qemuSaveCompression, QEMU_SAVE_FORMAT_LAST, "xz", "lzop") -VIR_ENUM_DECL(qemuDumpFormat) +VIR_ENUM_DECL(qemuDumpFormat); VIR_ENUM_IMPL(qemuDumpFormat, VIR_DOMAIN_CORE_DUMP_FORMAT_LAST, "elf", "kdump-zlib", diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 7d0ff8362e..976a723d21 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -96,7 +96,7 @@ typedef enum { QEMU_MIGRATION_PHASE_LAST } qemuMigrationJobPhase; -VIR_ENUM_DECL(qemuMigrationJobPhase) +VIR_ENUM_DECL(qemuMigrationJobPhase); int qemuMigrationSrcSetOffline(virQEMUDriverPtr driver, diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index e62b6ed461..e112e790c2 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -71,7 +71,7 @@ typedef enum { QEMU_MIGRATION_COMPRESS_LAST } qemuMigrationCompressMethod; -VIR_ENUM_DECL(qemuMigrationCompressMethod) +VIR_ENUM_DECL(qemuMigrationCompressMethod); VIR_ENUM_IMPL(qemuMigrationCompressMethod, QEMU_MIGRATION_COMPRESS_LAST, "xbzrle", "mt", @@ -89,7 +89,7 @@ VIR_ENUM_IMPL(qemuMigrationCapability, QEMU_MIGRATION_CAP_LAST, ); -VIR_ENUM_DECL(qemuMigrationParam) +VIR_ENUM_DECL(qemuMigrationParam); VIR_ENUM_IMPL(qemuMigrationParam, QEMU_MIGRATION_PARAM_LAST, "compress-level", "compress-threads", diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h index 12bb9200da..709b818dcf 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -41,7 +41,7 @@ typedef enum { QEMU_MIGRATION_CAP_LAST } qemuMigrationCapability; -VIR_ENUM_DECL(qemuMigrationCapability) +VIR_ENUM_DECL(qemuMigrationCapability); typedef enum { QEMU_MIGRATION_PARAM_COMPRESS_LEVEL, diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 7ce5bd668e..c0291a4b18 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -190,7 +190,7 @@ typedef enum { QEMU_MONITOR_BLOCK_IO_STATUS_LAST } qemuMonitorBlockIOStatus; -VIR_ENUM_DECL(qemuMonitorBlockIOStatus) +VIR_ENUM_DECL(qemuMonitorBlockIOStatus); VIR_ENUM_IMPL(qemuMonitorBlockIOStatus, QEMU_MONITOR_BLOCK_IO_STATUS_LAST, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 8fcac8850f..fd7dcc9196 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -267,7 +267,7 @@ typedef enum { QEMU_MONITOR_DUMP_STATUS_LAST, } qemuMonitorDumpStatus; -VIR_ENUM_DECL(qemuMonitorDumpStatus) +VIR_ENUM_DECL(qemuMonitorDumpStatus); typedef struct _qemuMonitorDumpStats qemuMonitorDumpStats; typedef qemuMonitorDumpStats *qemuMonitorDumpStatsPtr; @@ -493,7 +493,7 @@ typedef enum { QEMU_MONITOR_VM_STATUS_LAST } qemuMonitorVMStatus; -VIR_ENUM_DECL(qemuMonitorVMStatus) +VIR_ENUM_DECL(qemuMonitorVMStatus); int qemuMonitorVMStatusToPausedReason(const char *status); int qemuMonitorCheck(qemuMonitorPtr mon); @@ -701,7 +701,7 @@ typedef enum { QEMU_MONITOR_MIGRATION_STATUS_LAST } qemuMonitorMigrationStatus; -VIR_ENUM_DECL(qemuMonitorMigrationStatus) +VIR_ENUM_DECL(qemuMonitorMigrationStatus); typedef struct _qemuMonitorMigrationStats qemuMonitorMigrationStats; typedef qemuMonitorMigrationStats *qemuMonitorMigrationStatsPtr; @@ -1028,7 +1028,7 @@ typedef enum { QEMU_MONITOR_CPU_PROPERTY_LAST } qemuMonitorCPUPropertyType; -VIR_ENUM_DECL(qemuMonitorCPUProperty) +VIR_ENUM_DECL(qemuMonitorCPUProperty); typedef struct _qemuMonitorCPUProperty qemuMonitorCPUProperty; typedef qemuMonitorCPUProperty *qemuMonitorCPUPropertyPtr; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 1f7eb20a25..bf33440cdd 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -734,7 +734,7 @@ static void qemuMonitorJSONHandleRTCChange(qemuMonitorPtr mon, virJSONValuePtr d qemuMonitorEmitRTCChange(mon, offset); } -VIR_ENUM_DECL(qemuMonitorWatchdogAction) +VIR_ENUM_DECL(qemuMonitorWatchdogAction); VIR_ENUM_IMPL(qemuMonitorWatchdogAction, VIR_DOMAIN_EVENT_WATCHDOG_LAST, "none", "pause", "reset", "poweroff", "shutdown", "debug", "inject-nmi"); @@ -755,7 +755,7 @@ static void qemuMonitorJSONHandleWatchdog(qemuMonitorPtr mon, virJSONValuePtr da qemuMonitorEmitWatchdog(mon, actionID); } -VIR_ENUM_DECL(qemuMonitorIOErrorAction) +VIR_ENUM_DECL(qemuMonitorIOErrorAction); VIR_ENUM_IMPL(qemuMonitorIOErrorAction, VIR_DOMAIN_EVENT_IO_ERROR_LAST, "ignore", "stop", "report"); @@ -796,7 +796,7 @@ qemuMonitorJSONHandleIOError(qemuMonitorPtr mon, virJSONValuePtr data) } -VIR_ENUM_DECL(qemuMonitorGraphicsAddressFamily) +VIR_ENUM_DECL(qemuMonitorGraphicsAddressFamily); VIR_ENUM_IMPL(qemuMonitorGraphicsAddressFamily, VIR_DOMAIN_EVENT_GRAPHICS_ADDRESS_LAST, "ipv4", "ipv6", "unix"); diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 3be3ad02fc..124bb66219 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -89,7 +89,7 @@ enum { VIR_DAEMON_ERR_LAST }; -VIR_ENUM_DECL(virDaemonErr) +VIR_ENUM_DECL(virDaemonErr); VIR_ENUM_IMPL(virDaemonErr, VIR_DAEMON_ERR_LAST, "Initialization successful", "Unable to obtain pidfile", diff --git a/src/util/virconf.h b/src/util/virconf.h index 961a5338d4..ff4c2b6615 100644 --- a/src/util/virconf.h +++ b/src/util/virconf.h @@ -38,7 +38,7 @@ typedef enum { VIR_CONF_LAST, /* sentinel */ } virConfType; -VIR_ENUM_DECL(virConf) +VIR_ENUM_DECL(virConf); typedef enum { VIR_CONF_FLAG_VMX_FORMAT = 1, /* allow ':', '.' and '-' in names for compatibility diff --git a/src/util/virerror.c b/src/util/virerror.c index 61b47d2be0..3e1385e175 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -55,7 +55,7 @@ static virLogPriority virErrorLevelPriority(virErrorLevel level) } -VIR_ENUM_DECL(virErrorDomain) +VIR_ENUM_DECL(virErrorDomain); VIR_ENUM_IMPL(virErrorDomain, VIR_ERR_DOMAIN_LAST, "", /* 0 */ "Xen Driver", diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 5a0cf95a44..d5ca514993 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -40,13 +40,13 @@ VIR_LOG_INIT("util.firewall"); typedef struct _virFirewallGroup virFirewallGroup; typedef virFirewallGroup *virFirewallGroupPtr; -VIR_ENUM_DECL(virFirewallLayerCommand) +VIR_ENUM_DECL(virFirewallLayerCommand); VIR_ENUM_IMPL(virFirewallLayerCommand, VIR_FIREWALL_LAYER_LAST, EBTABLES_PATH, IPTABLES_PATH, IP6TABLES_PATH); -VIR_ENUM_DECL(virFirewallLayerFirewallD) +VIR_ENUM_DECL(virFirewallLayerFirewallD); VIR_ENUM_IMPL(virFirewallLayerFirewallD, VIR_FIREWALL_LAYER_LAST, "eb", "ipv4", "ipv6") diff --git a/src/util/virhook.c b/src/util/virhook.c index 2b91603dcf..cca4815023 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -41,13 +41,13 @@ VIR_LOG_INIT("util.hook"); #define LIBVIRT_HOOK_DIR SYSCONFDIR "/libvirt/hooks" -VIR_ENUM_DECL(virHookDriver) -VIR_ENUM_DECL(virHookDaemonOp) -VIR_ENUM_DECL(virHookSubop) -VIR_ENUM_DECL(virHookQemuOp) -VIR_ENUM_DECL(virHookLxcOp) -VIR_ENUM_DECL(virHookNetworkOp) -VIR_ENUM_DECL(virHookLibxlOp) +VIR_ENUM_DECL(virHookDriver); +VIR_ENUM_DECL(virHookDaemonOp); +VIR_ENUM_DECL(virHookSubop); +VIR_ENUM_DECL(virHookQemuOp); +VIR_ENUM_DECL(virHookLxcOp); +VIR_ENUM_DECL(virHookNetworkOp); +VIR_ENUM_DECL(virHookLibxlOp); VIR_ENUM_IMPL(virHookDriver, VIR_HOOK_DRIVER_LAST, diff --git a/src/util/virmdev.h b/src/util/virmdev.h index 1c584712c4..aafc8b9317 100644 --- a/src/util/virmdev.h +++ b/src/util/virmdev.h @@ -32,7 +32,7 @@ typedef enum { VIR_MDEV_MODEL_TYPE_LAST } virMediatedDeviceModelType; -VIR_ENUM_DECL(virMediatedDeviceModel) +VIR_ENUM_DECL(virMediatedDeviceModel); typedef struct _virMediatedDevice virMediatedDevice; diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 7ffd872b94..3982097cdf 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -46,7 +46,7 @@ typedef enum { VIR_NETDEV_RX_FILTER_MODE_LAST } virNetDevRxFilterMode; -VIR_ENUM_DECL(virNetDevRxFilterMode) +VIR_ENUM_DECL(virNetDevRxFilterMode); typedef struct _virNetDevRxFilter virNetDevRxFilter; typedef virNetDevRxFilter *virNetDevRxFilterPtr; @@ -86,7 +86,7 @@ typedef enum { VIR_NETDEV_IF_STATE_LAST } virNetDevIfState; -VIR_ENUM_DECL(virNetDevIfState) +VIR_ENUM_DECL(virNetDevIfState); typedef struct _virNetDevIfLink virNetDevIfLink; typedef virNetDevIfLink *virNetDevIfLinkPtr; @@ -113,7 +113,7 @@ typedef enum { VIR_NET_DEV_FEAT_LAST } virNetDevFeature; -VIR_ENUM_DECL(virNetDevFeature) +VIR_ENUM_DECL(virNetDevFeature); /* Modeled after struct ethtool_coalesce, see linux/ethtool.h for explanations * of particular fields */ diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index a8dbc85da4..504a8c89ae 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -36,7 +36,7 @@ typedef enum { VIR_NETDEV_MACVLAN_MODE_LAST, } virNetDevMacVLanMode; -VIR_ENUM_DECL(virNetDevMacVLanMode) +VIR_ENUM_DECL(virNetDevMacVLanMode); typedef enum { VIR_NETDEV_MACVLAN_CREATE_NONE = 0, diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h index 816edce531..8fe3a4dfa7 100644 --- a/src/util/virnetdevvlan.h +++ b/src/util/virnetdevvlan.h @@ -31,7 +31,7 @@ typedef enum { VIR_NATIVE_VLAN_MODE_LAST } virNativeVlanMode; -VIR_ENUM_DECL(virNativeVlanMode) +VIR_ENUM_DECL(virNativeVlanMode); typedef struct _virNetDevVlan virNetDevVlan; typedef virNetDevVlan *virNetDevVlanPtr; diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h index da52d00708..65b4779861 100644 --- a/src/util/virnetdevvportprofile.h +++ b/src/util/virnetdevvportprofile.h @@ -35,7 +35,7 @@ typedef enum virNetDevVPortProfile { VIR_NETDEV_VPORT_PROFILE_LAST, } virNetDevVPortProfileType; -VIR_ENUM_DECL(virNetDevVPort) +VIR_ENUM_DECL(virNetDevVPort); typedef enum { VIR_NETDEV_VPORT_PROFILE_OP_CREATE, @@ -49,7 +49,7 @@ typedef enum { VIR_NETDEV_VPORT_PROFILE_OP_LAST } virNetDevVPortProfileOp; -VIR_ENUM_DECL(virNetDevVPortProfileOp) +VIR_ENUM_DECL(virNetDevVPortProfileOp); /* profile data for macvtap (VEPA) and openvswitch */ typedef struct _virNetDevVPortProfile virNetDevVPortProfile; diff --git a/src/util/virpci.h b/src/util/virpci.h index 5b6330788b..0b35228e3d 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -73,7 +73,7 @@ typedef enum { VIR_PCIE_LINK_SPEED_LAST } virPCIELinkSpeed; -VIR_ENUM_DECL(virPCIELinkSpeed) +VIR_ENUM_DECL(virPCIELinkSpeed); typedef enum { VIR_PCI_HEADER_ENDPOINT = 0, @@ -83,7 +83,7 @@ typedef enum { VIR_PCI_HEADER_LAST } virPCIHeaderType; -VIR_ENUM_DECL(virPCIHeader) +VIR_ENUM_DECL(virPCIHeader); typedef struct _virPCIELink virPCIELink; typedef virPCIELink *virPCIELinkPtr; diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 892b92559b..ae35ece983 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -65,7 +65,7 @@ VIR_ENUM_IMPL(virCache, VIR_CACHE_TYPE_LAST, "data") /* Cache name mapping for resctrl interface naming. */ -VIR_ENUM_DECL(virResctrl) +VIR_ENUM_DECL(virResctrl); VIR_ENUM_IMPL(virResctrl, VIR_CACHE_TYPE_LAST, "", "CODE", diff --git a/src/util/virsecret.h b/src/util/virsecret.h index 9fdd25b53c..a44d1bcdb6 100644 --- a/src/util/virsecret.h +++ b/src/util/virsecret.h @@ -27,7 +27,7 @@ # include "virutil.h" # include "virxml.h" -VIR_ENUM_DECL(virSecretUsage) +VIR_ENUM_DECL(virSecretUsage); typedef enum { VIR_SECRET_LOOKUP_TYPE_NONE, diff --git a/src/util/virstorageencryption.h b/src/util/virstorageencryption.h index 421f0a2bcc..3fc4d970a1 100644 --- a/src/util/virstorageencryption.h +++ b/src/util/virstorageencryption.h @@ -33,7 +33,7 @@ typedef enum { VIR_STORAGE_ENCRYPTION_SECRET_TYPE_LAST } virStorageEncryptionSecretType; -VIR_ENUM_DECL(virStorageEncryptionSecret) +VIR_ENUM_DECL(virStorageEncryptionSecret); typedef struct _virStorageEncryptionSecret virStorageEncryptionSecret; typedef virStorageEncryptionSecret *virStorageEncryptionSecretPtr; @@ -62,7 +62,7 @@ typedef enum { VIR_STORAGE_ENCRYPTION_FORMAT_LAST, } virStorageEncryptionFormatType; -VIR_ENUM_DECL(virStorageEncryptionFormat) +VIR_ENUM_DECL(virStorageEncryptionFormat); typedef struct _virStorageEncryption virStorageEncryption; typedef virStorageEncryption *virStorageEncryptionPtr; diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 1d6161a2c7..34416c6abf 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -55,7 +55,7 @@ typedef enum { VIR_STORAGE_TYPE_LAST } virStorageType; -VIR_ENUM_DECL(virStorage) +VIR_ENUM_DECL(virStorage); typedef enum { @@ -138,7 +138,7 @@ typedef enum { VIR_STORAGE_NET_PROTOCOL_LAST } virStorageNetProtocol; -VIR_ENUM_DECL(virStorageNetProtocol) +VIR_ENUM_DECL(virStorageNetProtocol); typedef enum { @@ -149,7 +149,7 @@ typedef enum { VIR_STORAGE_NET_HOST_TRANS_LAST } virStorageNetHostTransport; -VIR_ENUM_DECL(virStorageNetHostTransport) +VIR_ENUM_DECL(virStorageNetHostTransport); typedef struct _virStorageNetHostDef virStorageNetHostDef; typedef virStorageNetHostDef *virStorageNetHostDefPtr; @@ -182,7 +182,7 @@ typedef enum { VIR_STORAGE_SOURCE_POOL_MODE_LAST } virStorageSourcePoolMode; -VIR_ENUM_DECL(virStorageSourcePoolMode) +VIR_ENUM_DECL(virStorageSourcePoolMode); typedef struct _virStorageSourcePoolDef virStorageSourcePoolDef; struct _virStorageSourcePoolDef { @@ -203,7 +203,7 @@ typedef enum { VIR_STORAGE_AUTH_TYPE_LAST, } virStorageAuthType; -VIR_ENUM_DECL(virStorageAuth) +VIR_ENUM_DECL(virStorageAuth); typedef struct _virStorageAuthDef virStorageAuthDef; typedef virStorageAuthDef *virStorageAuthDefPtr; diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h index f1ba3ff6c7..835ee4c62e 100644 --- a/src/util/virsysinfo.h +++ b/src/util/virsysinfo.h @@ -150,6 +150,6 @@ int virSysinfoFormat(virBufferPtr buf, virSysinfoDefPtr def) bool virSysinfoIsEqual(virSysinfoDefPtr src, virSysinfoDefPtr dst); -VIR_ENUM_DECL(virSysinfo) +VIR_ENUM_DECL(virSysinfo); #endif /* LIBVIRT_VIRSYSINFO_H */ diff --git a/src/util/virtypedparam.h b/src/util/virtypedparam.h index 4cc65cf91c..911ae52f6c 100644 --- a/src/util/virtypedparam.h +++ b/src/util/virtypedparam.h @@ -117,7 +117,7 @@ int virTypedParamsSerialize(virTypedParameterPtr params, unsigned int *remote_params_len, unsigned int flags); -VIR_ENUM_DECL(virTypedParameter) +VIR_ENUM_DECL(virTypedParameter); # define VIR_TYPED_PARAMS_DEBUG(params, nparams) \ do { \ diff --git a/src/util/virutil.h b/src/util/virutil.h index 908d8920ec..a26694ce00 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -196,8 +196,8 @@ typedef enum { VIR_TRISTATE_SWITCH_LAST } virTristateSwitch; -VIR_ENUM_DECL(virTristateBool) -VIR_ENUM_DECL(virTristateSwitch) +VIR_ENUM_DECL(virTristateBool); +VIR_ENUM_DECL(virTristateSwitch); virTristateBool virTristateBoolFromBool(bool val); virTristateSwitch virTristateSwitchFromBool(bool val); diff --git a/src/vmware/vmware_conf.h b/src/vmware/vmware_conf.h index 1edd962686..3c11d59fc0 100644 --- a/src/vmware/vmware_conf.h +++ b/src/vmware/vmware_conf.h @@ -38,7 +38,7 @@ enum vmwareDriverType { VMWARE_DRIVER_LAST, /* required last item */ }; -VIR_ENUM_DECL(vmwareDriver) +VIR_ENUM_DECL(vmwareDriver); struct vmware_driver { virMutex lock; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 92601291fd..d525f187e9 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -508,7 +508,7 @@ def->parallels[0]... /* directly map the virDomainControllerModel to virVMXSCSIControllerModel, * this is good enough for now because all virDomainControllerModel values * are actually SCSI controller models in the ESX case */ -VIR_ENUM_DECL(virVMXControllerModelSCSI) +VIR_ENUM_DECL(virVMXControllerModelSCSI); VIR_ENUM_IMPL(virVMXControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST, "auto", /* just to match virDomainControllerModel, will never be used */ "buslogic", diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index c692cc5128..4bc812e127 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -36,7 +36,7 @@ #include "virstring.h" #include "vsh-table.h" -VIR_ENUM_DECL(virshDomainIOError) +VIR_ENUM_DECL(virshDomainIOError); VIR_ENUM_IMPL(virshDomainIOError, VIR_DOMAIN_DISK_ERROR_LAST, N_("no error"), @@ -99,7 +99,7 @@ virshGetDomainDescription(vshControl *ctl, virDomainPtr dom, bool title, return desc; } -VIR_ENUM_DECL(virshDomainControlState) +VIR_ENUM_DECL(virshDomainControlState); VIR_ENUM_IMPL(virshDomainControlState, VIR_DOMAIN_CONTROL_LAST, N_("ok"), @@ -114,7 +114,7 @@ virshDomainControlStateToString(int state) return str ? _(str) : _("unknown"); } -VIR_ENUM_DECL(virshDomainControlErrorReason) +VIR_ENUM_DECL(virshDomainControlErrorReason); VIR_ENUM_IMPL(virshDomainControlErrorReason, VIR_DOMAIN_CONTROL_ERROR_REASON_LAST, "", @@ -129,7 +129,7 @@ virshDomainControlErrorReasonToString(int reason) return ret ? _(ret) : _("unknown"); } -VIR_ENUM_DECL(virshDomainState) +VIR_ENUM_DECL(virshDomainState); VIR_ENUM_IMPL(virshDomainState, VIR_DOMAIN_LAST, N_("no state"), @@ -148,12 +148,12 @@ virshDomainStateToString(int state) return str ? _(str) : _("no state"); } -VIR_ENUM_DECL(virshDomainNostateReason) +VIR_ENUM_DECL(virshDomainNostateReason); VIR_ENUM_IMPL(virshDomainNostateReason, VIR_DOMAIN_NOSTATE_LAST, N_("unknown")) -VIR_ENUM_DECL(virshDomainRunningReason) +VIR_ENUM_DECL(virshDomainRunningReason); VIR_ENUM_IMPL(virshDomainRunningReason, VIR_DOMAIN_RUNNING_LAST, N_("unknown"), @@ -168,12 +168,12 @@ VIR_ENUM_IMPL(virshDomainRunningReason, N_("crashed"), N_("post-copy")) -VIR_ENUM_DECL(virshDomainBlockedReason) +VIR_ENUM_DECL(virshDomainBlockedReason); VIR_ENUM_IMPL(virshDomainBlockedReason, VIR_DOMAIN_BLOCKED_LAST, N_("unknown")) -VIR_ENUM_DECL(virshDomainPausedReason) +VIR_ENUM_DECL(virshDomainPausedReason); VIR_ENUM_IMPL(virshDomainPausedReason, VIR_DOMAIN_PAUSED_LAST, N_("unknown"), @@ -191,13 +191,13 @@ VIR_ENUM_IMPL(virshDomainPausedReason, N_("post-copy"), N_("post-copy failed")) -VIR_ENUM_DECL(virshDomainShutdownReason) +VIR_ENUM_DECL(virshDomainShutdownReason); VIR_ENUM_IMPL(virshDomainShutdownReason, VIR_DOMAIN_SHUTDOWN_LAST, N_("unknown"), N_("user")) -VIR_ENUM_DECL(virshDomainShutoffReason) +VIR_ENUM_DECL(virshDomainShutoffReason); VIR_ENUM_IMPL(virshDomainShutoffReason, VIR_DOMAIN_SHUTOFF_LAST, N_("unknown"), @@ -210,13 +210,13 @@ VIR_ENUM_IMPL(virshDomainShutoffReason, N_("from snapshot"), N_("daemon")) -VIR_ENUM_DECL(virshDomainCrashedReason) +VIR_ENUM_DECL(virshDomainCrashedReason); VIR_ENUM_IMPL(virshDomainCrashedReason, VIR_DOMAIN_CRASHED_LAST, N_("unknown"), N_("panicked")) -VIR_ENUM_DECL(virshDomainPMSuspendedReason) +VIR_ENUM_DECL(virshDomainPMSuspendedReason); VIR_ENUM_IMPL(virshDomainPMSuspendedReason, VIR_DOMAIN_PMSUSPENDED_LAST, N_("unknown")) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e63fc028b9..30783177f9 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -97,7 +97,7 @@ virshDomainDefine(virConnectPtr conn, const char *xml, unsigned int flags) return dom; } -VIR_ENUM_DECL(virshDomainVcpuState) +VIR_ENUM_DECL(virshDomainVcpuState); VIR_ENUM_IMPL(virshDomainVcpuState, VIR_VCPU_LAST, N_("offline"), @@ -2554,7 +2554,7 @@ static const vshCmdOptDef opts_blockjob[] = { {.name = NULL} }; -VIR_ENUM_DECL(virshDomainBlockJob) +VIR_ENUM_DECL(virshDomainBlockJob); VIR_ENUM_IMPL(virshDomainBlockJob, VIR_DOMAIN_BLOCK_JOB_TYPE_LAST, N_("Unknown job"), @@ -6036,7 +6036,7 @@ static const vshCmdOptDef opts_domjobinfo[] = { {.name = NULL} }; -VIR_ENUM_DECL(virshDomainJob) +VIR_ENUM_DECL(virshDomainJob); VIR_ENUM_IMPL(virshDomainJob, VIR_DOMAIN_JOB_LAST, N_("None"), @@ -8770,7 +8770,7 @@ static const vshCmdOptDef opts_send_process_signal[] = { {.name = NULL} }; -VIR_ENUM_DECL(virDomainProcessSignal) +VIR_ENUM_DECL(virDomainProcessSignal); VIR_ENUM_IMPL(virDomainProcessSignal, VIR_DOMAIN_PROCESS_SIGNAL_LAST, "nop", "hup", "int", "quit", "ill", /* 0-4 */ @@ -12684,7 +12684,7 @@ cmdEdit(vshControl *ctl, const vshCmd *cmd) /* * "event" command */ -VIR_ENUM_DECL(virshDomainEvent) +VIR_ENUM_DECL(virshDomainEvent); VIR_ENUM_IMPL(virshDomainEvent, VIR_DOMAIN_EVENT_LAST, N_("Defined"), @@ -12704,7 +12704,7 @@ virshDomainEventToString(int event) return str ? _(str) : _("unknown"); } -VIR_ENUM_DECL(virshDomainEventDefined) +VIR_ENUM_DECL(virshDomainEventDefined); VIR_ENUM_IMPL(virshDomainEventDefined, VIR_DOMAIN_EVENT_DEFINED_LAST, N_("Added"), @@ -12712,13 +12712,13 @@ VIR_ENUM_IMPL(virshDomainEventDefined, N_("Renamed"), N_("Snapshot")) -VIR_ENUM_DECL(virshDomainEventUndefined) +VIR_ENUM_DECL(virshDomainEventUndefined); VIR_ENUM_IMPL(virshDomainEventUndefined, VIR_DOMAIN_EVENT_UNDEFINED_LAST, N_("Removed"), N_("Renamed")) -VIR_ENUM_DECL(virshDomainEventStarted) +VIR_ENUM_DECL(virshDomainEventStarted); VIR_ENUM_IMPL(virshDomainEventStarted, VIR_DOMAIN_EVENT_STARTED_LAST, N_("Booted"), @@ -12727,7 +12727,7 @@ VIR_ENUM_IMPL(virshDomainEventStarted, N_("Snapshot"), N_("Event wakeup")) -VIR_ENUM_DECL(virshDomainEventSuspended) +VIR_ENUM_DECL(virshDomainEventSuspended); VIR_ENUM_IMPL(virshDomainEventSuspended, VIR_DOMAIN_EVENT_SUSPENDED_LAST, N_("Paused"), @@ -12740,7 +12740,7 @@ VIR_ENUM_IMPL(virshDomainEventSuspended, N_("Post-copy"), N_("Post-copy Error")) -VIR_ENUM_DECL(virshDomainEventResumed) +VIR_ENUM_DECL(virshDomainEventResumed); VIR_ENUM_IMPL(virshDomainEventResumed, VIR_DOMAIN_EVENT_RESUMED_LAST, N_("Unpaused"), @@ -12748,7 +12748,7 @@ VIR_ENUM_IMPL(virshDomainEventResumed, N_("Snapshot"), N_("Post-copy")) -VIR_ENUM_DECL(virshDomainEventStopped) +VIR_ENUM_DECL(virshDomainEventStopped); VIR_ENUM_IMPL(virshDomainEventStopped, VIR_DOMAIN_EVENT_STOPPED_LAST, N_("Shutdown"), @@ -12759,20 +12759,20 @@ VIR_ENUM_IMPL(virshDomainEventStopped, N_("Failed"), N_("Snapshot")) -VIR_ENUM_DECL(virshDomainEventShutdown) +VIR_ENUM_DECL(virshDomainEventShutdown); VIR_ENUM_IMPL(virshDomainEventShutdown, VIR_DOMAIN_EVENT_SHUTDOWN_LAST, N_("Finished"), N_("Finished after guest request"), N_("Finished after host request")) -VIR_ENUM_DECL(virshDomainEventPMSuspended) +VIR_ENUM_DECL(virshDomainEventPMSuspended); VIR_ENUM_IMPL(virshDomainEventPMSuspended, VIR_DOMAIN_EVENT_PMSUSPENDED_LAST, N_("Memory"), N_("Disk")) -VIR_ENUM_DECL(virshDomainEventCrashed) +VIR_ENUM_DECL(virshDomainEventCrashed); VIR_ENUM_IMPL(virshDomainEventCrashed, VIR_DOMAIN_EVENT_CRASHED_LAST, N_("Panicked")) @@ -12815,7 +12815,7 @@ virshDomainEventDetailToString(int event, int detail) return str ? _(str) : _("unknown"); } -VIR_ENUM_DECL(virshDomainEventWatchdog) +VIR_ENUM_DECL(virshDomainEventWatchdog); VIR_ENUM_IMPL(virshDomainEventWatchdog, VIR_DOMAIN_EVENT_WATCHDOG_LAST, N_("none"), @@ -12833,7 +12833,7 @@ virshDomainEventWatchdogToString(int action) return str ? _(str) : _("unknown"); } -VIR_ENUM_DECL(virshDomainEventIOError) +VIR_ENUM_DECL(virshDomainEventIOError); VIR_ENUM_IMPL(virshDomainEventIOError, VIR_DOMAIN_EVENT_IO_ERROR_LAST, N_("none"), @@ -12847,7 +12847,7 @@ virshDomainEventIOErrorToString(int action) return str ? _(str) : _("unknown"); } -VIR_ENUM_DECL(virshGraphicsPhase) +VIR_ENUM_DECL(virshGraphicsPhase); VIR_ENUM_IMPL(virshGraphicsPhase, VIR_DOMAIN_EVENT_GRAPHICS_LAST, N_("connect"), @@ -12861,7 +12861,7 @@ virshGraphicsPhaseToString(int phase) return str ? _(str) : _("unknown"); } -VIR_ENUM_DECL(virshGraphicsAddress) +VIR_ENUM_DECL(virshGraphicsAddress); VIR_ENUM_IMPL(virshGraphicsAddress, VIR_DOMAIN_EVENT_GRAPHICS_ADDRESS_LAST, N_("IPv4"), @@ -12875,7 +12875,7 @@ virshGraphicsAddressToString(int family) return str ? _(str) : _("unknown"); } -VIR_ENUM_DECL(virshDomainBlockJobStatus) +VIR_ENUM_DECL(virshDomainBlockJobStatus); VIR_ENUM_IMPL(virshDomainBlockJobStatus, VIR_DOMAIN_BLOCK_JOB_LAST, N_("completed"), @@ -12890,7 +12890,7 @@ virshDomainBlockJobStatusToString(int status) return str ? _(str) : _("unknown"); } -VIR_ENUM_DECL(virshDomainEventDiskChange) +VIR_ENUM_DECL(virshDomainEventDiskChange); VIR_ENUM_IMPL(virshDomainEventDiskChange, VIR_DOMAIN_EVENT_DISK_CHANGE_LAST, N_("changed"), @@ -12903,7 +12903,7 @@ virshDomainEventDiskChangeToString(int reason) return str ? _(str) : _("unknown"); } -VIR_ENUM_DECL(virshDomainEventTrayChange) +VIR_ENUM_DECL(virshDomainEventTrayChange); VIR_ENUM_IMPL(virshDomainEventTrayChange, VIR_DOMAIN_EVENT_TRAY_CHANGE_LAST, N_("opened"), @@ -13227,14 +13227,14 @@ virshEventTunablePrint(virConnectPtr conn ATTRIBUTE_UNUSED, virshEventPrint(opaque, &buf); } -VIR_ENUM_DECL(virshEventAgentLifecycleState) +VIR_ENUM_DECL(virshEventAgentLifecycleState); VIR_ENUM_IMPL(virshEventAgentLifecycleState, VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_STATE_LAST, N_("unknown"), N_("connected"), N_("disconnected")) -VIR_ENUM_DECL(virshEventAgentLifecycleReason) +VIR_ENUM_DECL(virshEventAgentLifecycleReason); VIR_ENUM_IMPL(virshEventAgentLifecycleReason, VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_LAST, N_("unknown"), @@ -13313,7 +13313,7 @@ virshEventDeviceRemovalFailedPrint(virConnectPtr conn ATTRIBUTE_UNUSED, virshEventPrint(opaque, &buf); } -VIR_ENUM_DECL(virshEventMetadataChangeType) +VIR_ENUM_DECL(virshEventMetadataChangeType); VIR_ENUM_IMPL(virshEventMetadataChangeType, VIR_DOMAIN_METADATA_LAST, N_("description"), diff --git a/tools/virsh-network.c b/tools/virsh-network.c index a30b4f4389..5736c8d436 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -904,11 +904,11 @@ static const vshCmdOptDef opts_network_update[] = { {.name = NULL} }; -VIR_ENUM_DECL(virNetworkUpdateCommand) +VIR_ENUM_DECL(virNetworkUpdateCommand); VIR_ENUM_IMPL(virNetworkUpdateCommand, VIR_NETWORK_UPDATE_COMMAND_LAST, "none", "modify", "delete", "add-last", "add-first"); -VIR_ENUM_DECL(virNetworkSection) +VIR_ENUM_DECL(virNetworkSection); VIR_ENUM_IMPL(virNetworkSection, VIR_NETWORK_SECTION_LAST, "none", "bridge", "domain", "ip", "ip-dhcp-host", "ip-dhcp-range", "forward", "forward-interface", @@ -1136,7 +1136,7 @@ cmdNetworkEdit(vshControl *ctl, const vshCmd *cmd) /* * "net-event" command */ -VIR_ENUM_DECL(virshNetworkEvent) +VIR_ENUM_DECL(virshNetworkEvent); VIR_ENUM_IMPL(virshNetworkEvent, VIR_NETWORK_EVENT_LAST, N_("Defined"), @@ -1159,7 +1159,7 @@ struct virshNetEventData { }; typedef struct virshNetEventData virshNetEventData; -VIR_ENUM_DECL(virshNetworkEventId) +VIR_ENUM_DECL(virshNetworkEventId); VIR_ENUM_IMPL(virshNetworkEventId, VIR_NETWORK_EVENT_ID_LAST, "lifecycle") diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index 9da3ad2e19..3474d10fb6 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -755,7 +755,7 @@ cmdNodeDeviceReset(vshControl *ctl, const vshCmd *cmd) /* * "nodedev-event" command */ -VIR_ENUM_DECL(virshNodeDeviceEvent) +VIR_ENUM_DECL(virshNodeDeviceEvent); VIR_ENUM_IMPL(virshNodeDeviceEvent, VIR_NODE_DEVICE_EVENT_LAST, N_("Created"), diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 70ca39bd3d..f79006d549 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -1029,7 +1029,7 @@ virshStoragePoolListCollect(vshControl *ctl, } -VIR_ENUM_DECL(virshStoragePoolState) +VIR_ENUM_DECL(virshStoragePoolState); VIR_ENUM_IMPL(virshStoragePoolState, VIR_STORAGE_POOL_STATE_LAST, N_("inactive"), @@ -1880,7 +1880,7 @@ cmdPoolEdit(vshControl *ctl, const vshCmd *cmd) /* * "pool-event" command */ -VIR_ENUM_DECL(virshPoolEvent) +VIR_ENUM_DECL(virshPoolEvent); VIR_ENUM_IMPL(virshPoolEvent, VIR_STORAGE_POOL_EVENT_LAST, N_("Defined"), diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 30bdec2657..9446931203 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -565,7 +565,7 @@ cmdSecretList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* * "Secret-event" command */ -VIR_ENUM_DECL(virshSecretEvent) +VIR_ENUM_DECL(virshSecretEvent); VIR_ENUM_IMPL(virshSecretEvent, VIR_SECRET_EVENT_LAST, N_("Defined"), diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 7294d6f045..3851985a1f 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -935,7 +935,7 @@ static const vshCmdOptDef opts_vol_wipe[] = { {.name = NULL} }; -VIR_ENUM_DECL(virStorageVolWipeAlgorithm) +VIR_ENUM_DECL(virStorageVolWipeAlgorithm); VIR_ENUM_IMPL(virStorageVolWipeAlgorithm, VIR_STORAGE_VOL_WIPE_ALG_LAST, "zero", "nnsa", "dod", "bsi", "gutmann", "schneier", "pfitzner7", "pfitzner33", "random", "trim"); @@ -981,7 +981,7 @@ cmdVolWipe(vshControl *ctl, const vshCmd *cmd) } -VIR_ENUM_DECL(virshStorageVol) +VIR_ENUM_DECL(virshStorageVol); VIR_ENUM_IMPL(virshStorageVol, VIR_STORAGE_VOL_LAST, N_("file"), diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 0dfb86ee62..1d92169c80 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -54,7 +54,7 @@ static char *progname; static const vshCmdGrp cmdGroups[]; static const vshClientHooks hooks; -VIR_ENUM_DECL(virClientTransport) +VIR_ENUM_DECL(virClientTransport); VIR_ENUM_IMPL(virClientTransport, VIR_CLIENT_TRANS_LAST, N_("unix"), -- 2.20.1

Missing semicolon at the end of macros can confuse some analyzers (like cppcheck <filename>), and we have a mix of semicolon and non-semicolon usage through the code. Let's standardize on using a semicolon for VIR_LOG_INIT calls. Signed-off-by: Cole Robinson <crobinso@redhat.com> --- src/conf/capabilities.c | 2 +- src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_tpm.c | 2 +- src/util/virfilecache.c | 2 +- src/util/virresctrl.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index fffae23b28..c3ccf1a18b 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -45,7 +45,7 @@ #define SYSFS_SYSTEM_PATH "/sys/devices/system" -VIR_LOG_INIT("conf.capabilities") +VIR_LOG_INIT("conf.capabilities"); VIR_ENUM_DECL(virCapsHostPMTarget); VIR_ENUM_IMPL(virCapsHostPMTarget, VIR_NODE_SUSPEND_TARGET_LAST, diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index 5775563508..a21caefaba 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -33,7 +33,7 @@ #define VIR_FROM_THIS VIR_FROM_QEMU -VIR_LOG_INIT("qemu.qemu_extdevice") +VIR_LOG_INIT("qemu.qemu_extdevice"); int qemuExtDeviceLogCommand(qemuDomainLogContextPtr logCtxt, diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 15b6ab8870..835a9caf46 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -44,7 +44,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE -VIR_LOG_INIT("qemu.tpm") +VIR_LOG_INIT("qemu.tpm"); /* * executables for the swtpm; to be found on the host diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c index 15c0d99fd9..eb7dbd97cc 100644 --- a/src/util/virfilecache.c +++ b/src/util/virfilecache.c @@ -41,7 +41,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE -VIR_LOG_INIT("util.filecache") +VIR_LOG_INIT("util.filecache"); struct _virFileCache { diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 626a5cdc21..a9eae5192a 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -33,7 +33,7 @@ #define VIR_FROM_THIS VIR_FROM_RESCTRL -VIR_LOG_INIT("util.virresctrl") +VIR_LOG_INIT("util.virresctrl"); /* Resctrl is short for Resource Control. It might be implemented for various -- 2.20.1

Drop the semicolon from the final statement of the macro, so the compiler will require callers to add a semicolon. Signed-off-by: Cole Robinson <crobinso@redhat.com> --- src/util/virutil.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virutil.h b/src/util/virutil.h index d1c7d6e138..d5adab61e2 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -96,7 +96,7 @@ const char *virEnumToString(const char *const*types, # define VIR_ENUM_DECL(name) \ const char *name ## TypeToString(int type); \ - int name ## TypeFromString(const char*type); + int name ## TypeFromString(const char*type) /* No-op workarounds for functionality missing in mingw. */ # ifndef HAVE_GETUID -- 2.20.1

Drop the semicolon from the final statement of the macro, so the compiler will require callers to add a semicolon. Signed-off-by: Cole Robinson <crobinso@redhat.com> --- src/util/virlog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virlog.h b/src/util/virlog.h index 8edd390378..775a726b06 100644 --- a/src/util/virlog.h +++ b/src/util/virlog.h @@ -79,7 +79,7 @@ struct _virLogSource { .priority = VIR_LOG_ERROR, \ .serial = 0, \ .flags = 0, \ - }; + } /* * If configured with --enable-debug=yes then library calls -- 2.20.1

This is a follow on from a discussion with Andrea here: https://www.redhat.com/archives/libvir-list/2019-January/msg00750.html Most VIR_ENUM_IMPLS look like this: VIR_ENUM_IMPL(XXX, XXX, "value1", "value2"); But he and I find this format nicer: VIR_ENUM_IMPL(XXX, XXX, "value1", "value2", ); The latter format means new enum additions only trigger 1 line of diff, vs 2 for the current common method. Since this patch series is already touching a lot of VIR_ENUM_IMPL endings, now is as good a time as any to widely switch to that format if others agree. Signed-off-by: Cole Robinson <crobinso@redhat.com> --- src/access/viraccessperm.c | 30 ++- src/conf/capabilities.c | 3 +- src/conf/cpu_conf.c | 21 ++- src/conf/domain_capabilities.c | 3 +- src/conf/domain_conf.c | 309 ++++++++++++++++++++----------- src/conf/interface_conf.c | 3 +- src/conf/netdev_vlan_conf.c | 3 +- src/conf/network_conf.c | 15 +- src/conf/node_device_conf.c | 12 +- src/conf/numa_conf.c | 9 +- src/conf/nwfilter_conf.c | 21 ++- src/conf/snapshot_conf.c | 6 +- src/conf/storage_adapter_conf.c | 3 +- src/conf/storage_conf.c | 24 ++- src/locking/lock_daemon.c | 3 +- src/logging/log_daemon.c | 3 +- src/lxc/lxc_domain.c | 6 +- src/network/leaseshelper.c | 3 +- src/qemu/qemu_agent.c | 6 +- src/qemu/qemu_command.c | 27 ++- src/qemu/qemu_driver.c | 6 +- src/qemu/qemu_migration_cookie.c | 3 +- src/qemu/qemu_monitor.c | 12 +- src/qemu/qemu_monitor_json.c | 12 +- src/remote/remote_daemon.c | 3 +- src/util/vircgroup.c | 3 +- src/util/vircgroupbackend.c | 3 +- src/util/vircgroupv1.c | 3 +- src/util/vircgroupv2.c | 3 +- src/util/virconf.c | 3 +- src/util/virerror.c | 2 +- src/util/virfirewall.c | 6 +- src/util/virgic.c | 2 +- src/util/virhook.c | 21 ++- src/util/virkeycode.c | 2 +- src/util/virlog.c | 3 +- src/util/virmdev.c | 3 +- src/util/virnetdev.c | 9 +- src/util/virnetdevmacvlan.c | 3 +- src/util/virnetdevvportprofile.c | 6 +- src/util/virpci.c | 7 +- src/util/virperf.c | 3 +- src/util/virprocess.c | 3 +- src/util/virresctrl.c | 12 +- src/util/virsecret.c | 3 +- src/util/virstorageencryption.c | 7 +- src/util/virstoragefile.c | 20 +- src/util/virsysinfo.c | 3 +- src/util/virtypedparam.c | 3 +- src/util/virutil.c | 6 +- src/vmware/vmware_conf.c | 3 +- tools/virsh-domain-monitor.c | 36 ++-- 52 files changed, 481 insertions(+), 243 deletions(-) diff --git a/src/access/viraccessperm.c b/src/access/viraccessperm.c index d7cbb70b7b..67f751ef9c 100644 --- a/src/access/viraccessperm.c +++ b/src/access/viraccessperm.c @@ -31,7 +31,8 @@ VIR_ENUM_IMPL(virAccessPermConnect, "search_interfaces", "search_secrets", "search_nwfilters", "search_nwfilter_bindings", "detect_storage_pools", "pm_control", - "interface_transaction"); + "interface_transaction", +); VIR_ENUM_IMPL(virAccessPermDomain, VIR_ACCESS_PERM_DOMAIN_LAST, @@ -43,48 +44,57 @@ VIR_ENUM_IMPL(virAccessPermDomain, "fs_trim", "fs_freeze", "block_read", "block_write", "mem_read", "open_graphics", "open_device", "screenshot", - "open_namespace", "set_time", "set_password"); + "open_namespace", "set_time", "set_password", +); VIR_ENUM_IMPL(virAccessPermInterface, VIR_ACCESS_PERM_INTERFACE_LAST, "getattr", "read", "write", "save", - "delete", "start", "stop"); + "delete", "start", "stop", +); VIR_ENUM_IMPL(virAccessPermNetwork, VIR_ACCESS_PERM_NETWORK_LAST, "getattr", "read", "write", - "save", "delete", "start", "stop"); + "save", "delete", "start", "stop", +); VIR_ENUM_IMPL(virAccessPermNodeDevice, VIR_ACCESS_PERM_NODE_DEVICE_LAST, "getattr", "read", "write", "start", "stop", - "detach"); + "detach", +); VIR_ENUM_IMPL(virAccessPermNWFilter, VIR_ACCESS_PERM_NWFILTER_LAST, "getattr", "read", "write", - "save", "delete"); + "save", "delete", +); VIR_ENUM_IMPL(virAccessPermNWFilterBinding, VIR_ACCESS_PERM_NWFILTER_BINDING_LAST, "getattr", "read", - "create", "delete"); + "create", "delete", +); VIR_ENUM_IMPL(virAccessPermSecret, VIR_ACCESS_PERM_SECRET_LAST, "getattr", "read", "write", - "read_secure", "save", "delete"); + "read_secure", "save", "delete", +); VIR_ENUM_IMPL(virAccessPermStoragePool, VIR_ACCESS_PERM_STORAGE_POOL_LAST, "getattr", "read", "write", "save", "delete", "start", "stop", "refresh", "search_storage_vols", - "format"); + "format", +); VIR_ENUM_IMPL(virAccessPermStorageVol, VIR_ACCESS_PERM_STORAGE_VOL_LAST, "getattr", "read", "create", "delete", "format", "resize", "data_read", - "data_write"); + "data_write", +); diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 47c196c7bf..b774c6ee22 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -49,7 +49,8 @@ VIR_LOG_INIT("conf.capabilities"); VIR_ENUM_DECL(virCapsHostPMTarget); VIR_ENUM_IMPL(virCapsHostPMTarget, VIR_NODE_SUSPEND_TARGET_LAST, - "suspend_mem", "suspend_disk", "suspend_hybrid"); + "suspend_mem", "suspend_disk", "suspend_hybrid", +); static virClassPtr virCapsClass; static void virCapsDispose(void *obj); diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 44a0b774a4..5f11dd1b0a 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -33,39 +33,46 @@ VIR_LOG_INIT("conf.cpu_conf"); VIR_ENUM_IMPL(virCPU, VIR_CPU_TYPE_LAST, - "host", "guest", "auto"); + "host", "guest", "auto", +); VIR_ENUM_IMPL(virCPUMode, VIR_CPU_MODE_LAST, "custom", "host-model", - "host-passthrough"); + "host-passthrough", +); VIR_ENUM_IMPL(virCPUMatch, VIR_CPU_MATCH_LAST, "minimum", "exact", - "strict"); + "strict", +); VIR_ENUM_IMPL(virCPUCheck, VIR_CPU_CHECK_LAST, "default", "none", "partial", - "full"); + "full", +); VIR_ENUM_IMPL(virCPUFallback, VIR_CPU_FALLBACK_LAST, "allow", - "forbid"); + "forbid", +); VIR_ENUM_IMPL(virCPUFeaturePolicy, VIR_CPU_FEATURE_LAST, "force", "require", "optional", "disable", - "forbid"); + "forbid", +); VIR_ENUM_IMPL(virCPUCacheMode, VIR_CPU_CACHE_MODE_LAST, "emulate", "passthrough", - "disable"); + "disable", +); void diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index e31b41e982..6352eda343 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -28,7 +28,8 @@ #define VIR_FROM_THIS VIR_FROM_CAPABILITIES VIR_ENUM_IMPL(virDomainCapsCPUUsable, VIR_DOMCAPS_CPU_USABLE_LAST, - "unknown", "yes", "no"); + "unknown", "yes", "no", +); static virClassPtr virDomainCapsClass; static virClassPtr virDomainCapsCPUModelsClass; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d486271377..fb97149f05 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -99,7 +99,8 @@ VIR_ENUM_IMPL(virDomainTaint, VIR_DOMAIN_TAINT_LAST, "hook-script", "cdrom-passthrough", "custom-dtb", - "custom-ga-command"); + "custom-ga-command", +); VIR_ENUM_IMPL(virDomainVirt, VIR_DOMAIN_VIRT_LAST, "none", @@ -117,7 +118,8 @@ VIR_ENUM_IMPL(virDomainVirt, VIR_DOMAIN_VIRT_LAST, "phyp", "parallels", "bhyve", - "vz"); + "vz", +); VIR_ENUM_IMPL(virDomainOS, VIR_DOMAIN_OSTYPE_LAST, "hvm", @@ -125,13 +127,15 @@ VIR_ENUM_IMPL(virDomainOS, VIR_DOMAIN_OSTYPE_LAST, "linux", "exe", "uml", - "xenpvh"); + "xenpvh", +); VIR_ENUM_IMPL(virDomainBoot, VIR_DOMAIN_BOOT_LAST, "fd", "cdrom", "hd", - "network"); + "network", +); VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST, "acpi", @@ -158,7 +162,8 @@ VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST, VIR_ENUM_IMPL(virDomainCapabilitiesPolicy, VIR_DOMAIN_CAPABILITIES_POLICY_LAST, "default", "allow", - "deny"); + "deny", +); VIR_ENUM_IMPL(virDomainHyperv, VIR_DOMAIN_HYPERV_LAST, "relaxed", @@ -178,7 +183,8 @@ VIR_ENUM_IMPL(virDomainHyperv, VIR_DOMAIN_HYPERV_LAST, ); VIR_ENUM_IMPL(virDomainKVM, VIR_DOMAIN_KVM_LAST, - "hidden"); + "hidden", +); VIR_ENUM_IMPL(virDomainCapsFeature, VIR_DOMAIN_CAPS_FEATURE_LAST, "audit_control", @@ -217,12 +223,14 @@ VIR_ENUM_IMPL(virDomainCapsFeature, VIR_DOMAIN_CAPS_FEATURE_LAST, "sys_time", "sys_tty_config", "syslog", - "wake_alarm"); + "wake_alarm", +); VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_LAST, "poweroff", "reboot", - "crash"); + "crash", +); VIR_ENUM_IMPL(virDomainLifecycleAction, VIR_DOMAIN_LIFECYCLE_ACTION_LAST, "destroy", @@ -230,14 +238,16 @@ VIR_ENUM_IMPL(virDomainLifecycleAction, VIR_DOMAIN_LIFECYCLE_ACTION_LAST, "rename-restart", "preserve", "coredump-destroy", - "coredump-restart"); + "coredump-restart", +); VIR_ENUM_IMPL(virDomainLockFailure, VIR_DOMAIN_LOCK_FAILURE_LAST, "default", "poweroff", "restart", "pause", - "ignore"); + "ignore", +); VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST, "none", @@ -264,19 +274,22 @@ VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST, "panic", "memory", "iommu", - "vsock"); + "vsock", +); VIR_ENUM_IMPL(virDomainDiskDevice, VIR_DOMAIN_DISK_DEVICE_LAST, "disk", "cdrom", "floppy", - "lun"); + "lun", +); VIR_ENUM_IMPL(virDomainDiskGeometryTrans, VIR_DOMAIN_DISK_TRANS_LAST, "default", "none", "auto", - "lba"); + "lba", +); VIR_ENUM_IMPL(virDomainDiskBus, VIR_DOMAIN_DISK_BUS_LAST, "ide", @@ -287,7 +300,8 @@ VIR_ENUM_IMPL(virDomainDiskBus, VIR_DOMAIN_DISK_BUS_LAST, "usb", "uml", "sata", - "sd"); + "sd", +); VIR_ENUM_IMPL(virDomainDiskCache, VIR_DOMAIN_DISK_CACHE_LAST, "default", @@ -295,24 +309,28 @@ VIR_ENUM_IMPL(virDomainDiskCache, VIR_DOMAIN_DISK_CACHE_LAST, "writethrough", "writeback", "directsync", - "unsafe"); + "unsafe", +); VIR_ENUM_IMPL(virDomainDiskErrorPolicy, VIR_DOMAIN_DISK_ERROR_POLICY_LAST, "default", "stop", "report", "ignore", - "enospace"); + "enospace", +); VIR_ENUM_IMPL(virDomainDiskIo, VIR_DOMAIN_DISK_IO_LAST, "default", "native", - "threads"); + "threads", +); VIR_ENUM_IMPL(virDomainDeviceSGIO, VIR_DOMAIN_DEVICE_SGIO_LAST, "default", "filtered", - "unfiltered"); + "unfiltered", +); VIR_ENUM_IMPL(virDomainController, VIR_DOMAIN_CONTROLLER_TYPE_LAST, "ide", @@ -322,7 +340,8 @@ VIR_ENUM_IMPL(virDomainController, VIR_DOMAIN_CONTROLLER_TYPE_LAST, "virtio-serial", "ccid", "usb", - "pci"); + "pci", +); VIR_ENUM_IMPL(virDomainControllerModelPCI, VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST, "pci-root", @@ -334,7 +353,8 @@ VIR_ENUM_IMPL(virDomainControllerModelPCI, VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST, "pcie-switch-upstream-port", "pcie-switch-downstream-port", "pci-expander-bus", - "pcie-expander-bus"); + "pcie-expander-bus", +); VIR_ENUM_IMPL(virDomainControllerPCIModelName, VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_LAST, @@ -375,12 +395,14 @@ VIR_ENUM_IMPL(virDomainControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST, "qusb1", "qusb2", "qemu-xhci", - "none"); + "none", +); VIR_ENUM_IMPL(virDomainControllerModelIDE, VIR_DOMAIN_CONTROLLER_MODEL_IDE_LAST, "piix3", "piix4", - "ich6"); + "ich6", +); VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, "mount", @@ -389,7 +411,8 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, "template", "ram", "bind", - "volume"); + "volume", +); VIR_ENUM_IMPL(virDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "default", @@ -397,16 +420,19 @@ VIR_ENUM_IMPL(virDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "handle", "loop", "nbd", - "ploop"); + "ploop", +); VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST, "passthrough", "mapped", - "squash"); + "squash", +); VIR_ENUM_IMPL(virDomainFSWrpolicy, VIR_DOMAIN_FS_WRPOLICY_LAST, "default", - "immediate"); + "immediate", +); VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, "user", @@ -420,27 +446,32 @@ VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, "internal", "direct", "hostdev", - "udp"); + "udp", +); VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST, "default", "qemu", - "vhost"); + "vhost", +); VIR_ENUM_IMPL(virDomainNetVirtioTxMode, VIR_DOMAIN_NET_VIRTIO_TX_MODE_LAST, "default", "iothread", - "timer"); + "timer", +); VIR_ENUM_IMPL(virDomainNetInterfaceLinkState, VIR_DOMAIN_NET_INTERFACE_LINK_STATE_LAST, "default", "up", - "down"); + "down", +); VIR_ENUM_IMPL(virDomainChrDeviceState, VIR_DOMAIN_CHR_DEVICE_STATE_LAST, "default", "connected", - "disconnected"); + "disconnected", +); VIR_ENUM_IMPL(virDomainChrSerialTarget, VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST, @@ -458,7 +489,8 @@ VIR_ENUM_IMPL(virDomainChrChannelTarget, "none", "guestfwd", "virtio", - "xen"); + "xen", +); VIR_ENUM_IMPL(virDomainChrConsoleTarget, VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LAST, @@ -470,7 +502,8 @@ VIR_ENUM_IMPL(virDomainChrConsoleTarget, "lxc", "openvz", "sclp", - "sclplm"); + "sclplm", +); VIR_ENUM_IMPL(virDomainChrSerialTargetModel, VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST, @@ -489,7 +522,8 @@ VIR_ENUM_IMPL(virDomainChrDevice, VIR_DOMAIN_CHR_DEVICE_TYPE_LAST, "parallel", "serial", "console", - "channel"); + "channel", +); VIR_ENUM_IMPL(virDomainChr, VIR_DOMAIN_CHR_TYPE_LAST, "null", @@ -504,28 +538,33 @@ VIR_ENUM_IMPL(virDomainChr, VIR_DOMAIN_CHR_TYPE_LAST, "unix", "spicevmc", "spiceport", - "nmdm"); + "nmdm", +); VIR_ENUM_IMPL(virDomainChrTcpProtocol, VIR_DOMAIN_CHR_TCP_PROTOCOL_LAST, "raw", "telnet", "telnets", - "tls"); + "tls", +); VIR_ENUM_IMPL(virDomainChrSpicevmc, VIR_DOMAIN_CHR_SPICEVMC_LAST, "vdagent", "smartcard", - "usbredir"); + "usbredir", +); VIR_ENUM_IMPL(virDomainSmartcard, VIR_DOMAIN_SMARTCARD_TYPE_LAST, "host", "host-certificates", - "passthrough"); + "passthrough", +); VIR_ENUM_IMPL(virDomainSoundCodec, VIR_DOMAIN_SOUND_CODEC_TYPE_LAST, "duplex", "micro", - "output"); + "output", +); VIR_ENUM_IMPL(virDomainSoundModel, VIR_DOMAIN_SOUND_MODEL_LAST, "sb16", @@ -534,12 +573,14 @@ VIR_ENUM_IMPL(virDomainSoundModel, VIR_DOMAIN_SOUND_MODEL_LAST, "ac97", "ich6", "ich9", - "usb"); + "usb", +); VIR_ENUM_IMPL(virDomainKeyWrapCipherName, VIR_DOMAIN_KEY_WRAP_CIPHER_NAME_LAST, "aes", - "dea"); + "dea", +); VIR_ENUM_IMPL(virDomainMemballoonModel, VIR_DOMAIN_MEMBALLOON_MODEL_LAST, "virtio", @@ -550,12 +591,14 @@ VIR_ENUM_IMPL(virDomainSmbiosMode, VIR_DOMAIN_SMBIOS_LAST, "none", "emulate", "host", - "sysinfo"); + "sysinfo", +); VIR_ENUM_IMPL(virDomainWatchdogModel, VIR_DOMAIN_WATCHDOG_MODEL_LAST, "i6300esb", "ib700", - "diag288"); + "diag288", +); VIR_ENUM_IMPL(virDomainWatchdogAction, VIR_DOMAIN_WATCHDOG_ACTION_LAST, "reset", @@ -564,14 +607,16 @@ VIR_ENUM_IMPL(virDomainWatchdogAction, VIR_DOMAIN_WATCHDOG_ACTION_LAST, "pause", "dump", "none", - "inject-nmi"); + "inject-nmi", +); VIR_ENUM_IMPL(virDomainPanicModel, VIR_DOMAIN_PANIC_MODEL_LAST, "default", "isa", "pseries", "hyperv", - "s390"); + "s390", +); VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "default", @@ -584,25 +629,29 @@ VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "parallels", "virtio", "gop", - "none"); + "none", +); VIR_ENUM_IMPL(virDomainVideoVGAConf, VIR_DOMAIN_VIDEO_VGACONF_LAST, "io", "on", - "off"); + "off", +); VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST, "mouse", "tablet", "keyboard", - "passthrough"); + "passthrough", +); VIR_ENUM_IMPL(virDomainInputBus, VIR_DOMAIN_INPUT_BUS_LAST, "ps2", "usb", "xen", "parallels", - "virtio"); + "virtio", +); VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST, "sdl", @@ -610,27 +659,31 @@ VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST, "rdp", "desktop", "spice", - "egl-headless"); + "egl-headless", +); VIR_ENUM_IMPL(virDomainGraphicsListen, VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST, "none", "address", "network", - "socket"); + "socket", +); VIR_ENUM_IMPL(virDomainGraphicsAuthConnected, VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_LAST, "default", "fail", "disconnect", - "keep"); + "keep", +); VIR_ENUM_IMPL(virDomainGraphicsVNCSharePolicy, VIR_DOMAIN_GRAPHICS_VNC_SHARE_LAST, "default", "allow-exclusive", "force-shared", - "ignore"); + "ignore", +); VIR_ENUM_IMPL(virDomainGraphicsSpiceChannelName, VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST, @@ -641,13 +694,15 @@ VIR_ENUM_IMPL(virDomainGraphicsSpiceChannelName, "playback", "record", "smartcard", - "usbredir"); + "usbredir", +); VIR_ENUM_IMPL(virDomainGraphicsSpiceChannelMode, VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_LAST, "any", "secure", - "insecure"); + "insecure", +); VIR_ENUM_IMPL(virDomainGraphicsSpiceImageCompression, VIR_DOMAIN_GRAPHICS_SPICE_IMAGE_COMPRESSION_LAST, @@ -657,73 +712,86 @@ VIR_ENUM_IMPL(virDomainGraphicsSpiceImageCompression, "quic", "glz", "lz", - "off"); + "off", +); VIR_ENUM_IMPL(virDomainGraphicsSpiceJpegCompression, VIR_DOMAIN_GRAPHICS_SPICE_JPEG_COMPRESSION_LAST, "default", "auto", "never", - "always"); + "always", +); VIR_ENUM_IMPL(virDomainGraphicsSpiceZlibCompression, VIR_DOMAIN_GRAPHICS_SPICE_ZLIB_COMPRESSION_LAST, "default", "auto", "never", - "always"); + "always", +); VIR_ENUM_IMPL(virDomainGraphicsSpiceMouseMode, VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_LAST, "default", "server", - "client"); + "client", +); VIR_ENUM_IMPL(virDomainGraphicsSpiceStreamingMode, VIR_DOMAIN_GRAPHICS_SPICE_STREAMING_MODE_LAST, "default", "filter", "all", - "off"); + "off", +); VIR_ENUM_IMPL(virDomainHostdevMode, VIR_DOMAIN_HOSTDEV_MODE_LAST, "subsystem", - "capabilities"); + "capabilities", +); VIR_ENUM_IMPL(virDomainHostdevSubsys, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST, "usb", "pci", "scsi", "scsi_host", - "mdev"); + "mdev", +); VIR_ENUM_IMPL(virDomainHostdevSubsysPCIBackend, VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST, "default", "kvm", "vfio", - "xen"); + "xen", +); VIR_ENUM_IMPL(virDomainHostdevSubsysSCSIProtocol, VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_LAST, "adapter", - "iscsi"); + "iscsi", +); VIR_ENUM_IMPL(virDomainHostdevSubsysSCSIHostProtocol, VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_LAST, "none", - "vhost"); + "vhost", +); VIR_ENUM_IMPL(virDomainHostdevCaps, VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST, "storage", "misc", - "net"); + "net", +); VIR_ENUM_IMPL(virDomainHub, VIR_DOMAIN_HUB_TYPE_LAST, - "usb"); + "usb", +); VIR_ENUM_IMPL(virDomainRedirdevBus, VIR_DOMAIN_REDIRDEV_BUS_LAST, - "usb"); + "usb", +); VIR_ENUM_IMPL(virDomainState, VIR_DOMAIN_LAST, "nostate", @@ -733,10 +801,12 @@ VIR_ENUM_IMPL(virDomainState, VIR_DOMAIN_LAST, "shutdown", "shutoff", "crashed", - "pmsuspended"); + "pmsuspended", +); VIR_ENUM_IMPL(virDomainNostateReason, VIR_DOMAIN_NOSTATE_LAST, - "unknown"); + "unknown", +); VIR_ENUM_IMPL(virDomainRunningReason, VIR_DOMAIN_RUNNING_LAST, "unknown", @@ -749,10 +819,12 @@ VIR_ENUM_IMPL(virDomainRunningReason, VIR_DOMAIN_RUNNING_LAST, "save canceled", "wakeup", "crashed", - "post-copy"); + "post-copy", +); VIR_ENUM_IMPL(virDomainBlockedReason, VIR_DOMAIN_BLOCKED_LAST, - "unknown"); + "unknown", +); VIR_ENUM_IMPL(virDomainPausedReason, VIR_DOMAIN_PAUSED_LAST, "unknown", @@ -768,11 +840,13 @@ VIR_ENUM_IMPL(virDomainPausedReason, VIR_DOMAIN_PAUSED_LAST, "panicked", "starting up", "post-copy", - "post-copy failed"); + "post-copy failed", +); VIR_ENUM_IMPL(virDomainShutdownReason, VIR_DOMAIN_SHUTDOWN_LAST, "unknown", - "user"); + "user", +); VIR_ENUM_IMPL(virDomainShutoffReason, VIR_DOMAIN_SHUTOFF_LAST, "unknown", @@ -783,30 +857,36 @@ VIR_ENUM_IMPL(virDomainShutoffReason, VIR_DOMAIN_SHUTOFF_LAST, "saved", "failed", "from snapshot", - "daemon"); + "daemon", +); VIR_ENUM_IMPL(virDomainCrashedReason, VIR_DOMAIN_CRASHED_LAST, "unknown", - "panicked"); + "panicked", +); VIR_ENUM_IMPL(virDomainPMSuspendedReason, VIR_DOMAIN_PMSUSPENDED_LAST, - "unknown"); + "unknown", +); VIR_ENUM_IMPL(virDomainSeclabel, VIR_DOMAIN_SECLABEL_LAST, "default", "none", "dynamic", - "static"); + "static", +); VIR_ENUM_IMPL(virDomainClockOffset, VIR_DOMAIN_CLOCK_OFFSET_LAST, "utc", "localtime", "variable", - "timezone"); + "timezone", +); VIR_ENUM_IMPL(virDomainClockBasis, VIR_DOMAIN_CLOCK_BASIS_LAST, "utc", - "localtime"); + "localtime", +); VIR_ENUM_IMPL(virDomainTimerName, VIR_DOMAIN_TIMER_NAME_LAST, "platform", @@ -815,39 +895,46 @@ VIR_ENUM_IMPL(virDomainTimerName, VIR_DOMAIN_TIMER_NAME_LAST, "hpet", "tsc", "kvmclock", - "hypervclock"); + "hypervclock", +); VIR_ENUM_IMPL(virDomainTimerTrack, VIR_DOMAIN_TIMER_TRACK_LAST, "boot", "guest", - "wall"); + "wall", +); VIR_ENUM_IMPL(virDomainTimerTickpolicy, VIR_DOMAIN_TIMER_TICKPOLICY_LAST, "delay", "catchup", "merge", - "discard"); + "discard", +); VIR_ENUM_IMPL(virDomainTimerMode, VIR_DOMAIN_TIMER_MODE_LAST, "auto", "native", "emulate", "paravirt", - "smpsafe"); + "smpsafe", +); VIR_ENUM_IMPL(virDomainStartupPolicy, VIR_DOMAIN_STARTUP_POLICY_LAST, "default", "mandatory", "requisite", - "optional"); + "optional", +); VIR_ENUM_IMPL(virDomainCpuPlacementMode, VIR_DOMAIN_CPU_PLACEMENT_MODE_LAST, "static", - "auto"); + "auto", +); VIR_ENUM_IMPL(virDomainDiskTray, VIR_DOMAIN_DISK_TRAY_LAST, "closed", - "open"); + "open", +); VIR_ENUM_IMPL(virDomainRNGModel, VIR_DOMAIN_RNG_MODEL_LAST, @@ -856,23 +943,28 @@ VIR_ENUM_IMPL(virDomainRNGModel, VIR_ENUM_IMPL(virDomainRNGBackend, VIR_DOMAIN_RNG_BACKEND_LAST, "random", - "egd"); + "egd", +); VIR_ENUM_IMPL(virDomainTPMModel, VIR_DOMAIN_TPM_MODEL_LAST, "tpm-tis", - "tpm-crb"); + "tpm-crb", +); VIR_ENUM_IMPL(virDomainTPMBackend, VIR_DOMAIN_TPM_TYPE_LAST, "passthrough", - "emulator"); + "emulator", +); VIR_ENUM_IMPL(virDomainTPMVersion, VIR_DOMAIN_TPM_VERSION_LAST, "default", "1.2", - "2.0"); + "2.0", +); VIR_ENUM_IMPL(virDomainIOMMUModel, VIR_DOMAIN_IOMMU_MODEL_LAST, - "intel"); + "intel", +); VIR_ENUM_IMPL(virDomainVsockModel, VIR_DOMAIN_VSOCK_MODEL_LAST, "default", @@ -881,41 +973,48 @@ VIR_ENUM_IMPL(virDomainVsockModel, VIR_DOMAIN_VSOCK_MODEL_LAST, VIR_ENUM_IMPL(virDomainDiskDiscard, VIR_DOMAIN_DISK_DISCARD_LAST, "default", "unmap", - "ignore"); + "ignore", +); VIR_ENUM_IMPL(virDomainDiskDetectZeroes, VIR_DOMAIN_DISK_DETECT_ZEROES_LAST, "default", "off", "on", - "unmap"); + "unmap", +); VIR_ENUM_IMPL(virDomainDiskMirrorState, VIR_DOMAIN_DISK_MIRROR_STATE_LAST, "none", "yes", "abort", - "pivot"); + "pivot", +); VIR_ENUM_IMPL(virDomainMemorySource, VIR_DOMAIN_MEMORY_SOURCE_LAST, "none", "file", "anonymous", - "memfd"); + "memfd", +); VIR_ENUM_IMPL(virDomainMemoryAllocation, VIR_DOMAIN_MEMORY_ALLOCATION_LAST, "none", "immediate", - "ondemand"); + "ondemand", +); VIR_ENUM_IMPL(virDomainLoader, VIR_DOMAIN_LOADER_TYPE_LAST, "rom", - "pflash"); + "pflash", +); VIR_ENUM_IMPL(virDomainIOAPIC, VIR_DOMAIN_IOAPIC_LAST, "none", "qemu", - "kvm"); + "kvm", +); VIR_ENUM_IMPL(virDomainHPTResizing, VIR_DOMAIN_HPT_RESIZING_LAST, @@ -929,22 +1028,26 @@ VIR_ENUM_IMPL(virDomainHPTResizing, * <mirror> XML (remaining types are not two-phase). */ VIR_ENUM_DECL(virDomainBlockJob); VIR_ENUM_IMPL(virDomainBlockJob, VIR_DOMAIN_BLOCK_JOB_TYPE_LAST, - "", "", "copy", "", "active-commit"); + "", "", "copy", "", "active-commit", +); VIR_ENUM_IMPL(virDomainMemoryModel, VIR_DOMAIN_MEMORY_MODEL_LAST, "", "dimm", - "nvdimm"); + "nvdimm", +); VIR_ENUM_IMPL(virDomainShmemModel, VIR_DOMAIN_SHMEM_MODEL_LAST, "ivshmem", "ivshmem-plain", - "ivshmem-doorbell"); + "ivshmem-doorbell", +); VIR_ENUM_IMPL(virDomainLaunchSecurity, VIR_DOMAIN_LAUNCH_SECURITY_LAST, "", - "sev"); + "sev", +); static virClassPtr virDomainObjClass; static virClassPtr virDomainXMLOptionClass; diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index b83cfedc13..b134ff4adc 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -33,7 +33,8 @@ VIR_ENUM_IMPL(virInterface, VIR_INTERFACE_TYPE_LAST, - "ethernet", "bridge", "bond", "vlan"); + "ethernet", "bridge", "bond", "vlan", +); static virInterfaceDefPtr virInterfaceDefParseXML(xmlXPathContextPtr ctxt, int parentIfType); diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index b29bc81366..57d73ed86e 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -25,7 +25,8 @@ #define VIR_FROM_THIS VIR_FROM_NONE VIR_ENUM_IMPL(virNativeVlanMode, VIR_NATIVE_VLAN_MODE_LAST, - "default", "tagged", "untagged"); + "default", "tagged", "untagged", +); int virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr def) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 0050eb3194..57fba31f6d 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -47,25 +47,30 @@ VIR_ENUM_IMPL(virNetworkForward, VIR_NETWORK_FORWARD_LAST, "none", "nat", "route", "open", "bridge", "private", "vepa", "passthrough", - "hostdev"); + "hostdev", +); VIR_ENUM_IMPL(virNetworkBridgeMACTableManager, VIR_NETWORK_BRIDGE_MAC_TABLE_MANAGER_LAST, - "default", "kernel", "libvirt"); + "default", "kernel", "libvirt", +); VIR_ENUM_DECL(virNetworkForwardHostdevDevice); VIR_ENUM_IMPL(virNetworkForwardHostdevDevice, VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_LAST, - "none", "pci", "netdev"); + "none", "pci", "netdev", +); VIR_ENUM_IMPL(virNetworkForwardDriverName, VIR_NETWORK_FORWARD_DRIVER_NAME_LAST, "default", "kvm", - "vfio"); + "vfio", +); VIR_ENUM_IMPL(virNetworkTaint, VIR_NETWORK_TAINT_LAST, - "hook-script"); + "hook-script", +); static void virPortGroupDefClear(virPortGroupDefPtr def) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 0a3ae2d3bb..1b1f57d065 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -44,7 +44,8 @@ VIR_LOG_INIT("conf.node_device_conf"); VIR_ENUM_IMPL(virNodeDevDevnode, VIR_NODE_DEV_DEVNODE_LAST, "dev", - "link"); + "link", +); VIR_ENUM_IMPL(virNodeDevCap, VIR_NODE_DEV_CAP_LAST, "system", @@ -62,16 +63,19 @@ VIR_ENUM_IMPL(virNodeDevCap, VIR_NODE_DEV_CAP_LAST, "drm", "mdev_types", "mdev", - "ccw"); + "ccw", +); VIR_ENUM_IMPL(virNodeDevNetCap, VIR_NODE_DEV_CAP_NET_LAST, "80203", - "80211"); + "80211", +); VIR_ENUM_IMPL(virNodeDevDRM, VIR_NODE_DEV_DRM_LAST, "primary", "control", - "render"); + "render", +); static int virNodeDevCapsDefParseString(const char *xpath, diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 3647648807..9d5bc3a394 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -42,18 +42,21 @@ VIR_ENUM_IMPL(virDomainNumatuneMemMode, VIR_DOMAIN_NUMATUNE_MEM_LAST, "strict", "preferred", - "interleave"); + "interleave", +); VIR_ENUM_IMPL(virDomainNumatunePlacement, VIR_DOMAIN_NUMATUNE_PLACEMENT_LAST, "default", "static", - "auto"); + "auto", +); VIR_ENUM_IMPL(virDomainMemoryAccess, VIR_DOMAIN_MEMORY_ACCESS_LAST, "default", "shared", - "private"); + "private", +); typedef struct _virDomainNumaDistance virDomainNumaDistance; typedef virDomainNumaDistance *virDomainNumaDistancePtr; diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 8dcdc9d8d2..7cad3ccc57 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -54,28 +54,33 @@ VIR_ENUM_IMPL(virNWFilterRuleAction, VIR_NWFILTER_RULE_ACTION_LAST, "accept", "reject", "return", - "continue"); + "continue", +); VIR_ENUM_IMPL(virNWFilterJumpTarget, VIR_NWFILTER_RULE_ACTION_LAST, "DROP", "ACCEPT", "REJECT", "RETURN", - "CONTINUE"); + "CONTINUE", +); VIR_ENUM_IMPL(virNWFilterRuleDirection, VIR_NWFILTER_RULE_DIRECTION_LAST, "in", "out", - "inout"); + "inout", +); VIR_ENUM_IMPL(virNWFilterChainPolicy, VIR_NWFILTER_CHAIN_POLICY_LAST, "ACCEPT", - "DROP"); + "DROP", +); VIR_ENUM_IMPL(virNWFilterEbtablesTable, VIR_NWFILTER_EBTABLES_TABLE_LAST, "filter", "nat", - "broute"); + "broute", +); VIR_ENUM_IMPL(virNWFilterChainSuffix, VIR_NWFILTER_CHAINSUFFIX_LAST, "root", @@ -85,7 +90,8 @@ VIR_ENUM_IMPL(virNWFilterChainSuffix, VIR_NWFILTER_CHAINSUFFIX_LAST, "arp", "rarp", "ipv4", - "ipv6"); + "ipv6", +); VIR_ENUM_IMPL(virNWFilterRuleProtocol, VIR_NWFILTER_RULE_PROTOCOL_LAST, "none", @@ -112,7 +118,8 @@ VIR_ENUM_IMPL(virNWFilterRuleProtocol, VIR_NWFILTER_RULE_PROTOCOL_LAST, "esp-ipv6", "ah-ipv6", "sctp-ipv6", - "all-ipv6"); + "all-ipv6", +); /* diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index c986c8b728..b16f450a01 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -54,7 +54,8 @@ VIR_ENUM_IMPL(virDomainSnapshotLocation, VIR_DOMAIN_SNAPSHOT_LOCATION_LAST, "default", "no", "internal", - "external"); + "external", +); /* virDomainSnapshotState is really virDomainState plus one extra state */ VIR_ENUM_IMPL(virDomainSnapshotState, VIR_DOMAIN_SNAPSHOT_STATE_LAST, @@ -66,7 +67,8 @@ VIR_ENUM_IMPL(virDomainSnapshotState, VIR_DOMAIN_SNAPSHOT_STATE_LAST, "shutoff", "crashed", "pmsuspended", - "disk-snapshot"); + "disk-snapshot", +); struct _virDomainSnapshotObjList { /* name string -> virDomainSnapshotObj mapping diff --git a/src/conf/storage_adapter_conf.c b/src/conf/storage_adapter_conf.c index 6505d2576b..3118b1a310 100644 --- a/src/conf/storage_adapter_conf.c +++ b/src/conf/storage_adapter_conf.c @@ -34,7 +34,8 @@ VIR_LOG_INIT("conf.storage_adapter_conf"); VIR_ENUM_IMPL(virStorageAdapter, VIR_STORAGE_ADAPTER_TYPE_LAST, - "default", "scsi_host", "fc_host"); + "default", "scsi_host", "fc_host", +); static void virStorageAdapterClearFCHost(virStorageAdapterFCHostPtr fchost) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 0bc29b7647..9cce346b1b 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -50,7 +50,8 @@ VIR_LOG_INIT("conf.storage_conf"); VIR_ENUM_IMPL(virStorageVol, VIR_STORAGE_VOL_LAST, "file", "block", "dir", "network", - "netdir", "ploop"); + "netdir", "ploop", +); VIR_ENUM_IMPL(virStoragePool, VIR_STORAGE_POOL_LAST, @@ -58,26 +59,31 @@ VIR_ENUM_IMPL(virStoragePool, "logical", "disk", "iscsi", "iscsi-direct", "scsi", "mpath", "rbd", "sheepdog", "gluster", - "zfs", "vstorage"); + "zfs", "vstorage", +); VIR_ENUM_IMPL(virStoragePoolFormatFileSystem, VIR_STORAGE_POOL_FS_LAST, "auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf", - "gfs", "gfs2", "vfat", "hfs+", "xfs", "ocfs2"); + "gfs", "gfs2", "vfat", "hfs+", "xfs", "ocfs2", +); VIR_ENUM_IMPL(virStoragePoolFormatFileSystemNet, VIR_STORAGE_POOL_NETFS_LAST, - "auto", "nfs", "glusterfs", "cifs"); + "auto", "nfs", "glusterfs", "cifs", +); VIR_ENUM_IMPL(virStoragePoolFormatDisk, VIR_STORAGE_POOL_DISK_LAST, "unknown", "dos", "dvh", "gpt", - "mac", "bsd", "pc98", "sun", "lvm2"); + "mac", "bsd", "pc98", "sun", "lvm2", +); VIR_ENUM_IMPL(virStoragePoolFormatLogical, VIR_STORAGE_POOL_LOGICAL_LAST, - "unknown", "lvm2"); + "unknown", "lvm2", +); VIR_ENUM_IMPL(virStorageVolFormatDisk, @@ -85,14 +91,16 @@ VIR_ENUM_IMPL(virStorageVolFormatDisk, "none", "linux", "fat16", "fat32", "linux-swap", "linux-lvm", "linux-raid", - "extended"); + "extended", +); VIR_ENUM_IMPL(virStoragePartedFs, VIR_STORAGE_PARTED_FS_TYPE_LAST, "ext2", "ext2", "fat16", "fat32", "linux-swap", "ext2", "ext2", - "extended"); + "extended", +); typedef const char *(*virStorageVolFormatToString)(int format); typedef int (*virStorageVolFormatFromString)(const char *format); diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index dd38077a88..d204e60ca0 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -94,7 +94,8 @@ VIR_ENUM_IMPL(virDaemonErr, VIR_LOCK_DAEMON_ERR_LAST, "Unable to initialize network sockets", "Unable to load configuration file", "Unable to look for hook scripts", - "Unable to re-execute daemon"); + "Unable to re-execute daemon", +); static void * virLockDaemonClientNew(virNetServerClientPtr client, diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index c9a05bd12b..36da4860ff 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -90,7 +90,8 @@ VIR_ENUM_IMPL(virDaemonErr, VIR_LOG_DAEMON_ERR_LAST, "Unable to initialize network sockets", "Unable to load configuration file", "Unable to look for hook scripts", - "Unable to re-execute daemon"); + "Unable to re-execute daemon", +); static void * virLogDaemonClientNew(virNetServerClientPtr client, diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index 8f16b5f7c8..a1cdbdca2c 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -183,14 +183,16 @@ VIR_ENUM_IMPL(virLXCDomainNamespace, VIR_LXC_DOMAIN_NAMESPACE_LAST, "sharenet", "shareipc", - "shareuts"); + "shareuts", +); VIR_ENUM_IMPL(virLXCDomainNamespaceSource, VIR_LXC_DOMAIN_NAMESPACE_SOURCE_LAST, "none", "name", "pid", - "netns"); + "netns", +); static void lxcDomainDefNamespaceFree(void *nsdata) diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index d59ef34f20..21119b3fbb 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -73,7 +73,8 @@ enum virLeaseActionFlags { VIR_ENUM_DECL(virLeaseAction); VIR_ENUM_IMPL(virLeaseAction, VIR_LEASE_ACTION_LAST, - "add", "old", "del", "init"); + "add", "old", "del", "init", +); int main(int argc, char **argv) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 945b0d6746..ea62b4b4a5 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1216,7 +1216,8 @@ VIR_ENUM_DECL(qemuAgentShutdownMode); VIR_ENUM_IMPL(qemuAgentShutdownMode, QEMU_AGENT_SHUTDOWN_LAST, - "powerdown", "reboot", "halt"); + "powerdown", "reboot", "halt", +); int qemuAgentShutdown(qemuAgentPtr mon, qemuAgentShutdownMode mode) @@ -1337,7 +1338,8 @@ VIR_ENUM_IMPL(qemuAgentSuspendMode, VIR_NODE_SUSPEND_TARGET_LAST, "guest-suspend-ram", "guest-suspend-disk", - "guest-suspend-hybrid"); + "guest-suspend-hybrid", +); int qemuAgentSuspend(qemuAgentPtr mon, diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 555ee19c39..6327965752 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -80,7 +80,8 @@ VIR_ENUM_IMPL(virDomainDiskQEMUBus, VIR_DOMAIN_DISK_BUS_LAST, "usb", "uml", "sata", - "sd"); + "sd", +); VIR_ENUM_DECL(qemuDiskCacheV2); @@ -91,7 +92,8 @@ VIR_ENUM_IMPL(qemuDiskCacheV2, VIR_DOMAIN_DISK_CACHE_LAST, "writethrough", "writeback", "directsync", - "unsafe"); + "unsafe", +); VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "", /* default value, we shouldn't see this */ @@ -104,7 +106,8 @@ VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "", /* don't support parallels */ "", /* no need for virtio */ "" /* don't support gop */, - "" /* 'none' doesn't make sense here */); + "" /* 'none' doesn't make sense here */, +); VIR_ENUM_DECL(qemuDeviceVideo); @@ -119,7 +122,8 @@ VIR_ENUM_IMPL(qemuDeviceVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "", /* don't support parallels */ "virtio-vga", "" /* don't support gop */, - "" /* 'none' doesn't make sense here */); + "" /* 'none' doesn't make sense here */, +); VIR_ENUM_DECL(qemuDeviceVideoSecondary); @@ -134,14 +138,16 @@ VIR_ENUM_IMPL(qemuDeviceVideoSecondary, VIR_DOMAIN_VIDEO_TYPE_LAST, "", /* don't support parallels */ "virtio-gpu", "" /* don't support gop */, - "" /* 'none' doesn't make sense here */); + "" /* 'none' doesn't make sense here */, +); VIR_ENUM_DECL(qemuSoundCodec); VIR_ENUM_IMPL(qemuSoundCodec, VIR_DOMAIN_SOUND_CODEC_TYPE_LAST, "hda-duplex", "hda-micro", - "hda-output"); + "hda-output", +); VIR_ENUM_DECL(qemuControllerModelUSB); @@ -159,7 +165,8 @@ VIR_ENUM_IMPL(qemuControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST, "qusb1", "qusb2", "qemu-xhci", - "none"); + "none", +); VIR_ENUM_DECL(qemuDomainFSDriver); VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, @@ -168,13 +175,15 @@ VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "handle", NULL, NULL, - NULL); + NULL, +); VIR_ENUM_DECL(qemuNumaPolicy); VIR_ENUM_IMPL(qemuNumaPolicy, VIR_DOMAIN_NUMATUNE_MEM_LAST, "bind", "preferred", - "interleave"); + "interleave", +); /** diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4b371317af..55f0c61f8e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2753,14 +2753,16 @@ VIR_ENUM_IMPL(qemuSaveCompression, QEMU_SAVE_FORMAT_LAST, "gzip", "bzip2", "xz", - "lzop"); + "lzop", +); VIR_ENUM_DECL(qemuDumpFormat); VIR_ENUM_IMPL(qemuDumpFormat, VIR_DOMAIN_CORE_DUMP_FORMAT_LAST, "elf", "kdump-zlib", "kdump-lzo", - "kdump-snappy"); + "kdump-snappy", +); typedef struct _virQEMUSaveHeader virQEMUSaveHeader; typedef virQEMUSaveHeader *virQEMUSaveHeaderPtr; diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index d62352cb6e..ae2546f98b 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -50,7 +50,8 @@ VIR_ENUM_IMPL(qemuMigrationCookieFlag, "cpu-hotplug", "cpu", "allowReboot", - "capabilities"); + "capabilities", +); static void diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index a7c8a13298..8bd4d4d761 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -174,13 +174,15 @@ VIR_ENUM_IMPL(qemuMonitorMigrationStatus, "active", "pre-switchover", "device", "postcopy-active", "completed", "failed", - "cancelling", "cancelled"); + "cancelling", "cancelled", +); VIR_ENUM_IMPL(qemuMonitorVMStatus, QEMU_MONITOR_VM_STATUS_LAST, "debug", "inmigrate", "internal-error", "io-error", "paused", "postmigrate", "prelaunch", "finish-migrate", "restore-vm", - "running", "save-vm", "shutdown", "watchdog", "guest-panicked"); + "running", "save-vm", "shutdown", "watchdog", "guest-panicked", +); typedef enum { QEMU_MONITOR_BLOCK_IO_STATUS_OK, @@ -194,11 +196,13 @@ VIR_ENUM_DECL(qemuMonitorBlockIOStatus); VIR_ENUM_IMPL(qemuMonitorBlockIOStatus, QEMU_MONITOR_BLOCK_IO_STATUS_LAST, - "ok", "failed", "nospace"); + "ok", "failed", "nospace", +); VIR_ENUM_IMPL(qemuMonitorDumpStatus, QEMU_MONITOR_DUMP_STATUS_LAST, - "none", "active", "completed", "failed"); + "none", "active", "completed", "failed", +); char * qemuMonitorEscapeArg(const char *in) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 5d3b1bd056..8bafa93c8d 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -736,7 +736,8 @@ static void qemuMonitorJSONHandleRTCChange(qemuMonitorPtr mon, virJSONValuePtr d VIR_ENUM_DECL(qemuMonitorWatchdogAction); VIR_ENUM_IMPL(qemuMonitorWatchdogAction, VIR_DOMAIN_EVENT_WATCHDOG_LAST, - "none", "pause", "reset", "poweroff", "shutdown", "debug", "inject-nmi"); + "none", "pause", "reset", "poweroff", "shutdown", "debug", "inject-nmi", +); static void qemuMonitorJSONHandleWatchdog(qemuMonitorPtr mon, virJSONValuePtr data) { @@ -757,7 +758,8 @@ static void qemuMonitorJSONHandleWatchdog(qemuMonitorPtr mon, virJSONValuePtr da VIR_ENUM_DECL(qemuMonitorIOErrorAction); VIR_ENUM_IMPL(qemuMonitorIOErrorAction, VIR_DOMAIN_EVENT_IO_ERROR_LAST, - "ignore", "stop", "report"); + "ignore", "stop", "report", +); static void @@ -799,7 +801,8 @@ qemuMonitorJSONHandleIOError(qemuMonitorPtr mon, virJSONValuePtr data) VIR_ENUM_DECL(qemuMonitorGraphicsAddressFamily); VIR_ENUM_IMPL(qemuMonitorGraphicsAddressFamily, VIR_DOMAIN_EVENT_GRAPHICS_ADDRESS_LAST, - "ipv4", "ipv6", "unix"); + "ipv4", "ipv6", "unix", +); static void qemuMonitorJSONHandleGraphicsVNC(qemuMonitorPtr mon, @@ -5497,7 +5500,8 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon, VIR_ENUM_IMPL(qemuMonitorCPUProperty, QEMU_MONITOR_CPU_PROPERTY_LAST, - "boolean", "string", "number"); + "boolean", "string", "number", +); static int qemuMonitorJSONParseCPUModelProperty(const char *key, diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 4014621f73..54ddfc42a0 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -101,7 +101,8 @@ VIR_ENUM_IMPL(virDaemonErr, VIR_DAEMON_ERR_LAST, "Unable to load configuration file", "Unable to look for hook scripts", "Unable to initialize audit system", - "Unable to initialize driver"); + "Unable to initialize driver", +); static int daemonForkIntoBackground(const char *argv0) { diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 3ebb3b0a0f..de2c925474 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -65,7 +65,8 @@ VIR_LOG_INIT("util.cgroup"); VIR_ENUM_IMPL(virCgroupController, VIR_CGROUP_CONTROLLER_LAST, "cpu", "cpuacct", "cpuset", "memory", "devices", "freezer", "blkio", "net_cls", "perf_event", - "name=systemd"); + "name=systemd", +); /** diff --git a/src/util/vircgroupbackend.c b/src/util/vircgroupbackend.c index f85da0041d..06fbb2217d 100644 --- a/src/util/vircgroupbackend.c +++ b/src/util/vircgroupbackend.c @@ -32,7 +32,8 @@ VIR_ENUM_DECL(virCgroupBackend); VIR_ENUM_IMPL(virCgroupBackend, VIR_CGROUP_BACKEND_TYPE_LAST, "cgroup V2", - "cgroup V1"); + "cgroup V1", +); static virOnceControl virCgroupBackendOnce = VIR_ONCE_CONTROL_INITIALIZER; static virCgroupBackendPtr virCgroupBackends[VIR_CGROUP_BACKEND_TYPE_LAST] = { 0 }; diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index f6707e4894..14b3b6a45d 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -49,7 +49,8 @@ VIR_ENUM_DECL(virCgroupV1Controller); VIR_ENUM_IMPL(virCgroupV1Controller, VIR_CGROUP_CONTROLLER_LAST, "cpu", "cpuacct", "cpuset", "memory", "devices", "freezer", "blkio", "net_cls", "perf_event", - "name=systemd"); + "name=systemd", +); #ifdef __linux__ diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index cd58491da1..655abfe42e 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -45,7 +45,8 @@ VIR_LOG_INIT("util.cgroup"); VIR_ENUM_DECL(virCgroupV2Controller); VIR_ENUM_IMPL(virCgroupV2Controller, VIR_CGROUP_CONTROLLER_LAST, "cpu", "cpuacct", "cpuset", "memory", "devices", - "freezer", "io", "net_cls", "perf_event", "name=systemd"); + "freezer", "io", "net_cls", "perf_event", "name=systemd", +); #ifdef __linux__ diff --git a/src/util/virconf.c b/src/util/virconf.c index 4497972b1c..34a171bff8 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -70,7 +70,8 @@ VIR_ENUM_IMPL(virConf, VIR_CONF_LAST, "long", "unsigned long", "string", - "list"); + "list", +); typedef struct _virConfEntry virConfEntry; typedef virConfEntry *virConfEntryPtr; diff --git a/src/util/virerror.c b/src/util/virerror.c index 879a04f66a..b37b6b10dd 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -138,7 +138,7 @@ VIR_ENUM_IMPL(virErrorDomain, VIR_ERR_DOMAIN_LAST, "Perf", /* 65 */ "Libssh transport layer", "Resource control", - ); +); /* diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 7c54825b75..7045a42270 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -44,11 +44,13 @@ VIR_ENUM_DECL(virFirewallLayerCommand); VIR_ENUM_IMPL(virFirewallLayerCommand, VIR_FIREWALL_LAYER_LAST, EBTABLES_PATH, IPTABLES_PATH, - IP6TABLES_PATH); + IP6TABLES_PATH, +); VIR_ENUM_DECL(virFirewallLayerFirewallD); VIR_ENUM_IMPL(virFirewallLayerFirewallD, VIR_FIREWALL_LAYER_LAST, - "eb", "ipv4", "ipv6"); + "eb", "ipv4", "ipv6", +); struct _virFirewallRule { diff --git a/src/util/virgic.c b/src/util/virgic.c index e980509630..9a8a07d33d 100644 --- a/src/util/virgic.c +++ b/src/util/virgic.c @@ -28,4 +28,4 @@ VIR_ENUM_IMPL(virGICVersion, VIR_GIC_VERSION_LAST, "host", "2", "3", - ); +); diff --git a/src/util/virhook.c b/src/util/virhook.c index a2d50301d7..37de0cb39e 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -55,17 +55,20 @@ VIR_ENUM_IMPL(virHookDriver, "qemu", "lxc", "network", - "libxl"); + "libxl", +); VIR_ENUM_IMPL(virHookDaemonOp, VIR_HOOK_DAEMON_OP_LAST, "start", "shutdown", - "reload"); + "reload", +); VIR_ENUM_IMPL(virHookSubop, VIR_HOOK_SUBOP_LAST, "-", "begin", - "end"); + "end", +); VIR_ENUM_IMPL(virHookQemuOp, VIR_HOOK_QEMU_OP_LAST, "start", @@ -76,7 +79,8 @@ VIR_ENUM_IMPL(virHookQemuOp, VIR_HOOK_QEMU_OP_LAST, "started", "reconnect", "attach", - "restore"); + "restore", +); VIR_ENUM_IMPL(virHookLxcOp, VIR_HOOK_LXC_OP_LAST, "start", @@ -84,7 +88,8 @@ VIR_ENUM_IMPL(virHookLxcOp, VIR_HOOK_LXC_OP_LAST, "prepare", "release", "started", - "reconnect"); + "reconnect", +); VIR_ENUM_IMPL(virHookNetworkOp, VIR_HOOK_NETWORK_OP_LAST, "start", @@ -92,7 +97,8 @@ VIR_ENUM_IMPL(virHookNetworkOp, VIR_HOOK_NETWORK_OP_LAST, "stopped", "plugged", "unplugged", - "updated"); + "updated", +); VIR_ENUM_IMPL(virHookLibxlOp, VIR_HOOK_LIBXL_OP_LAST, "start", @@ -101,7 +107,8 @@ VIR_ENUM_IMPL(virHookLibxlOp, VIR_HOOK_LIBXL_OP_LAST, "release", "migrate", "started", - "reconnect"); + "reconnect", +); static int virHooksFound = -1; diff --git a/src/util/virkeycode.c b/src/util/virkeycode.c index 3f56118493..d5ce367b13 100644 --- a/src/util/virkeycode.c +++ b/src/util/virkeycode.c @@ -79,7 +79,7 @@ VIR_ENUM_IMPL(virKeycodeSet, VIR_KEYCODE_SET_LAST, "usb", "win32", "qnum", - ); +); int virKeycodeValueFromString(virKeycodeSet codeset, const char *keyname) diff --git a/src/util/virlog.c b/src/util/virlog.c index 561a79528c..269a5f89d4 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -77,7 +77,8 @@ static char virLogHostname[HOST_NAME_MAX+1]; VIR_ENUM_DECL(virLogDestination); VIR_ENUM_IMPL(virLogDestination, VIR_LOG_TO_OUTPUT_LAST, - "stderr", "syslog", "file", "journald"); + "stderr", "syslog", "file", "journald", +); /* * Filters are used to refine the rules on what to keep or drop diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 756e9f9c98..814dc55952 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -49,7 +49,8 @@ struct _virMediatedDeviceList { VIR_ENUM_IMPL(virMediatedDeviceModel, VIR_MDEV_MODEL_TYPE_LAST, "vfio-pci", "vfio-ccw", - "vfio-ap"); + "vfio-ap", +); static virClassPtr virMediatedDeviceListClass; diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 236640c122..bb814dd212 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2419,7 +2419,8 @@ VIR_ENUM_IMPL(virNetDevIfState, "" /* value of zero means no state */, "unknown", "notpresent", "down", "lowerlayerdown", - "testing", "dormant", "up"); + "testing", "dormant", "up", +); VIR_ENUM_IMPL(virNetDevFeature, VIR_NET_DEV_FEAT_LAST, @@ -2436,7 +2437,8 @@ VIR_ENUM_IMPL(virNetDevFeature, "rxhash", "rdma", "txudptnl", - "switchdev"); + "switchdev", +); #ifdef __linux__ int @@ -2768,7 +2770,8 @@ VIR_ENUM_IMPL(virNetDevRxFilterMode, VIR_NETDEV_RX_FILTER_MODE_LAST, "none", "normal", - "all"); + "all", +); static int virNetDevGetMulticastTable(const char *ifname, diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index bb2e03a25b..c80a3a381f 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -36,7 +36,8 @@ VIR_ENUM_IMPL(virNetDevMacVLanMode, VIR_NETDEV_MACVLAN_MODE_LAST, "vepa", "private", "bridge", - "passthrough"); + "passthrough", +); #if WITH_MACVTAP # include <fcntl.h> diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index 19ee0b58e2..574887e9e0 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -30,7 +30,8 @@ VIR_ENUM_IMPL(virNetDevVPort, VIR_NETDEV_VPORT_PROFILE_LAST, "802.1Qbg", "802.1Qbh", "openvswitch", - "midonet"); + "midonet", +); VIR_ENUM_IMPL(virNetDevVPortProfileOp, VIR_NETDEV_VPORT_PROFILE_OP_LAST, "create", @@ -40,7 +41,8 @@ VIR_ENUM_IMPL(virNetDevVPortProfileOp, VIR_NETDEV_VPORT_PROFILE_OP_LAST, "migrate out", "migrate in start", "migrate in finish", - "no-op"); + "no-op", +); #if WITH_VIRTUALPORT diff --git a/src/util/virpci.c b/src/util/virpci.c index 2248a12610..16a8a2ccc9 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -46,20 +46,21 @@ VIR_LOG_INIT("util.pci"); #define PCI_ADDR_LEN 13 /* "XXXX:XX:XX.X" */ VIR_ENUM_IMPL(virPCIELinkSpeed, VIR_PCIE_LINK_SPEED_LAST, - "", "2.5", "5", "8", "16"); + "", "2.5", "5", "8", "16", +); VIR_ENUM_IMPL(virPCIStubDriver, VIR_PCI_STUB_DRIVER_LAST, "none", "pciback", /* XEN */ "pci-stub", /* KVM */ "vfio-pci", /* VFIO */ - ); +); VIR_ENUM_IMPL(virPCIHeader, VIR_PCI_HEADER_LAST, "endpoint", "pci-bridge", "cardbus-bridge", - ); +); struct _virPCIDevice { virPCIDeviceAddress address; diff --git a/src/util/virperf.c b/src/util/virperf.c index 7e5bfc6c78..65235dda6a 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -43,7 +43,8 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, "cpu_clock", "task_clock", "page_faults", "context_switches", "cpu_migrations", "page_faults_min", "page_faults_maj", - "alignment_faults", "emulation_faults"); + "alignment_faults", "emulation_faults", +); struct virPerfEvent { int fd; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 87f32464db..4e69228f34 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -112,7 +112,8 @@ VIR_ENUM_IMPL(virProcessSchedPolicy, VIR_PROC_POLICY_LAST, "batch", "idle", "fifo", - "rr"); + "rr", +); /** * virProcessTranslateStatus: diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 332aabb0fa..97891b2f8f 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -56,26 +56,30 @@ VIR_LOG_INIT("util.virresctrl"); VIR_ENUM_IMPL(virCacheKernel, VIR_CACHE_TYPE_LAST, "Unified", "Instruction", - "Data"); + "Data", +); /* Cache name mapping for our XML naming. */ VIR_ENUM_IMPL(virCache, VIR_CACHE_TYPE_LAST, "both", "code", - "data"); + "data", +); /* Cache name mapping for resctrl interface naming. */ VIR_ENUM_DECL(virResctrl); VIR_ENUM_IMPL(virResctrl, VIR_CACHE_TYPE_LAST, "", "CODE", - "DATA"); + "DATA", +); /* Monitor feature name prefix mapping for monitor naming */ VIR_ENUM_IMPL(virResctrlMonitorPrefix, VIR_RESCTRL_MONITOR_TYPE_LAST, "__unsupported__", "llc_", - "mbm_"); + "mbm_", +); /* All private typedefs so that they exist for all later definitions. This way diff --git a/src/util/virsecret.c b/src/util/virsecret.c index e02076904a..b503cf5de6 100644 --- a/src/util/virsecret.c +++ b/src/util/virsecret.c @@ -33,7 +33,8 @@ VIR_LOG_INIT("util.secret"); VIR_ENUM_IMPL(virSecretUsage, VIR_SECRET_USAGE_TYPE_LAST, - "none", "volume", "ceph", "iscsi", "tls"); + "none", "volume", "ceph", "iscsi", "tls", +); void virSecretLookupDefClear(virSecretLookupTypeDefPtr def) diff --git a/src/util/virstorageencryption.c b/src/util/virstorageencryption.c index f4eeacaa01..49df7fddd8 100644 --- a/src/util/virstorageencryption.c +++ b/src/util/virstorageencryption.c @@ -38,11 +38,14 @@ #define VIR_FROM_THIS VIR_FROM_STORAGE VIR_ENUM_IMPL(virStorageEncryptionSecret, - VIR_STORAGE_ENCRYPTION_SECRET_TYPE_LAST, "passphrase"); + VIR_STORAGE_ENCRYPTION_SECRET_TYPE_LAST, + "passphrase", +); VIR_ENUM_IMPL(virStorageEncryptionFormat, VIR_STORAGE_ENCRYPTION_FORMAT_LAST, - "default", "qcow", "luks"); + "default", "qcow", "luks", +); static void virStorageEncryptionInfoDefFree(virStorageEncryptionInfoDefPtr def) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 065ab6dde5..2ac58c4d20 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -53,7 +53,8 @@ VIR_ENUM_IMPL(virStorage, VIR_STORAGE_TYPE_LAST, "block", "dir", "network", - "volume"); + "volume", +); VIR_ENUM_IMPL(virStorageFileFormat, VIR_STORAGE_FILE_LAST, @@ -64,12 +65,13 @@ VIR_ENUM_IMPL(virStorageFileFormat, /* Not direct file formats, but used for various drivers */ "fat", "vhd", "ploop", /* Formats with backing file below here */ - "cow", "qcow", "qcow2", "qed", "vmdk"); + "cow", "qcow", "qcow2", "qed", "vmdk", +); VIR_ENUM_IMPL(virStorageFileFeature, VIR_STORAGE_FILE_FEATURE_LAST, "lazy_refcounts", - ); +); VIR_ENUM_IMPL(virStorageNetProtocol, VIR_STORAGE_NET_PROTOCOL_LAST, "none", @@ -84,22 +86,26 @@ VIR_ENUM_IMPL(virStorageNetProtocol, VIR_STORAGE_NET_PROTOCOL_LAST, "ftps", "tftp", "ssh", - "vxhs"); + "vxhs", +); VIR_ENUM_IMPL(virStorageNetHostTransport, VIR_STORAGE_NET_HOST_TRANS_LAST, "tcp", "unix", - "rdma"); + "rdma", +); VIR_ENUM_IMPL(virStorageSourcePoolMode, VIR_STORAGE_SOURCE_POOL_MODE_LAST, "default", "host", - "direct"); + "direct", +); VIR_ENUM_IMPL(virStorageAuth, VIR_STORAGE_AUTH_TYPE_LAST, - "none", "chap", "ceph"); + "none", "chap", "ceph", +); enum lv_endian { LV_LITTLE_ENDIAN = 1, /* 1234 */ diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 6cc1952a3a..8d24f6f0a3 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -42,7 +42,8 @@ VIR_LOG_INIT("util.sysinfo"); VIR_ENUM_IMPL(virSysinfo, VIR_SYSINFO_LAST, - "smbios"); + "smbios", +); static const char *sysinfoDmidecode = DMIDECODE; static const char *sysinfoSysinfo = "/proc/sysinfo"; diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index f52315300b..464f41eea5 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -39,7 +39,8 @@ VIR_ENUM_IMPL(virTypedParameter, VIR_TYPED_PARAM_LAST, "ullong", "double", "boolean", - "string"); + "string", +); /* When editing this file, ensure that public exported functions * (those in libvirt_public.syms) either trigger no errors, or else diff --git a/src/util/virutil.c b/src/util/virutil.c index 2d79169cba..8dc8679bb5 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -87,12 +87,14 @@ VIR_LOG_INIT("util.util"); VIR_ENUM_IMPL(virTristateBool, VIR_TRISTATE_BOOL_LAST, "default", "yes", - "no"); + "no", +); VIR_ENUM_IMPL(virTristateSwitch, VIR_TRISTATE_SWITCH_LAST, "default", "on", - "off"); + "off", +); virTristateBool diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 89ed6394da..21559da4a4 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -41,7 +41,8 @@ VIR_LOG_INIT("vmware.vmware_conf"); VIR_ENUM_IMPL(vmwareDriver, VMWARE_DRIVER_LAST, "player", "ws", - "fusion"); + "fusion", +); /* Free all memory associated with a vmware_driver structure */ void diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 25f7155cba..1897a626d5 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -41,7 +41,8 @@ VIR_ENUM_IMPL(virshDomainIOError, VIR_DOMAIN_DISK_ERROR_LAST, N_("no error"), N_("unspecified error"), - N_("no space")); + N_("no space"), +); static const char * virshDomainIOErrorToString(int error) @@ -105,7 +106,8 @@ VIR_ENUM_IMPL(virshDomainControlState, N_("ok"), N_("background job"), N_("occupied"), - N_("error")); + N_("error"), +); static const char * virshDomainControlStateToString(int state) @@ -120,7 +122,8 @@ VIR_ENUM_IMPL(virshDomainControlErrorReason, "", N_("unknown"), N_("monitor failure"), - N_("internal (locking) error")); + N_("internal (locking) error"), +); static const char * virshDomainControlErrorReasonToString(int reason) @@ -139,7 +142,8 @@ VIR_ENUM_IMPL(virshDomainState, N_("in shutdown"), N_("shut off"), N_("crashed"), - N_("pmsuspended")); + N_("pmsuspended"), +); static const char * virshDomainStateToString(int state) @@ -151,7 +155,8 @@ virshDomainStateToString(int state) VIR_ENUM_DECL(virshDomainNostateReason); VIR_ENUM_IMPL(virshDomainNostateReason, VIR_DOMAIN_NOSTATE_LAST, - N_("unknown")); + N_("unknown"), +); VIR_ENUM_DECL(virshDomainRunningReason); VIR_ENUM_IMPL(virshDomainRunningReason, @@ -166,12 +171,14 @@ VIR_ENUM_IMPL(virshDomainRunningReason, N_("save canceled"), N_("event wakeup"), N_("crashed"), - N_("post-copy")); + N_("post-copy"), +); VIR_ENUM_DECL(virshDomainBlockedReason); VIR_ENUM_IMPL(virshDomainBlockedReason, VIR_DOMAIN_BLOCKED_LAST, - N_("unknown")); + N_("unknown"), +); VIR_ENUM_DECL(virshDomainPausedReason); VIR_ENUM_IMPL(virshDomainPausedReason, @@ -189,13 +196,15 @@ VIR_ENUM_IMPL(virshDomainPausedReason, N_("crashed"), N_("starting up"), N_("post-copy"), - N_("post-copy failed")); + N_("post-copy failed"), +); VIR_ENUM_DECL(virshDomainShutdownReason); VIR_ENUM_IMPL(virshDomainShutdownReason, VIR_DOMAIN_SHUTDOWN_LAST, N_("unknown"), - N_("user")); + N_("user"), +); VIR_ENUM_DECL(virshDomainShutoffReason); VIR_ENUM_IMPL(virshDomainShutoffReason, @@ -208,18 +217,21 @@ VIR_ENUM_IMPL(virshDomainShutoffReason, N_("saved"), N_("failed"), N_("from snapshot"), - N_("daemon")); + N_("daemon"), +); VIR_ENUM_DECL(virshDomainCrashedReason); VIR_ENUM_IMPL(virshDomainCrashedReason, VIR_DOMAIN_CRASHED_LAST, N_("unknown"), - N_("panicked")); + N_("panicked"), +); VIR_ENUM_DECL(virshDomainPMSuspendedReason); VIR_ENUM_IMPL(virshDomainPMSuspendedReason, VIR_DOMAIN_PMSUSPENDED_LAST, - N_("unknown")); + N_("unknown"), +); static const char * virshDomainStateReasonToString(int state, int reason) -- 2.20.1