[libvirt] [PATCH 2/9] Add semicolon to VIR_ENUM_IMPL 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_IMPL calls. Signed-off-by: Cole Robinson <crobinso(a)redhat.com&gt; --- src/conf/cpu_conf.c | 14 +-- src/conf/domain_conf.c | 168 +++++++++++++++---------------- src/conf/interface_conf.c | 2 +- src/conf/netdev_vlan_conf.c | 2 +- src/conf/network_conf.c | 8 +- src/conf/node_device_conf.c | 8 +- src/conf/numa_conf.c | 2 +- src/conf/snapshot_conf.c | 4 +- src/conf/storage_adapter_conf.c | 2 +- src/conf/storage_conf.c | 16 +-- src/lxc/lxc_domain.c | 4 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_monitor.c | 8 +- src/qemu/qemu_monitor_json.c | 2 +- src/remote/remote_daemon.c | 2 +- src/util/virerror.c | 2 +- src/util/virfirewall.c | 2 +- src/util/virhook.c | 14 +-- src/util/virmdev.c | 2 +- src/util/virnetdev.c | 4 +- src/util/virnetdevmacvlan.c | 2 +- src/util/virnetdevvportprofile.c | 4 +- src/util/virpci.c | 2 +- src/util/virresctrl.c | 8 +- src/util/virsecret.c | 2 +- src/util/virstorageencryption.c | 4 +- src/util/virstoragefile.c | 14 +-- src/util/virtypedparam.c | 2 +- src/util/virutil.c | 4 +- src/util/virutil.h | 2 +- tools/virsh-domain-monitor.c | 24 ++--- tools/virsh-domain.c | 54 +++++----- tools/virsh-network.c | 4 +- tools/virsh-nodedev.c | 2 +- tools/virsh-pool.c | 4 +- tools/virsh-secret.c | 2 +- tools/virsh-volume.c | 2 +- tools/virt-admin.c | 2 +- 39 files changed, 205 insertions(+), 205 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index a8e0fbe8ae..44a0b774a4 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -33,39 +33,39 @@ 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_conf.c b/src/conf/domain_conf.c index 41d345a23e..f580114d55 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -117,7 +117,7 @@ VIR_ENUM_IMPL(virDomainVirt, VIR_DOMAIN_VIRT_LAST, "phyp", "parallels", "bhyve", - "vz") + "vz"); VIR_ENUM_IMPL(virDomainOS, VIR_DOMAIN_OSTYPE_LAST, "hvm", @@ -125,13 +125,13 @@ 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 +158,7 @@ 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 +178,7 @@ 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 +217,12 @@ 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 +230,14 @@ 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 +264,19 @@ 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 +287,7 @@ 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 +295,24 @@ 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 +322,7 @@ 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 +334,7 @@ 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 +375,12 @@ 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 +389,7 @@ 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 +397,16 @@ 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,22 +420,22 @@ 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", @@ -458,7 +458,7 @@ VIR_ENUM_IMPL(virDomainChrChannelTarget, "none", "guestfwd", "virtio", - "xen") + "xen"); VIR_ENUM_IMPL(virDomainChrConsoleTarget, VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LAST, @@ -470,7 +470,7 @@ VIR_ENUM_IMPL(virDomainChrConsoleTarget, "lxc", "openvz", "sclp", - "sclplm") + "sclplm"); VIR_ENUM_IMPL(virDomainChrSerialTargetModel, VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST, @@ -489,7 +489,7 @@ 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 +504,28 @@ 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 +534,12 @@ 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 +550,12 @@ 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 +564,14 @@ 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 +584,25 @@ 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 +610,27 @@ 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, @@ -688,42 +688,42 @@ VIR_ENUM_IMPL(virDomainGraphicsSpiceStreamingMode, 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 +733,10 @@ 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 +749,10 @@ 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 +768,11 @@ 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,20 +783,20 @@ 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", @@ -860,19 +860,19 @@ VIR_ENUM_IMPL(virDomainRNGBackend, 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 +881,41 @@ 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 +929,22 @@ 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 c5360c8900..b83cfedc13 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -33,7 +33,7 @@ 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 15230c6219..b29bc81366 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -25,7 +25,7 @@ #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 743a1e0851..0050eb3194 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -47,22 +47,22 @@ 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"); diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 97ad2f3cce..0a3ae2d3bb 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -44,7 +44,7 @@ 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 +62,16 @@ 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 dd421d19eb..3647648807 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -53,7 +53,7 @@ VIR_ENUM_IMPL(virDomainNumatunePlacement, 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/snapshot_conf.c b/src/conf/snapshot_conf.c index 7386b4a74f..c986c8b728 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -54,7 +54,7 @@ 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 +66,7 @@ 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 f333ae16ff..6505d2576b 100644 --- a/src/conf/storage_adapter_conf.c +++ b/src/conf/storage_adapter_conf.c @@ -34,7 +34,7 @@ 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 55db7a96f5..0bc29b7647 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -50,7 +50,7 @@ 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 +58,26 @@ 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 +85,14 @@ 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/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index b197f9dfc2..8f16b5f7c8 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -183,14 +183,14 @@ 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/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3a36aeaf98..555ee19c39 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -80,7 +80,7 @@ VIR_ENUM_IMPL(virDomainDiskQEMUBus, VIR_DOMAIN_DISK_BUS_LAST, "usb", "uml", "sata", - "sd") + "sd"); VIR_ENUM_DECL(qemuDiskCacheV2); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 65c7eb44f4..4b371317af 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2753,14 +2753,14 @@ 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_monitor.c b/src/qemu/qemu_monitor.c index c0291a4b18..15ef312356 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -174,13 +174,13 @@ 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 +194,11 @@ 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 bf33440cdd..5d3b1bd056 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5497,7 +5497,7 @@ 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 124bb66219..4014621f73 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -101,7 +101,7 @@ 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/virerror.c b/src/util/virerror.c index 3e1385e175..879a04f66a 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 d5ca514993..53aab5dc0b 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -48,7 +48,7 @@ VIR_ENUM_IMPL(virFirewallLayerCommand, VIR_FIREWALL_LAYER_LAST, 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/virhook.c b/src/util/virhook.c index cca4815023..a2d50301d7 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -55,17 +55,17 @@ 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 +76,7 @@ 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 +84,7 @@ 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 +92,7 @@ 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 +101,7 @@ VIR_ENUM_IMPL(virHookLibxlOp, VIR_HOOK_LIBXL_OP_LAST, "release", "migrate", "started", - "reconnect") + "reconnect"); static int virHooksFound = -1; diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 3e11e38802..4ecf7a8973 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -49,7 +49,7 @@ 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 92ef008ca1..236640c122 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2419,7 +2419,7 @@ 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 +2436,7 @@ VIR_ENUM_IMPL(virNetDevFeature, "rxhash", "rdma", "txudptnl", - "switchdev") + "switchdev"); #ifdef __linux__ int diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index e9fea2d78a..bb2e03a25b 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -36,7 +36,7 @@ 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 09c212bc4d..19ee0b58e2 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -30,7 +30,7 @@ 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 +40,7 @@ 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 537876bcba..08fbcf1e46 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -46,7 +46,7 @@ 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", diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index ae35ece983..626a5cdc21 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -56,26 +56,26 @@ 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 4dd19cdf59..e02076904a 100644 --- a/src/util/virsecret.c +++ b/src/util/virsecret.c @@ -33,7 +33,7 @@ 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 29bbdedccd..f4eeacaa01 100644 --- a/src/util/virstorageencryption.c +++ b/src/util/virstorageencryption.c @@ -38,11 +38,11 @@ #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 bd4b0274df..065ab6dde5 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -53,7 +53,7 @@ VIR_ENUM_IMPL(virStorage, VIR_STORAGE_TYPE_LAST, "block", "dir", "network", - "volume") + "volume"); VIR_ENUM_IMPL(virStorageFileFormat, VIR_STORAGE_FILE_LAST, @@ -64,12 +64,12 @@ 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 +84,22 @@ 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/virtypedparam.c b/src/util/virtypedparam.c index 1a4393b562..f52315300b 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -39,7 +39,7 @@ 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 5251b66454..2d79169cba 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -87,12 +87,12 @@ 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/util/virutil.h b/src/util/virutil.h index a26694ce00..d1c7d6e138 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -92,7 +92,7 @@ const char *virEnumToString(const char *const*types, return virEnumFromString(name ## TypeList, \ ARRAY_CARDINALITY(name ## TypeList), \ type); \ - } + } \ # define VIR_ENUM_DECL(name) \ const char *name ## TypeToString(int type); \ diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 4bc812e127..25f7155cba 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -41,7 +41,7 @@ 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 +105,7 @@ VIR_ENUM_IMPL(virshDomainControlState, N_("ok"), N_("background job"), N_("occupied"), - N_("error")) + N_("error")); static const char * virshDomainControlStateToString(int state) @@ -120,7 +120,7 @@ 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 +139,7 @@ VIR_ENUM_IMPL(virshDomainState, N_("in shutdown"), N_("shut off"), N_("crashed"), - N_("pmsuspended")) + N_("pmsuspended")); static const char * virshDomainStateToString(int state) @@ -151,7 +151,7 @@ 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 +166,12 @@ 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 +189,13 @@ 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 +208,18 @@ 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) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 30783177f9..bb9b60555c 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -102,7 +102,7 @@ VIR_ENUM_IMPL(virshDomainVcpuState, VIR_VCPU_LAST, N_("offline"), N_("running"), - N_("blocked")) + N_("blocked")); static const char * virshDomainVcpuStateToString(int state) @@ -2561,7 +2561,7 @@ VIR_ENUM_IMPL(virshDomainBlockJob, N_("Block Pull"), N_("Block Copy"), N_("Block Commit"), - N_("Active Block Commit")) + N_("Active Block Commit")); static const char * virshDomainBlockJobToString(int type) @@ -5647,7 +5647,7 @@ static const vshCmdOptDef opts_setLifecycleAction[] = { VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_LAST, "poweroff", "reboot", - "crash") + "crash"); VIR_ENUM_IMPL(virDomainLifecycleAction, VIR_DOMAIN_LIFECYCLE_ACTION_LAST, "destroy", @@ -5655,7 +5655,7 @@ VIR_ENUM_IMPL(virDomainLifecycleAction, VIR_DOMAIN_LIFECYCLE_ACTION_LAST, "rename-restart", "preserve", "coredump-destroy", - "coredump-restart") + "coredump-restart"); static bool cmdSetLifecycleAction(vshControl *ctl, const vshCmd *cmd) @@ -6044,7 +6044,7 @@ VIR_ENUM_IMPL(virshDomainJob, N_("Unbounded"), N_("Completed"), N_("Failed"), - N_("Cancelled")) + N_("Cancelled")); static const char * virshDomainJobToString(int type) @@ -6064,7 +6064,7 @@ VIR_ENUM_IMPL(virshDomainJobOperation, N_("Outgoing migration"), N_("Snapshot"), N_("Snapshot revert"), - N_("Dump")) + N_("Dump")); static const char * virshDomainJobOperationToString(int op) @@ -8785,7 +8785,7 @@ VIR_ENUM_IMPL(virDomainProcessSignal, "rt13", "rt14", "rt15", "rt16", "rt17", /* 45-49 */ "rt18", "rt19", "rt20", "rt21", "rt22", /* 50-54 */ "rt23", "rt24", "rt25", "rt26", "rt27", /* 55-59 */ - "rt28", "rt29", "rt30", "rt31", "rt32") /* 60-64 */ + "rt28", "rt29", "rt30", "rt31", "rt32"); /* 60-64 */ static int getSignalNumber(vshControl *ctl, const char *signame) { @@ -12695,7 +12695,7 @@ VIR_ENUM_IMPL(virshDomainEvent, N_("Stopped"), N_("Shutdown"), N_("PMSuspended"), - N_("Crashed")) + N_("Crashed")); static const char * virshDomainEventToString(int event) @@ -12710,13 +12710,13 @@ VIR_ENUM_IMPL(virshDomainEventDefined, N_("Added"), N_("Updated"), N_("Renamed"), - N_("Snapshot")) + N_("Snapshot")); VIR_ENUM_DECL(virshDomainEventUndefined); VIR_ENUM_IMPL(virshDomainEventUndefined, VIR_DOMAIN_EVENT_UNDEFINED_LAST, N_("Removed"), - N_("Renamed")) + N_("Renamed")); VIR_ENUM_DECL(virshDomainEventStarted); VIR_ENUM_IMPL(virshDomainEventStarted, @@ -12725,7 +12725,7 @@ VIR_ENUM_IMPL(virshDomainEventStarted, N_("Migrated"), N_("Restored"), N_("Snapshot"), - N_("Event wakeup")) + N_("Event wakeup")); VIR_ENUM_DECL(virshDomainEventSuspended); VIR_ENUM_IMPL(virshDomainEventSuspended, @@ -12738,7 +12738,7 @@ VIR_ENUM_IMPL(virshDomainEventSuspended, N_("Snapshot"), N_("API error"), N_("Post-copy"), - N_("Post-copy Error")) + N_("Post-copy Error")); VIR_ENUM_DECL(virshDomainEventResumed); VIR_ENUM_IMPL(virshDomainEventResumed, @@ -12746,7 +12746,7 @@ VIR_ENUM_IMPL(virshDomainEventResumed, N_("Unpaused"), N_("Migrated"), N_("Snapshot"), - N_("Post-copy")) + N_("Post-copy")); VIR_ENUM_DECL(virshDomainEventStopped); VIR_ENUM_IMPL(virshDomainEventStopped, @@ -12757,25 +12757,25 @@ VIR_ENUM_IMPL(virshDomainEventStopped, N_("Migrated"), N_("Saved"), N_("Failed"), - N_("Snapshot")) + N_("Snapshot")); 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")) + N_("Finished after host request")); VIR_ENUM_DECL(virshDomainEventPMSuspended); VIR_ENUM_IMPL(virshDomainEventPMSuspended, VIR_DOMAIN_EVENT_PMSUSPENDED_LAST, N_("Memory"), - N_("Disk")) + N_("Disk")); VIR_ENUM_DECL(virshDomainEventCrashed); VIR_ENUM_IMPL(virshDomainEventCrashed, VIR_DOMAIN_EVENT_CRASHED_LAST, - N_("Panicked")) + N_("Panicked")); static const char * virshDomainEventDetailToString(int event, int detail) @@ -12824,7 +12824,7 @@ VIR_ENUM_IMPL(virshDomainEventWatchdog, N_("poweroff"), N_("shutdown"), N_("debug"), - N_("inject-nmi")) + N_("inject-nmi")); static const char * virshDomainEventWatchdogToString(int action) @@ -12838,7 +12838,7 @@ VIR_ENUM_IMPL(virshDomainEventIOError, VIR_DOMAIN_EVENT_IO_ERROR_LAST, N_("none"), N_("pause"), - N_("report")) + N_("report")); static const char * virshDomainEventIOErrorToString(int action) @@ -12852,7 +12852,7 @@ VIR_ENUM_IMPL(virshGraphicsPhase, VIR_DOMAIN_EVENT_GRAPHICS_LAST, N_("connect"), N_("initialize"), - N_("disconnect")) + N_("disconnect")); static const char * virshGraphicsPhaseToString(int phase) @@ -12866,7 +12866,7 @@ VIR_ENUM_IMPL(virshGraphicsAddress, VIR_DOMAIN_EVENT_GRAPHICS_ADDRESS_LAST, N_("IPv4"), N_("IPv6"), - N_("unix")) + N_("unix")); static const char * virshGraphicsAddressToString(int family) @@ -12881,7 +12881,7 @@ VIR_ENUM_IMPL(virshDomainBlockJobStatus, N_("completed"), N_("failed"), N_("canceled"), - N_("ready")) + N_("ready")); static const char * virshDomainBlockJobStatusToString(int status) @@ -12894,7 +12894,7 @@ VIR_ENUM_DECL(virshDomainEventDiskChange); VIR_ENUM_IMPL(virshDomainEventDiskChange, VIR_DOMAIN_EVENT_DISK_CHANGE_LAST, N_("changed"), - N_("dropped")) + N_("dropped")); static const char * virshDomainEventDiskChangeToString(int reason) @@ -12907,7 +12907,7 @@ VIR_ENUM_DECL(virshDomainEventTrayChange); VIR_ENUM_IMPL(virshDomainEventTrayChange, VIR_DOMAIN_EVENT_TRAY_CHANGE_LAST, N_("opened"), - N_("closed")) + N_("closed")); static const char * virshDomainEventTrayChangeToString(int reason) @@ -13232,14 +13232,14 @@ VIR_ENUM_IMPL(virshEventAgentLifecycleState, VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_STATE_LAST, N_("unknown"), N_("connected"), - N_("disconnected")) + N_("disconnected")); VIR_ENUM_DECL(virshEventAgentLifecycleReason); VIR_ENUM_IMPL(virshEventAgentLifecycleReason, VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_LAST, N_("unknown"), N_("domain started"), - N_("channel event")) + N_("channel event")); #define UNKNOWNSTR(str) (str ? str : N_("unsupported value")) static void @@ -13318,7 +13318,7 @@ VIR_ENUM_IMPL(virshEventMetadataChangeType, VIR_DOMAIN_METADATA_LAST, N_("description"), N_("title"), - N_("element")) + N_("element")); static void virshEventMetadataChangePrint(virConnectPtr conn ATTRIBUTE_UNUSED, diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 5736c8d436..94adbabff7 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1142,7 +1142,7 @@ VIR_ENUM_IMPL(virshNetworkEvent, N_("Defined"), N_("Undefined"), N_("Started"), - N_("Stopped")) + N_("Stopped")); static const char * virshNetworkEventToString(int event) @@ -1162,7 +1162,7 @@ typedef struct virshNetEventData virshNetEventData; VIR_ENUM_DECL(virshNetworkEventId); VIR_ENUM_IMPL(virshNetworkEventId, VIR_NETWORK_EVENT_ID_LAST, - "lifecycle") + "lifecycle"); static void vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index 3474d10fb6..1f787dadf3 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -759,7 +759,7 @@ VIR_ENUM_DECL(virshNodeDeviceEvent); VIR_ENUM_IMPL(virshNodeDeviceEvent, VIR_NODE_DEVICE_EVENT_LAST, N_("Created"), - N_("Deleted")) + N_("Deleted")); static const char * virshNodeDeviceEventToString(int event) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index f79006d549..30cecc420f 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -1036,7 +1036,7 @@ VIR_ENUM_IMPL(virshStoragePoolState, N_("building"), N_("running"), N_("degraded"), - N_("inaccessible")) + N_("inaccessible")); static const char * virshStoragePoolStateToString(int state) @@ -1888,7 +1888,7 @@ VIR_ENUM_IMPL(virshPoolEvent, N_("Started"), N_("Stopped"), N_("Created"), - N_("Deleted")) + N_("Deleted")); static const char * virshPoolEventToString(int event) diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 9446931203..9227fd064c 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -569,7 +569,7 @@ VIR_ENUM_DECL(virshSecretEvent); VIR_ENUM_IMPL(virshSecretEvent, VIR_SECRET_EVENT_LAST, N_("Defined"), - N_("Undefined")) + N_("Undefined")); static const char * virshSecretEventToString(int event) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 3851985a1f..59a75f3d8c 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -989,7 +989,7 @@ VIR_ENUM_IMPL(virshStorageVol, N_("dir"), N_("network"), N_("netdir"), - N_("ploop")) + N_("ploop")); static const char * virshVolumeTypeToString(int type) diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 1d92169c80..e613ad86f9 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -59,7 +59,7 @@ VIR_ENUM_IMPL(virClientTransport, VIR_CLIENT_TRANS_LAST, N_("unix"), N_("tcp"), - N_("tls")) + N_("tls")); static const char * vshAdmClientTransportToString(int transport) -- 2.20.1