[libvirt] [PATCH 1/9] Add semicolon to VIR_ENUM_DECL calls

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(a)redhat.com&gt; --- 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