diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 64c04d9774..1231b9727c 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -50,7 +50,8 @@
 VIR_LOG_INIT("conf.capabilities");
 
 VIR_ENUM_DECL(virCapsHostPMTarget);
-VIR_ENUM_IMPL(virCapsHostPMTarget, VIR_NODE_SUSPEND_TARGET_LAST,
+VIR_ENUM_IMPL(virCapsHostPMTarget,
+              VIR_NODE_SUSPEND_TARGET_LAST,
               "suspend_mem", "suspend_disk", "suspend_hybrid",
 );
 
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 5f11dd1b0a..33c8b99e49 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -32,35 +32,41 @@
 
 VIR_LOG_INIT("conf.cpu_conf");
 
-VIR_ENUM_IMPL(virCPU, VIR_CPU_TYPE_LAST,
+VIR_ENUM_IMPL(virCPU,
+              VIR_CPU_TYPE_LAST,
               "host", "guest", "auto",
 );
 
-VIR_ENUM_IMPL(virCPUMode, VIR_CPU_MODE_LAST,
+VIR_ENUM_IMPL(virCPUMode,
+              VIR_CPU_MODE_LAST,
               "custom",
               "host-model",
               "host-passthrough",
 );
 
-VIR_ENUM_IMPL(virCPUMatch, VIR_CPU_MATCH_LAST,
+VIR_ENUM_IMPL(virCPUMatch,
+              VIR_CPU_MATCH_LAST,
               "minimum",
               "exact",
               "strict",
 );
 
-VIR_ENUM_IMPL(virCPUCheck, VIR_CPU_CHECK_LAST,
+VIR_ENUM_IMPL(virCPUCheck,
+              VIR_CPU_CHECK_LAST,
               "default",
               "none",
               "partial",
               "full",
 );
 
-VIR_ENUM_IMPL(virCPUFallback, VIR_CPU_FALLBACK_LAST,
+VIR_ENUM_IMPL(virCPUFallback,
+              VIR_CPU_FALLBACK_LAST,
               "allow",
               "forbid",
 );
 
-VIR_ENUM_IMPL(virCPUFeaturePolicy, VIR_CPU_FEATURE_LAST,
+VIR_ENUM_IMPL(virCPUFeaturePolicy,
+              VIR_CPU_FEATURE_LAST,
               "force",
               "require",
               "optional",
@@ -68,7 +74,8 @@ VIR_ENUM_IMPL(virCPUFeaturePolicy, VIR_CPU_FEATURE_LAST,
               "forbid",
 );
 
-VIR_ENUM_IMPL(virCPUCacheMode, VIR_CPU_CACHE_MODE_LAST,
+VIR_ENUM_IMPL(virCPUCacheMode,
+              VIR_CPU_CACHE_MODE_LAST,
               "emulate",
               "passthrough",
               "disable",
diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
index cd994057c5..2f82bdc2a7 100644
--- a/src/conf/device_conf.c
+++ b/src/conf/device_conf.c
@@ -31,7 +31,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_DEVICE
 
-VIR_ENUM_IMPL(virDomainDeviceAddress, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainDeviceAddress,
+              VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST,
               "none",
               "pci",
               "drive",
diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 5a8f48da61..a85e3b27f8 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -27,7 +27,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_CAPABILITIES
 
-VIR_ENUM_IMPL(virDomainCapsCPUUsable, VIR_DOMCAPS_CPU_USABLE_LAST,
+VIR_ENUM_IMPL(virDomainCapsCPUUsable,
+              VIR_DOMCAPS_CPU_USABLE_LAST,
               "unknown", "yes", "no",
 );
 
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index bbde3788a6..b969a9f6e5 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -89,7 +89,8 @@ struct _virDomainXMLOption {
      VIR_DOMAIN_DEF_FORMAT_INACTIVE | \
      VIR_DOMAIN_DEF_FORMAT_MIGRATABLE)
 
-VIR_ENUM_IMPL(virDomainTaint, VIR_DOMAIN_TAINT_LAST,
+VIR_ENUM_IMPL(virDomainTaint,
+              VIR_DOMAIN_TAINT_LAST,
               "custom-argv",
               "custom-monitor",
               "high-privileges",
@@ -103,7 +104,8 @@ VIR_ENUM_IMPL(virDomainTaint, VIR_DOMAIN_TAINT_LAST,
               "custom-ga-command",
 );
 
-VIR_ENUM_IMPL(virDomainVirt, VIR_DOMAIN_VIRT_LAST,
+VIR_ENUM_IMPL(virDomainVirt,
+              VIR_DOMAIN_VIRT_LAST,
               "none",
               "qemu",
               "kqemu",
@@ -122,7 +124,8 @@ VIR_ENUM_IMPL(virDomainVirt, VIR_DOMAIN_VIRT_LAST,
               "vz",
 );
 
-VIR_ENUM_IMPL(virDomainOS, VIR_DOMAIN_OSTYPE_LAST,
+VIR_ENUM_IMPL(virDomainOS,
+              VIR_DOMAIN_OSTYPE_LAST,
               "hvm",
               "xen",
               "linux",
@@ -131,14 +134,16 @@ VIR_ENUM_IMPL(virDomainOS, VIR_DOMAIN_OSTYPE_LAST,
               "xenpvh",
 );
 
-VIR_ENUM_IMPL(virDomainBoot, VIR_DOMAIN_BOOT_LAST,
+VIR_ENUM_IMPL(virDomainBoot,
+              VIR_DOMAIN_BOOT_LAST,
               "fd",
               "cdrom",
               "hd",
               "network",
 );
 
-VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST,
+VIR_ENUM_IMPL(virDomainFeature,
+              VIR_DOMAIN_FEATURE_LAST,
               "acpi",
               "apic",
               "pae",
@@ -161,13 +166,15 @@ VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST,
               "msrs",
 );
 
-VIR_ENUM_IMPL(virDomainCapabilitiesPolicy, VIR_DOMAIN_CAPABILITIES_POLICY_LAST,
+VIR_ENUM_IMPL(virDomainCapabilitiesPolicy,
+              VIR_DOMAIN_CAPABILITIES_POLICY_LAST,
               "default",
               "allow",
               "deny",
 );
 
-VIR_ENUM_IMPL(virDomainHyperv, VIR_DOMAIN_HYPERV_LAST,
+VIR_ENUM_IMPL(virDomainHyperv,
+              VIR_DOMAIN_HYPERV_LAST,
               "relaxed",
               "vapic",
               "spinlocks",
@@ -184,16 +191,19 @@ VIR_ENUM_IMPL(virDomainHyperv, VIR_DOMAIN_HYPERV_LAST,
               "evmcs",
 );
 
-VIR_ENUM_IMPL(virDomainKVM, VIR_DOMAIN_KVM_LAST,
+VIR_ENUM_IMPL(virDomainKVM,
+              VIR_DOMAIN_KVM_LAST,
               "hidden",
 );
 
-VIR_ENUM_IMPL(virDomainMsrsUnknown, VIR_DOMAIN_MSRS_UNKNOWN_LAST,
+VIR_ENUM_IMPL(virDomainMsrsUnknown,
+              VIR_DOMAIN_MSRS_UNKNOWN_LAST,
               "ignore",
               "fault",
 );
 
-VIR_ENUM_IMPL(virDomainCapsFeature, VIR_DOMAIN_CAPS_FEATURE_LAST,
+VIR_ENUM_IMPL(virDomainCapsFeature,
+              VIR_DOMAIN_CAPS_FEATURE_LAST,
               "audit_control",
               "audit_write",
               "block_suspend",
@@ -233,13 +243,15 @@ VIR_ENUM_IMPL(virDomainCapsFeature, VIR_DOMAIN_CAPS_FEATURE_LAST,
               "wake_alarm",
 );
 
-VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_LAST,
+VIR_ENUM_IMPL(virDomainLifecycle,
+              VIR_DOMAIN_LIFECYCLE_LAST,
               "poweroff",
               "reboot",
               "crash",
 );
 
-VIR_ENUM_IMPL(virDomainLifecycleAction, VIR_DOMAIN_LIFECYCLE_ACTION_LAST,
+VIR_ENUM_IMPL(virDomainLifecycleAction,
+              VIR_DOMAIN_LIFECYCLE_ACTION_LAST,
               "destroy",
               "restart",
               "rename-restart",
@@ -248,7 +260,8 @@ VIR_ENUM_IMPL(virDomainLifecycleAction, VIR_DOMAIN_LIFECYCLE_ACTION_LAST,
               "coredump-restart",
 );
 
-VIR_ENUM_IMPL(virDomainLockFailure, VIR_DOMAIN_LOCK_FAILURE_LAST,
+VIR_ENUM_IMPL(virDomainLockFailure,
+              VIR_DOMAIN_LOCK_FAILURE_LAST,
               "default",
               "poweroff",
               "restart",
@@ -256,7 +269,8 @@ VIR_ENUM_IMPL(virDomainLockFailure, VIR_DOMAIN_LOCK_FAILURE_LAST,
               "ignore",
 );
 
-VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST,
+VIR_ENUM_IMPL(virDomainDevice,
+              VIR_DOMAIN_DEVICE_LAST,
               "none",
               "disk",
               "lease",
@@ -284,21 +298,24 @@ VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST,
               "vsock",
 );
 
-VIR_ENUM_IMPL(virDomainDiskDevice, VIR_DOMAIN_DISK_DEVICE_LAST,
+VIR_ENUM_IMPL(virDomainDiskDevice,
+              VIR_DOMAIN_DISK_DEVICE_LAST,
               "disk",
               "cdrom",
               "floppy",
               "lun",
 );
 
-VIR_ENUM_IMPL(virDomainDiskGeometryTrans, VIR_DOMAIN_DISK_TRANS_LAST,
+VIR_ENUM_IMPL(virDomainDiskGeometryTrans,
+              VIR_DOMAIN_DISK_TRANS_LAST,
               "default",
               "none",
               "auto",
               "lba",
 );
 
-VIR_ENUM_IMPL(virDomainDiskBus, VIR_DOMAIN_DISK_BUS_LAST,
+VIR_ENUM_IMPL(virDomainDiskBus,
+              VIR_DOMAIN_DISK_BUS_LAST,
               "ide",
               "fdc",
               "scsi",
@@ -310,7 +327,8 @@ VIR_ENUM_IMPL(virDomainDiskBus, VIR_DOMAIN_DISK_BUS_LAST,
               "sd",
 );
 
-VIR_ENUM_IMPL(virDomainDiskCache, VIR_DOMAIN_DISK_CACHE_LAST,
+VIR_ENUM_IMPL(virDomainDiskCache,
+              VIR_DOMAIN_DISK_CACHE_LAST,
               "default",
               "none",
               "writethrough",
@@ -319,7 +337,8 @@ VIR_ENUM_IMPL(virDomainDiskCache, VIR_DOMAIN_DISK_CACHE_LAST,
               "unsafe",
 );
 
-VIR_ENUM_IMPL(virDomainDiskErrorPolicy, VIR_DOMAIN_DISK_ERROR_POLICY_LAST,
+VIR_ENUM_IMPL(virDomainDiskErrorPolicy,
+              VIR_DOMAIN_DISK_ERROR_POLICY_LAST,
               "default",
               "stop",
               "report",
@@ -327,19 +346,22 @@ VIR_ENUM_IMPL(virDomainDiskErrorPolicy, VIR_DOMAIN_DISK_ERROR_POLICY_LAST,
               "enospace",
 );
 
-VIR_ENUM_IMPL(virDomainDiskIo, VIR_DOMAIN_DISK_IO_LAST,
+VIR_ENUM_IMPL(virDomainDiskIo,
+              VIR_DOMAIN_DISK_IO_LAST,
               "default",
               "native",
               "threads",
 );
 
-VIR_ENUM_IMPL(virDomainDeviceSGIO, VIR_DOMAIN_DEVICE_SGIO_LAST,
+VIR_ENUM_IMPL(virDomainDeviceSGIO,
+              VIR_DOMAIN_DEVICE_SGIO_LAST,
               "default",
               "filtered",
               "unfiltered",
 );
 
-VIR_ENUM_IMPL(virDomainController, VIR_DOMAIN_CONTROLLER_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainController,
+              VIR_DOMAIN_CONTROLLER_TYPE_LAST,
               "ide",
               "fdc",
               "scsi",
@@ -351,7 +373,8 @@ VIR_ENUM_IMPL(virDomainController, VIR_DOMAIN_CONTROLLER_TYPE_LAST,
               "xenbus",
 );
 
-VIR_ENUM_IMPL(virDomainControllerModelPCI, VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST,
+VIR_ENUM_IMPL(virDomainControllerModelPCI,
+              VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST,
               "pci-root",
               "pcie-root",
               "pci-bridge",
@@ -379,7 +402,8 @@ VIR_ENUM_IMPL(virDomainControllerPCIModelName,
               "pcie-pci-bridge",
 );
 
-VIR_ENUM_IMPL(virDomainControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST,
+VIR_ENUM_IMPL(virDomainControllerModelSCSI,
+              VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST,
               "auto",
               "buslogic",
               "lsilogic",
@@ -392,7 +416,8 @@ VIR_ENUM_IMPL(virDomainControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAS
               "virtio-non-transitional",
 );
 
-VIR_ENUM_IMPL(virDomainControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST,
+VIR_ENUM_IMPL(virDomainControllerModelUSB,
+              VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST,
               "piix3-uhci",
               "piix4-uhci",
               "ehci",
@@ -409,7 +434,8 @@ VIR_ENUM_IMPL(virDomainControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST,
               "none",
 );
 
-VIR_ENUM_IMPL(virDomainControllerModelIDE, VIR_DOMAIN_CONTROLLER_MODEL_IDE_LAST,
+VIR_ENUM_IMPL(virDomainControllerModelIDE,
+              VIR_DOMAIN_CONTROLLER_MODEL_IDE_LAST,
               "piix3",
               "piix4",
               "ich6",
@@ -422,7 +448,8 @@ VIR_ENUM_IMPL(virDomainControllerModelVirtioSerial,
               "virtio-non-transitional",
 );
 
-VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainFS,
+              VIR_DOMAIN_FS_TYPE_LAST,
               "mount",
               "block",
               "file",
@@ -432,7 +459,8 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST,
               "volume",
 );
 
-VIR_ENUM_IMPL(virDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainFSDriver,
+              VIR_DOMAIN_FS_DRIVER_TYPE_LAST,
               "default",
               "path",
               "handle",
@@ -441,25 +469,29 @@ VIR_ENUM_IMPL(virDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST,
               "ploop",
 );
 
-VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST,
+VIR_ENUM_IMPL(virDomainFSAccessMode,
+              VIR_DOMAIN_FS_ACCESSMODE_LAST,
               "passthrough",
               "mapped",
               "squash",
 );
 
-VIR_ENUM_IMPL(virDomainFSWrpolicy, VIR_DOMAIN_FS_WRPOLICY_LAST,
+VIR_ENUM_IMPL(virDomainFSWrpolicy,
+              VIR_DOMAIN_FS_WRPOLICY_LAST,
               "default",
               "immediate",
 );
 
-VIR_ENUM_IMPL(virDomainFSModel, VIR_DOMAIN_FS_MODEL_LAST,
+VIR_ENUM_IMPL(virDomainFSModel,
+              VIR_DOMAIN_FS_MODEL_LAST,
               "default",
               "virtio",
               "virtio-transitional",
               "virtio-non-transitional",
 );
 
-VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainNet,
+              VIR_DOMAIN_NET_TYPE_LAST,
               "user",
               "ethernet",
               "vhostuser",
@@ -474,25 +506,29 @@ VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST,
               "udp",
 );
 
-VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainNetBackend,
+              VIR_DOMAIN_NET_BACKEND_TYPE_LAST,
               "default",
               "qemu",
               "vhost",
 );
 
-VIR_ENUM_IMPL(virDomainNetVirtioTxMode, VIR_DOMAIN_NET_VIRTIO_TX_MODE_LAST,
+VIR_ENUM_IMPL(virDomainNetVirtioTxMode,
+              VIR_DOMAIN_NET_VIRTIO_TX_MODE_LAST,
               "default",
               "iothread",
               "timer",
 );
 
-VIR_ENUM_IMPL(virDomainNetInterfaceLinkState, VIR_DOMAIN_NET_INTERFACE_LINK_STATE_LAST,
+VIR_ENUM_IMPL(virDomainNetInterfaceLinkState,
+              VIR_DOMAIN_NET_INTERFACE_LINK_STATE_LAST,
               "default",
               "up",
               "down",
 );
 
-VIR_ENUM_IMPL(virDomainChrDeviceState, VIR_DOMAIN_CHR_DEVICE_STATE_LAST,
+VIR_ENUM_IMPL(virDomainChrDeviceState,
+              VIR_DOMAIN_CHR_DEVICE_STATE_LAST,
               "default",
               "connected",
               "disconnected",
@@ -543,14 +579,16 @@ VIR_ENUM_IMPL(virDomainChrSerialTargetModel,
               "16550a",
 );
 
-VIR_ENUM_IMPL(virDomainChrDevice, VIR_DOMAIN_CHR_DEVICE_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainChrDevice,
+              VIR_DOMAIN_CHR_DEVICE_TYPE_LAST,
               "parallel",
               "serial",
               "console",
               "channel",
 );
 
-VIR_ENUM_IMPL(virDomainChr, VIR_DOMAIN_CHR_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainChr,
+              VIR_DOMAIN_CHR_TYPE_LAST,
               "null",
               "vc",
               "pty",
@@ -566,32 +604,37 @@ VIR_ENUM_IMPL(virDomainChr, VIR_DOMAIN_CHR_TYPE_LAST,
               "nmdm",
 );
 
-VIR_ENUM_IMPL(virDomainChrTcpProtocol, VIR_DOMAIN_CHR_TCP_PROTOCOL_LAST,
+VIR_ENUM_IMPL(virDomainChrTcpProtocol,
+              VIR_DOMAIN_CHR_TCP_PROTOCOL_LAST,
               "raw",
               "telnet",
               "telnets",
               "tls",
 );
 
-VIR_ENUM_IMPL(virDomainChrSpicevmc, VIR_DOMAIN_CHR_SPICEVMC_LAST,
+VIR_ENUM_IMPL(virDomainChrSpicevmc,
+              VIR_DOMAIN_CHR_SPICEVMC_LAST,
               "vdagent",
               "smartcard",
               "usbredir",
 );
 
-VIR_ENUM_IMPL(virDomainSmartcard, VIR_DOMAIN_SMARTCARD_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainSmartcard,
+              VIR_DOMAIN_SMARTCARD_TYPE_LAST,
               "host",
               "host-certificates",
               "passthrough",
 );
 
-VIR_ENUM_IMPL(virDomainSoundCodec, VIR_DOMAIN_SOUND_CODEC_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainSoundCodec,
+              VIR_DOMAIN_SOUND_CODEC_TYPE_LAST,
               "duplex",
               "micro",
               "output",
 );
 
-VIR_ENUM_IMPL(virDomainSoundModel, VIR_DOMAIN_SOUND_MODEL_LAST,
+VIR_ENUM_IMPL(virDomainSoundModel,
+              VIR_DOMAIN_SOUND_MODEL_LAST,
               "sb16",
               "es1370",
               "pcspk",
@@ -607,7 +650,8 @@ VIR_ENUM_IMPL(virDomainKeyWrapCipherName,
               "dea",
 );
 
-VIR_ENUM_IMPL(virDomainMemballoonModel, VIR_DOMAIN_MEMBALLOON_MODEL_LAST,
+VIR_ENUM_IMPL(virDomainMemballoonModel,
+              VIR_DOMAIN_MEMBALLOON_MODEL_LAST,
               "virtio",
               "xen",
               "none",
@@ -615,20 +659,23 @@ VIR_ENUM_IMPL(virDomainMemballoonModel, VIR_DOMAIN_MEMBALLOON_MODEL_LAST,
               "virtio-non-transitional",
 );
 
-VIR_ENUM_IMPL(virDomainSmbiosMode, VIR_DOMAIN_SMBIOS_LAST,
+VIR_ENUM_IMPL(virDomainSmbiosMode,
+              VIR_DOMAIN_SMBIOS_LAST,
               "none",
               "emulate",
               "host",
               "sysinfo",
 );
 
-VIR_ENUM_IMPL(virDomainWatchdogModel, VIR_DOMAIN_WATCHDOG_MODEL_LAST,
+VIR_ENUM_IMPL(virDomainWatchdogModel,
+              VIR_DOMAIN_WATCHDOG_MODEL_LAST,
               "i6300esb",
               "ib700",
               "diag288",
 );
 
-VIR_ENUM_IMPL(virDomainWatchdogAction, VIR_DOMAIN_WATCHDOG_ACTION_LAST,
+VIR_ENUM_IMPL(virDomainWatchdogAction,
+              VIR_DOMAIN_WATCHDOG_ACTION_LAST,
               "reset",
               "shutdown",
               "poweroff",
@@ -638,7 +685,8 @@ VIR_ENUM_IMPL(virDomainWatchdogAction, VIR_DOMAIN_WATCHDOG_ACTION_LAST,
               "inject-nmi",
 );
 
-VIR_ENUM_IMPL(virDomainPanicModel, VIR_DOMAIN_PANIC_MODEL_LAST,
+VIR_ENUM_IMPL(virDomainPanicModel,
+              VIR_DOMAIN_PANIC_MODEL_LAST,
               "default",
               "isa",
               "pseries",
@@ -646,7 +694,8 @@ VIR_ENUM_IMPL(virDomainPanicModel, VIR_DOMAIN_PANIC_MODEL_LAST,
               "s390",
 );
 
-VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainVideo,
+              VIR_DOMAIN_VIDEO_TYPE_LAST,
               "default",
               "vga",
               "cirrus",
@@ -660,20 +709,23 @@ VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
               "none",
 );
 
-VIR_ENUM_IMPL(virDomainVideoVGAConf, VIR_DOMAIN_VIDEO_VGACONF_LAST,
+VIR_ENUM_IMPL(virDomainVideoVGAConf,
+              VIR_DOMAIN_VIDEO_VGACONF_LAST,
               "io",
               "on",
               "off",
 );
 
-VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainInput,
+              VIR_DOMAIN_INPUT_TYPE_LAST,
               "mouse",
               "tablet",
               "keyboard",
               "passthrough",
 );
 
-VIR_ENUM_IMPL(virDomainInputBus, VIR_DOMAIN_INPUT_BUS_LAST,
+VIR_ENUM_IMPL(virDomainInputBus,
+              VIR_DOMAIN_INPUT_BUS_LAST,
               "ps2",
               "usb",
               "xen",
@@ -681,14 +733,16 @@ VIR_ENUM_IMPL(virDomainInputBus, VIR_DOMAIN_INPUT_BUS_LAST,
               "virtio",
 );
 
-VIR_ENUM_IMPL(virDomainInputModel, VIR_DOMAIN_INPUT_MODEL_LAST,
+VIR_ENUM_IMPL(virDomainInputModel,
+              VIR_DOMAIN_INPUT_MODEL_LAST,
               "default",
               "virtio",
               "virtio-transitional",
               "virtio-non-transitional",
 );
 
-VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainGraphics,
+              VIR_DOMAIN_GRAPHICS_TYPE_LAST,
               "sdl",
               "vnc",
               "rdp",
@@ -697,7 +751,8 @@ VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST,
               "egl-headless",
 );
 
-VIR_ENUM_IMPL(virDomainGraphicsListen, VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainGraphicsListen,
+              VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST,
               "none",
               "address",
               "network",
@@ -781,12 +836,14 @@ VIR_ENUM_IMPL(virDomainGraphicsSpiceStreamingMode,
               "off",
 );
 
-VIR_ENUM_IMPL(virDomainHostdevMode, VIR_DOMAIN_HOSTDEV_MODE_LAST,
+VIR_ENUM_IMPL(virDomainHostdevMode,
+              VIR_DOMAIN_HOSTDEV_MODE_LAST,
               "subsystem",
               "capabilities",
 );
 
-VIR_ENUM_IMPL(virDomainHostdevSubsys, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainHostdevSubsys,
+              VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST,
               "usb",
               "pci",
               "scsi",
@@ -822,21 +879,25 @@ VIR_ENUM_IMPL(virDomainHostdevSubsysSCSIVHostModel,
               "virtio-non-transitional",
 );
 
-VIR_ENUM_IMPL(virDomainHostdevCaps, VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainHostdevCaps,
+              VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST,
               "storage",
               "misc",
               "net",
 );
 
-VIR_ENUM_IMPL(virDomainHub, VIR_DOMAIN_HUB_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainHub,
+              VIR_DOMAIN_HUB_TYPE_LAST,
               "usb",
 );
 
-VIR_ENUM_IMPL(virDomainRedirdevBus, VIR_DOMAIN_REDIRDEV_BUS_LAST,
+VIR_ENUM_IMPL(virDomainRedirdevBus,
+              VIR_DOMAIN_REDIRDEV_BUS_LAST,
               "usb",
 );
 
-VIR_ENUM_IMPL(virDomainState, VIR_DOMAIN_LAST,
+VIR_ENUM_IMPL(virDomainState,
+              VIR_DOMAIN_LAST,
               "nostate",
               "running",
               "blocked",
@@ -847,11 +908,13 @@ VIR_ENUM_IMPL(virDomainState, VIR_DOMAIN_LAST,
               "pmsuspended",
 );
 
-VIR_ENUM_IMPL(virDomainNostateReason, VIR_DOMAIN_NOSTATE_LAST,
+VIR_ENUM_IMPL(virDomainNostateReason,
+              VIR_DOMAIN_NOSTATE_LAST,
               "unknown",
 );
 
-VIR_ENUM_IMPL(virDomainRunningReason, VIR_DOMAIN_RUNNING_LAST,
+VIR_ENUM_IMPL(virDomainRunningReason,
+              VIR_DOMAIN_RUNNING_LAST,
               "unknown",
               "booted",
               "migrated",
@@ -865,11 +928,13 @@ VIR_ENUM_IMPL(virDomainRunningReason, VIR_DOMAIN_RUNNING_LAST,
               "post-copy",
 );
 
-VIR_ENUM_IMPL(virDomainBlockedReason, VIR_DOMAIN_BLOCKED_LAST,
+VIR_ENUM_IMPL(virDomainBlockedReason,
+              VIR_DOMAIN_BLOCKED_LAST,
               "unknown",
 );
 
-VIR_ENUM_IMPL(virDomainPausedReason, VIR_DOMAIN_PAUSED_LAST,
+VIR_ENUM_IMPL(virDomainPausedReason,
+              VIR_DOMAIN_PAUSED_LAST,
               "unknown",
               "user",
               "migration",
@@ -886,12 +951,14 @@ VIR_ENUM_IMPL(virDomainPausedReason, VIR_DOMAIN_PAUSED_LAST,
               "post-copy failed",
 );
 
-VIR_ENUM_IMPL(virDomainShutdownReason, VIR_DOMAIN_SHUTDOWN_LAST,
+VIR_ENUM_IMPL(virDomainShutdownReason,
+              VIR_DOMAIN_SHUTDOWN_LAST,
               "unknown",
               "user",
 );
 
-VIR_ENUM_IMPL(virDomainShutoffReason, VIR_DOMAIN_SHUTOFF_LAST,
+VIR_ENUM_IMPL(virDomainShutoffReason,
+              VIR_DOMAIN_SHUTOFF_LAST,
               "unknown",
               "shutdown",
               "destroyed",
@@ -903,35 +970,41 @@ VIR_ENUM_IMPL(virDomainShutoffReason, VIR_DOMAIN_SHUTOFF_LAST,
               "daemon",
 );
 
-VIR_ENUM_IMPL(virDomainCrashedReason, VIR_DOMAIN_CRASHED_LAST,
+VIR_ENUM_IMPL(virDomainCrashedReason,
+              VIR_DOMAIN_CRASHED_LAST,
               "unknown",
               "panicked",
 );
 
-VIR_ENUM_IMPL(virDomainPMSuspendedReason, VIR_DOMAIN_PMSUSPENDED_LAST,
+VIR_ENUM_IMPL(virDomainPMSuspendedReason,
+              VIR_DOMAIN_PMSUSPENDED_LAST,
               "unknown",
 );
 
-VIR_ENUM_IMPL(virDomainSeclabel, VIR_DOMAIN_SECLABEL_LAST,
+VIR_ENUM_IMPL(virDomainSeclabel,
+              VIR_DOMAIN_SECLABEL_LAST,
               "default",
               "none",
               "dynamic",
               "static",
 );
 
-VIR_ENUM_IMPL(virDomainClockOffset, VIR_DOMAIN_CLOCK_OFFSET_LAST,
+VIR_ENUM_IMPL(virDomainClockOffset,
+              VIR_DOMAIN_CLOCK_OFFSET_LAST,
               "utc",
               "localtime",
               "variable",
               "timezone",
 );
 
-VIR_ENUM_IMPL(virDomainClockBasis, VIR_DOMAIN_CLOCK_BASIS_LAST,
+VIR_ENUM_IMPL(virDomainClockBasis,
+              VIR_DOMAIN_CLOCK_BASIS_LAST,
               "utc",
               "localtime",
 );
 
-VIR_ENUM_IMPL(virDomainTimerName, VIR_DOMAIN_TIMER_NAME_LAST,
+VIR_ENUM_IMPL(virDomainTimerName,
+              VIR_DOMAIN_TIMER_NAME_LAST,
               "platform",
               "pit",
               "rtc",
@@ -941,20 +1014,23 @@ VIR_ENUM_IMPL(virDomainTimerName, VIR_DOMAIN_TIMER_NAME_LAST,
               "hypervclock",
 );
 
-VIR_ENUM_IMPL(virDomainTimerTrack, VIR_DOMAIN_TIMER_TRACK_LAST,
+VIR_ENUM_IMPL(virDomainTimerTrack,
+              VIR_DOMAIN_TIMER_TRACK_LAST,
               "boot",
               "guest",
               "wall",
 );
 
-VIR_ENUM_IMPL(virDomainTimerTickpolicy, VIR_DOMAIN_TIMER_TICKPOLICY_LAST,
+VIR_ENUM_IMPL(virDomainTimerTickpolicy,
+              VIR_DOMAIN_TIMER_TICKPOLICY_LAST,
               "delay",
               "catchup",
               "merge",
               "discard",
 );
 
-VIR_ENUM_IMPL(virDomainTimerMode, VIR_DOMAIN_TIMER_MODE_LAST,
+VIR_ENUM_IMPL(virDomainTimerMode,
+              VIR_DOMAIN_TIMER_MODE_LAST,
               "auto",
               "native",
               "emulate",
@@ -962,19 +1038,22 @@ VIR_ENUM_IMPL(virDomainTimerMode, VIR_DOMAIN_TIMER_MODE_LAST,
               "smpsafe",
 );
 
-VIR_ENUM_IMPL(virDomainStartupPolicy, VIR_DOMAIN_STARTUP_POLICY_LAST,
+VIR_ENUM_IMPL(virDomainStartupPolicy,
+              VIR_DOMAIN_STARTUP_POLICY_LAST,
               "default",
               "mandatory",
               "requisite",
               "optional",
 );
 
-VIR_ENUM_IMPL(virDomainCpuPlacementMode, VIR_DOMAIN_CPU_PLACEMENT_MODE_LAST,
+VIR_ENUM_IMPL(virDomainCpuPlacementMode,
+              VIR_DOMAIN_CPU_PLACEMENT_MODE_LAST,
               "static",
               "auto",
 );
 
-VIR_ENUM_IMPL(virDomainDiskTray, VIR_DOMAIN_DISK_TRAY_LAST,
+VIR_ENUM_IMPL(virDomainDiskTray,
+              VIR_DOMAIN_DISK_TRAY_LAST,
               "closed",
               "open",
 );
@@ -992,68 +1071,79 @@ VIR_ENUM_IMPL(virDomainRNGBackend,
               "egd",
 );
 
-VIR_ENUM_IMPL(virDomainTPMModel, VIR_DOMAIN_TPM_MODEL_LAST,
+VIR_ENUM_IMPL(virDomainTPMModel,
+              VIR_DOMAIN_TPM_MODEL_LAST,
               "tpm-tis",
               "tpm-crb",
 );
 
-VIR_ENUM_IMPL(virDomainTPMBackend, VIR_DOMAIN_TPM_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainTPMBackend,
+              VIR_DOMAIN_TPM_TYPE_LAST,
               "passthrough",
               "emulator",
 );
 
-VIR_ENUM_IMPL(virDomainTPMVersion, VIR_DOMAIN_TPM_VERSION_LAST,
+VIR_ENUM_IMPL(virDomainTPMVersion,
+              VIR_DOMAIN_TPM_VERSION_LAST,
               "default",
               "1.2",
               "2.0",
 );
 
-VIR_ENUM_IMPL(virDomainIOMMUModel, VIR_DOMAIN_IOMMU_MODEL_LAST,
+VIR_ENUM_IMPL(virDomainIOMMUModel,
+              VIR_DOMAIN_IOMMU_MODEL_LAST,
               "intel",
 );
 
-VIR_ENUM_IMPL(virDomainVsockModel, VIR_DOMAIN_VSOCK_MODEL_LAST,
+VIR_ENUM_IMPL(virDomainVsockModel,
+              VIR_DOMAIN_VSOCK_MODEL_LAST,
               "default",
               "virtio",
               "virtio-transitional",
               "virtio-non-transitional",
 );
 
-VIR_ENUM_IMPL(virDomainDiskDiscard, VIR_DOMAIN_DISK_DISCARD_LAST,
+VIR_ENUM_IMPL(virDomainDiskDiscard,
+              VIR_DOMAIN_DISK_DISCARD_LAST,
               "default",
               "unmap",
               "ignore",
 );
 
-VIR_ENUM_IMPL(virDomainDiskDetectZeroes, VIR_DOMAIN_DISK_DETECT_ZEROES_LAST,
+VIR_ENUM_IMPL(virDomainDiskDetectZeroes,
+              VIR_DOMAIN_DISK_DETECT_ZEROES_LAST,
               "default",
               "off",
               "on",
               "unmap",
 );
 
-VIR_ENUM_IMPL(virDomainDiskModel, VIR_DOMAIN_DISK_MODEL_LAST,
+VIR_ENUM_IMPL(virDomainDiskModel,
+              VIR_DOMAIN_DISK_MODEL_LAST,
               "default",
               "virtio",
               "virtio-transitional",
               "virtio-non-transitional",
 );
 
-VIR_ENUM_IMPL(virDomainDiskMirrorState, VIR_DOMAIN_DISK_MIRROR_STATE_LAST,
+VIR_ENUM_IMPL(virDomainDiskMirrorState,
+              VIR_DOMAIN_DISK_MIRROR_STATE_LAST,
               "none",
               "yes",
               "abort",
               "pivot",
 );
 
-VIR_ENUM_IMPL(virDomainMemorySource, VIR_DOMAIN_MEMORY_SOURCE_LAST,
+VIR_ENUM_IMPL(virDomainMemorySource,
+              VIR_DOMAIN_MEMORY_SOURCE_LAST,
               "none",
               "file",
               "anonymous",
               "memfd",
 );
 
-VIR_ENUM_IMPL(virDomainMemoryAllocation, VIR_DOMAIN_MEMORY_ALLOCATION_LAST,
+VIR_ENUM_IMPL(virDomainMemoryAllocation,
+              VIR_DOMAIN_MEMORY_ALLOCATION_LAST,
               "none",
               "immediate",
               "ondemand",
@@ -1091,7 +1181,8 @@ VIR_ENUM_IMPL(virDomainOsDefFirmware,
 /* 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_IMPL(virDomainBlockJob, VIR_DOMAIN_BLOCK_JOB_TYPE_LAST,
+VIR_ENUM_IMPL(virDomainBlockJob,
+              VIR_DOMAIN_BLOCK_JOB_TYPE_LAST,
               "", "", "copy", "", "active-commit",
 );
 
@@ -1102,13 +1193,15 @@ VIR_ENUM_IMPL(virDomainMemoryModel,
               "nvdimm",
 );
 
-VIR_ENUM_IMPL(virDomainShmemModel, VIR_DOMAIN_SHMEM_MODEL_LAST,
+VIR_ENUM_IMPL(virDomainShmemModel,
+              VIR_DOMAIN_SHMEM_MODEL_LAST,
               "ivshmem",
               "ivshmem-plain",
               "ivshmem-doorbell",
 );
 
-VIR_ENUM_IMPL(virDomainLaunchSecurity, VIR_DOMAIN_LAUNCH_SECURITY_LAST,
+VIR_ENUM_IMPL(virDomainLaunchSecurity,
+              VIR_DOMAIN_LAUNCH_SECURITY_LAST,
               "",
               "sev",
 );
diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c
index 57d73ed86e..516129280d 100644
--- a/src/conf/netdev_vlan_conf.c
+++ b/src/conf/netdev_vlan_conf.c
@@ -24,7 +24,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
-VIR_ENUM_IMPL(virNativeVlanMode, VIR_NATIVE_VLAN_MODE_LAST,
+VIR_ENUM_IMPL(virNativeVlanMode,
+              VIR_NATIVE_VLAN_MODE_LAST,
               "default", "tagged", "untagged",
 );
 
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 87bf158049..78bff6f687 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -68,7 +68,8 @@ VIR_ENUM_IMPL(virNetworkForwardDriverName,
               "vfio",
 );
 
-VIR_ENUM_IMPL(virNetworkTaint, VIR_NETWORK_TAINT_LAST,
+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 b96d10cab8..1db045d9ac 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -42,12 +42,14 @@
 
 VIR_LOG_INIT("conf.node_device_conf");
 
-VIR_ENUM_IMPL(virNodeDevDevnode, VIR_NODE_DEV_DEVNODE_LAST,
+VIR_ENUM_IMPL(virNodeDevDevnode,
+              VIR_NODE_DEV_DEVNODE_LAST,
               "dev",
               "link",
 );
 
-VIR_ENUM_IMPL(virNodeDevCap, VIR_NODE_DEV_CAP_LAST,
+VIR_ENUM_IMPL(virNodeDevCap,
+              VIR_NODE_DEV_CAP_LAST,
               "system",
               "pci",
               "usb_device",
@@ -66,12 +68,14 @@ VIR_ENUM_IMPL(virNodeDevCap, VIR_NODE_DEV_CAP_LAST,
               "ccw",
 );
 
-VIR_ENUM_IMPL(virNodeDevNetCap, VIR_NODE_DEV_CAP_NET_LAST,
+VIR_ENUM_IMPL(virNodeDevNetCap,
+              VIR_NODE_DEV_CAP_NET_LAST,
               "80203",
               "80211",
 );
 
-VIR_ENUM_IMPL(virNodeDevDRM, VIR_NODE_DEV_DRM_LAST,
+VIR_ENUM_IMPL(virNodeDevDRM,
+              VIR_NODE_DEV_DRM_LAST,
               "primary",
               "control",
               "render",
diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c
index 9d5bc3a394..6720d5620d 100644
--- a/src/conf/numa_conf.c
+++ b/src/conf/numa_conf.c
@@ -52,7 +52,8 @@ VIR_ENUM_IMPL(virDomainNumatunePlacement,
               "auto",
 );
 
-VIR_ENUM_IMPL(virDomainMemoryAccess, VIR_DOMAIN_MEMORY_ACCESS_LAST,
+VIR_ENUM_IMPL(virDomainMemoryAccess,
+              VIR_DOMAIN_MEMORY_ACCESS_LAST,
               "default",
               "shared",
               "private",
diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index 15290f7f80..cecee51d87 100644
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -49,7 +49,8 @@
 #define VIR_FROM_THIS VIR_FROM_NWFILTER
 
 
-VIR_ENUM_IMPL(virNWFilterRuleAction, VIR_NWFILTER_RULE_ACTION_LAST,
+VIR_ENUM_IMPL(virNWFilterRuleAction,
+              VIR_NWFILTER_RULE_ACTION_LAST,
               "drop",
               "accept",
               "reject",
@@ -57,7 +58,8 @@ VIR_ENUM_IMPL(virNWFilterRuleAction, VIR_NWFILTER_RULE_ACTION_LAST,
               "continue",
 );
 
-VIR_ENUM_IMPL(virNWFilterJumpTarget, VIR_NWFILTER_RULE_ACTION_LAST,
+VIR_ENUM_IMPL(virNWFilterJumpTarget,
+              VIR_NWFILTER_RULE_ACTION_LAST,
               "DROP",
               "ACCEPT",
               "REJECT",
@@ -65,24 +67,28 @@ VIR_ENUM_IMPL(virNWFilterJumpTarget, VIR_NWFILTER_RULE_ACTION_LAST,
               "CONTINUE",
 );
 
-VIR_ENUM_IMPL(virNWFilterRuleDirection, VIR_NWFILTER_RULE_DIRECTION_LAST,
+VIR_ENUM_IMPL(virNWFilterRuleDirection,
+              VIR_NWFILTER_RULE_DIRECTION_LAST,
               "in",
               "out",
               "inout",
 );
 
-VIR_ENUM_IMPL(virNWFilterChainPolicy, VIR_NWFILTER_CHAIN_POLICY_LAST,
+VIR_ENUM_IMPL(virNWFilterChainPolicy,
+              VIR_NWFILTER_CHAIN_POLICY_LAST,
               "ACCEPT",
               "DROP",
 );
 
-VIR_ENUM_IMPL(virNWFilterEbtablesTable, VIR_NWFILTER_EBTABLES_TABLE_LAST,
+VIR_ENUM_IMPL(virNWFilterEbtablesTable,
+              VIR_NWFILTER_EBTABLES_TABLE_LAST,
               "filter",
               "nat",
               "broute",
 );
 
-VIR_ENUM_IMPL(virNWFilterChainSuffix, VIR_NWFILTER_CHAINSUFFIX_LAST,
+VIR_ENUM_IMPL(virNWFilterChainSuffix,
+              VIR_NWFILTER_CHAINSUFFIX_LAST,
               "root",
               "mac",
               "vlan",
@@ -93,7 +99,8 @@ VIR_ENUM_IMPL(virNWFilterChainSuffix, VIR_NWFILTER_CHAINSUFFIX_LAST,
               "ipv6",
 );
 
-VIR_ENUM_IMPL(virNWFilterRuleProtocol, VIR_NWFILTER_RULE_PROTOCOL_LAST,
+VIR_ENUM_IMPL(virNWFilterRuleProtocol,
+              VIR_NWFILTER_RULE_PROTOCOL_LAST,
               "none",
               "mac",
               "vlan",
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 8cc8ccfad7..ce543cbaf7 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -51,7 +51,8 @@
 
 VIR_LOG_INIT("conf.snapshot_conf");
 
-VIR_ENUM_IMPL(virDomainSnapshotLocation, VIR_DOMAIN_SNAPSHOT_LOCATION_LAST,
+VIR_ENUM_IMPL(virDomainSnapshotLocation,
+              VIR_DOMAIN_SNAPSHOT_LOCATION_LAST,
               "default",
               "no",
               "internal",
@@ -59,7 +60,8 @@ VIR_ENUM_IMPL(virDomainSnapshotLocation, VIR_DOMAIN_SNAPSHOT_LOCATION_LAST,
 );
 
 /* virDomainSnapshotState is really virDomainState plus one extra state */
-VIR_ENUM_IMPL(virDomainSnapshotState, VIR_DOMAIN_SNAPSHOT_LAST,
+VIR_ENUM_IMPL(virDomainSnapshotState,
+              VIR_DOMAIN_SNAPSHOT_LAST,
               "nostate",
               "running",
               "blocked",
diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 935d3d86b9..27420c4111 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -41,7 +41,8 @@
 
 VIR_LOG_INIT("libxl.libxl_domain");
 
-VIR_ENUM_IMPL(libxlDomainJob, LIBXL_JOB_LAST,
+VIR_ENUM_IMPL(libxlDomainJob,
+              LIBXL_JOB_LAST,
               "none",
               "query",
               "destroy",
diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index d204e60ca0..55c5840ab2 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -84,7 +84,8 @@ enum {
 };
 
 VIR_ENUM_DECL(virDaemonErr);
-VIR_ENUM_IMPL(virDaemonErr, VIR_LOCK_DAEMON_ERR_LAST,
+VIR_ENUM_IMPL(virDaemonErr,
+              VIR_LOCK_DAEMON_ERR_LAST,
               "Initialization successful",
               "Unable to obtain pidfile",
               "Unable to create rundir",
diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c
index 36da4860ff..3b91dd3c5e 100644
--- a/src/logging/log_daemon.c
+++ b/src/logging/log_daemon.c
@@ -80,7 +80,8 @@ enum {
 };
 
 VIR_ENUM_DECL(virDaemonErr);
-VIR_ENUM_IMPL(virDaemonErr, VIR_LOG_DAEMON_ERR_LAST,
+VIR_ENUM_IMPL(virDaemonErr,
+              VIR_LOG_DAEMON_ERR_LAST,
               "Initialization successful",
               "Unable to obtain pidfile",
               "Unable to create rundir",
diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index e502997118..51a9fd36eb 100644
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -37,7 +37,8 @@
 #define VIR_FROM_THIS VIR_FROM_LXC
 #define LXC_NAMESPACE_HREF "http://libvirt.org/schemas/domain/lxc/1.0"
 
-VIR_ENUM_IMPL(virLXCDomainJob, LXC_JOB_LAST,
+VIR_ENUM_IMPL(virLXCDomainJob,
+              LXC_JOB_LAST,
               "none",
               "query",
               "destroy",
diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index 2fd349ac1d..b4c6e790d8 100644
--- a/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c
@@ -35,7 +35,8 @@
 
 VIR_LOG_INIT("lxc.lxc_native");
 
-VIR_ENUM_IMPL(virLXCNetworkConfigEntry, VIR_LXC_NETWORK_CONFIG_LAST,
+VIR_ENUM_IMPL(virLXCNetworkConfigEntry,
+              VIR_LXC_NETWORK_CONFIG_LAST,
               "name",
               "type",
               "link",
diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c
index 6239da0ea1..46ebb7624d 100644
--- a/src/network/leaseshelper.c
+++ b/src/network/leaseshelper.c
@@ -73,7 +73,8 @@ enum virLeaseActionFlags {
 
 VIR_ENUM_DECL(virLeaseAction);
 
-VIR_ENUM_IMPL(virLeaseAction, VIR_LEASE_ACTION_LAST,
+VIR_ENUM_IMPL(virLeaseAction,
+              VIR_LEASE_ACTION_LAST,
               "add", "old", "del", "init",
 );
 
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 71d4c01296..c48f171008 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -62,7 +62,8 @@ VIR_LOG_INIT("qemu.qemu_capabilities");
  * are used in domain status files which are read on
  * daemon restarts
  */
-VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
+VIR_ENUM_IMPL(virQEMUCaps,
+              QEMU_CAPS_LAST, /* virQEMUCaps grouping marker */
               /* 0 */
               "kqemu",
               "vnc-colon",
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 029780fe86..d5ce9e7638 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -72,7 +72,8 @@
 VIR_LOG_INIT("qemu.qemu_command");
 
 VIR_ENUM_DECL(virDomainDiskQEMUBus);
-VIR_ENUM_IMPL(virDomainDiskQEMUBus, VIR_DOMAIN_DISK_BUS_LAST,
+VIR_ENUM_IMPL(virDomainDiskQEMUBus,
+              VIR_DOMAIN_DISK_BUS_LAST,
               "ide",
               "floppy",
               "scsi",
@@ -87,7 +88,8 @@ VIR_ENUM_IMPL(virDomainDiskQEMUBus, VIR_DOMAIN_DISK_BUS_LAST,
 
 VIR_ENUM_DECL(qemuDiskCacheV2);
 
-VIR_ENUM_IMPL(qemuDiskCacheV2, VIR_DOMAIN_DISK_CACHE_LAST,
+VIR_ENUM_IMPL(qemuDiskCacheV2,
+              VIR_DOMAIN_DISK_CACHE_LAST,
               "default",
               "none",
               "writethrough",
@@ -96,7 +98,8 @@ VIR_ENUM_IMPL(qemuDiskCacheV2, VIR_DOMAIN_DISK_CACHE_LAST,
               "unsafe",
 );
 
-VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
+VIR_ENUM_IMPL(qemuVideo,
+              VIR_DOMAIN_VIDEO_TYPE_LAST,
               "", /* default value, we shouldn't see this */
               "std",
               "cirrus",
@@ -112,7 +115,8 @@ VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
 
 VIR_ENUM_DECL(qemuDeviceVideo);
 
-VIR_ENUM_IMPL(qemuDeviceVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
+VIR_ENUM_IMPL(qemuDeviceVideo,
+              VIR_DOMAIN_VIDEO_TYPE_LAST,
               "", /* default value, we shouldn't see this */
               "VGA",
               "cirrus-vga",
@@ -128,7 +132,8 @@ VIR_ENUM_IMPL(qemuDeviceVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
 
 VIR_ENUM_DECL(qemuDeviceVideoSecondary);
 
-VIR_ENUM_IMPL(qemuDeviceVideoSecondary, VIR_DOMAIN_VIDEO_TYPE_LAST,
+VIR_ENUM_IMPL(qemuDeviceVideoSecondary,
+              VIR_DOMAIN_VIDEO_TYPE_LAST,
               "", /* default value, we shouldn't see this */
               "", /* no secondary device for VGA */
               "", /* no secondary device for cirrus-vga */
@@ -144,7 +149,8 @@ VIR_ENUM_IMPL(qemuDeviceVideoSecondary, VIR_DOMAIN_VIDEO_TYPE_LAST,
 
 VIR_ENUM_DECL(qemuSoundCodec);
 
-VIR_ENUM_IMPL(qemuSoundCodec, VIR_DOMAIN_SOUND_CODEC_TYPE_LAST,
+VIR_ENUM_IMPL(qemuSoundCodec,
+              VIR_DOMAIN_SOUND_CODEC_TYPE_LAST,
               "hda-duplex",
               "hda-micro",
               "hda-output",
@@ -152,7 +158,8 @@ VIR_ENUM_IMPL(qemuSoundCodec, VIR_DOMAIN_SOUND_CODEC_TYPE_LAST,
 
 VIR_ENUM_DECL(qemuControllerModelUSB);
 
-VIR_ENUM_IMPL(qemuControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST,
+VIR_ENUM_IMPL(qemuControllerModelUSB,
+              VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST,
               "piix3-usb-uhci",
               "piix4-usb-uhci",
               "usb-ehci",
@@ -170,7 +177,8 @@ VIR_ENUM_IMPL(qemuControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST,
 );
 
 VIR_ENUM_DECL(qemuDomainFSDriver);
-VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST,
+VIR_ENUM_IMPL(qemuDomainFSDriver,
+              VIR_DOMAIN_FS_DRIVER_TYPE_LAST,
               "local",
               "local",
               "handle",
@@ -180,7 +188,8 @@ VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST,
 );
 
 VIR_ENUM_DECL(qemuNumaPolicy);
-VIR_ENUM_IMPL(qemuNumaPolicy, VIR_DOMAIN_NUMATUNE_MEM_LAST,
+VIR_ENUM_IMPL(qemuNumaPolicy,
+              VIR_DOMAIN_NUMATUNE_MEM_LAST,
               "bind",
               "preferred",
               "interleave",
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index f0bf1aa4fe..f4bfccdb3d 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -80,7 +80,8 @@ VIR_LOG_INIT("qemu.qemu_domain");
 
 #define QEMU_NAMESPACE_HREF "http://libvirt.org/schemas/domain/qemu/1.0"
 
-VIR_ENUM_IMPL(qemuDomainJob, QEMU_JOB_LAST,
+VIR_ENUM_IMPL(qemuDomainJob,
+              QEMU_JOB_LAST,
               "none",
               "query",
               "destroy",
@@ -92,13 +93,15 @@ VIR_ENUM_IMPL(qemuDomainJob, QEMU_JOB_LAST,
               "async nested",
 );
 
-VIR_ENUM_IMPL(qemuDomainAgentJob, QEMU_AGENT_JOB_LAST,
+VIR_ENUM_IMPL(qemuDomainAgentJob,
+              QEMU_AGENT_JOB_LAST,
               "none",
               "query",
               "modify",
 );
 
-VIR_ENUM_IMPL(qemuDomainAsyncJob, QEMU_ASYNC_JOB_LAST,
+VIR_ENUM_IMPL(qemuDomainAsyncJob,
+              QEMU_ASYNC_JOB_LAST,
               "none",
               "migration out",
               "migration in",
@@ -108,7 +111,8 @@ VIR_ENUM_IMPL(qemuDomainAsyncJob, QEMU_ASYNC_JOB_LAST,
               "start",
 );
 
-VIR_ENUM_IMPL(qemuDomainNamespace, QEMU_DOMAIN_NS_LAST,
+VIR_ENUM_IMPL(qemuDomainNamespace,
+              QEMU_DOMAIN_NS_LAST,
               "mount",
 );
 
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7e5bbc3cc9..30d3d73d19 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2714,7 +2714,8 @@ typedef enum {
 } virQEMUSaveFormat;
 
 VIR_ENUM_DECL(qemuSaveCompression);
-VIR_ENUM_IMPL(qemuSaveCompression, QEMU_SAVE_FORMAT_LAST,
+VIR_ENUM_IMPL(qemuSaveCompression,
+              QEMU_SAVE_FORMAT_LAST,
               "raw",
               "gzip",
               "bzip2",
@@ -2723,7 +2724,8 @@ VIR_ENUM_IMPL(qemuSaveCompression, QEMU_SAVE_FORMAT_LAST,
 );
 
 VIR_ENUM_DECL(qemuDumpFormat);
-VIR_ENUM_IMPL(qemuDumpFormat, VIR_DOMAIN_CORE_DUMP_FORMAT_LAST,
+VIR_ENUM_IMPL(qemuDumpFormat,
+              VIR_DOMAIN_CORE_DUMP_FORMAT_LAST,
               "elf",
               "kdump-zlib",
               "kdump-lzo",
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 5db23b492f..a41ebadbcc 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -66,7 +66,8 @@
 
 VIR_LOG_INIT("qemu.qemu_migration");
 
-VIR_ENUM_IMPL(qemuMigrationJobPhase, QEMU_MIGRATION_PHASE_LAST,
+VIR_ENUM_IMPL(qemuMigrationJobPhase,
+              QEMU_MIGRATION_PHASE_LAST,
               "none",
               "perform2",
               "begin3",
diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index 1c78b906a6..e296fc1927 100644
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -72,12 +72,14 @@ typedef enum {
     QEMU_MIGRATION_COMPRESS_LAST
 } qemuMigrationCompressMethod;
 VIR_ENUM_DECL(qemuMigrationCompressMethod);
-VIR_ENUM_IMPL(qemuMigrationCompressMethod, QEMU_MIGRATION_COMPRESS_LAST,
+VIR_ENUM_IMPL(qemuMigrationCompressMethod,
+              QEMU_MIGRATION_COMPRESS_LAST,
               "xbzrle",
               "mt",
 );
 
-VIR_ENUM_IMPL(qemuMigrationCapability, QEMU_MIGRATION_CAP_LAST,
+VIR_ENUM_IMPL(qemuMigrationCapability,
+              QEMU_MIGRATION_CAP_LAST,
               "xbzrle",
               "auto-converge",
               "rdma-pin-all",
@@ -91,7 +93,8 @@ VIR_ENUM_IMPL(qemuMigrationCapability, QEMU_MIGRATION_CAP_LAST,
 
 
 VIR_ENUM_DECL(qemuMigrationParam);
-VIR_ENUM_IMPL(qemuMigrationParam, QEMU_MIGRATION_PARAM_LAST,
+VIR_ENUM_IMPL(qemuMigrationParam,
+              QEMU_MIGRATION_PARAM_LAST,
               "compress-level",
               "compress-threads",
               "decompress-threads",
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 8e6c3ccd63..4db9e7b85b 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -732,7 +732,8 @@ static void qemuMonitorJSONHandleRTCChange(qemuMonitorPtr mon, virJSONValuePtr d
 }
 
 VIR_ENUM_DECL(qemuMonitorWatchdogAction);
-VIR_ENUM_IMPL(qemuMonitorWatchdogAction, VIR_DOMAIN_EVENT_WATCHDOG_LAST,
+VIR_ENUM_IMPL(qemuMonitorWatchdogAction,
+              VIR_DOMAIN_EVENT_WATCHDOG_LAST,
               "none", "pause", "reset", "poweroff", "shutdown", "debug", "inject-nmi",
 );
 
@@ -754,7 +755,8 @@ static void qemuMonitorJSONHandleWatchdog(qemuMonitorPtr mon, virJSONValuePtr da
 }
 
 VIR_ENUM_DECL(qemuMonitorIOErrorAction);
-VIR_ENUM_IMPL(qemuMonitorIOErrorAction, VIR_DOMAIN_EVENT_IO_ERROR_LAST,
+VIR_ENUM_IMPL(qemuMonitorIOErrorAction,
+              VIR_DOMAIN_EVENT_IO_ERROR_LAST,
               "ignore", "stop", "report",
 );
 
diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index 61eabe03be..c3782971f1 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -90,7 +90,8 @@ enum {
 };
 
 VIR_ENUM_DECL(virDaemonErr);
-VIR_ENUM_IMPL(virDaemonErr, VIR_DAEMON_ERR_LAST,
+VIR_ENUM_IMPL(virDaemonErr,
+              VIR_DAEMON_ERR_LAST,
               "Initialization successful",
               "Unable to obtain pidfile",
               "Unable to create rundir",
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 34c970f292..4238d7014b 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -62,7 +62,8 @@ VIR_LOG_INIT("util.cgroup");
 #define CGROUP_NB_TOTAL_CPU_STAT_PARAM 3
 #define CGROUP_NB_PER_CPU_STAT_PARAM   1
 
-VIR_ENUM_IMPL(virCgroupController, VIR_CGROUP_CONTROLLER_LAST,
+VIR_ENUM_IMPL(virCgroupController,
+              VIR_CGROUP_CONTROLLER_LAST,
               "cpu", "cpuacct", "cpuset", "memory", "devices",
               "freezer", "blkio", "net_cls", "perf_event",
               "name=systemd",
diff --git a/src/util/vircgroupbackend.c b/src/util/vircgroupbackend.c
index 06fbb2217d..d56e4ea292 100644
--- a/src/util/vircgroupbackend.c
+++ b/src/util/vircgroupbackend.c
@@ -30,7 +30,8 @@
 #define VIR_FROM_THIS VIR_FROM_CGROUP
 
 VIR_ENUM_DECL(virCgroupBackend);
-VIR_ENUM_IMPL(virCgroupBackend, VIR_CGROUP_BACKEND_TYPE_LAST,
+VIR_ENUM_IMPL(virCgroupBackend,
+              VIR_CGROUP_BACKEND_TYPE_LAST,
               "cgroup V2",
               "cgroup V1",
 );
diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
index 7482b96a27..d91436027f 100644
--- a/src/util/vircgroupv1.c
+++ b/src/util/vircgroupv1.c
@@ -48,7 +48,8 @@ VIR_LOG_INIT("util.cgroup");
 
 
 VIR_ENUM_DECL(virCgroupV1Controller);
-VIR_ENUM_IMPL(virCgroupV1Controller, VIR_CGROUP_CONTROLLER_LAST,
+VIR_ENUM_IMPL(virCgroupV1Controller,
+              VIR_CGROUP_CONTROLLER_LAST,
               "cpu", "cpuacct", "cpuset", "memory", "devices",
               "freezer", "blkio", "net_cls", "perf_event",
               "name=systemd",
diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
index 3264bff014..6d90b4872d 100644
--- a/src/util/vircgroupv2.c
+++ b/src/util/vircgroupv2.c
@@ -45,7 +45,8 @@ VIR_LOG_INIT("util.cgroup");
 #define VIR_FROM_THIS VIR_FROM_CGROUP
 
 VIR_ENUM_DECL(virCgroupV2Controller);
-VIR_ENUM_IMPL(virCgroupV2Controller, VIR_CGROUP_CONTROLLER_LAST,
+VIR_ENUM_IMPL(virCgroupV2Controller,
+              VIR_CGROUP_CONTROLLER_LAST,
               "cpu", "cpuacct", "cpuset", "memory", "devices",
               "freezer", "io", "net_cls", "perf_event", "name=systemd",
 );
diff --git a/src/util/virconf.c b/src/util/virconf.c
index 34a171bff8..665805b7cf 100644
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -65,7 +65,8 @@ struct _virConfParserCtxt {
   do { while ((ctxt->cur < ctxt->end) && (c_isblank(CUR))) \
           ctxt->cur++; } while (0)
 
-VIR_ENUM_IMPL(virConf, VIR_CONF_LAST,
+VIR_ENUM_IMPL(virConf,
+              VIR_CONF_LAST,
               "*unexpected*",
               "long",
               "unsigned long",
diff --git a/src/util/virenum.c b/src/util/virenum.c
index abbc74d28e..26093bd795 100644
--- a/src/util/virenum.c
+++ b/src/util/virenum.c
@@ -22,13 +22,15 @@
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
-VIR_ENUM_IMPL(virTristateBool, VIR_TRISTATE_BOOL_LAST,
+VIR_ENUM_IMPL(virTristateBool,
+              VIR_TRISTATE_BOOL_LAST,
               "default",
               "yes",
               "no",
 );
 
-VIR_ENUM_IMPL(virTristateSwitch, VIR_TRISTATE_SWITCH_LAST,
+VIR_ENUM_IMPL(virTristateSwitch,
+              VIR_TRISTATE_SWITCH_LAST,
               "default",
               "on",
               "off",
diff --git a/src/util/virerror.c b/src/util/virerror.c
index d26dd2b1f1..37b5b2f3f9 100644
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -57,7 +57,8 @@ static virLogPriority virErrorLevelPriority(virErrorLevel level)
 
 
 VIR_ENUM_DECL(virErrorDomain);
-VIR_ENUM_IMPL(virErrorDomain, VIR_ERR_DOMAIN_LAST,
+VIR_ENUM_IMPL(virErrorDomain,
+              VIR_ERR_DOMAIN_LAST,
               "", /* 0 */
               "Xen Driver",
               "Xen Daemon",
diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c
index 940cc9b3f9..f6344b631c 100644
--- a/src/util/virfirewall.c
+++ b/src/util/virfirewall.c
@@ -42,7 +42,8 @@ typedef struct _virFirewallGroup virFirewallGroup;
 typedef virFirewallGroup *virFirewallGroupPtr;
 
 VIR_ENUM_DECL(virFirewallLayerCommand);
-VIR_ENUM_IMPL(virFirewallLayerCommand, VIR_FIREWALL_LAYER_LAST,
+VIR_ENUM_IMPL(virFirewallLayerCommand,
+              VIR_FIREWALL_LAYER_LAST,
               EBTABLES_PATH,
               IPTABLES_PATH,
               IP6TABLES_PATH,
diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c
index 1e30dadff3..5d83c3ea2b 100644
--- a/src/util/virfirewalld.c
+++ b/src/util/virfirewalld.c
@@ -41,7 +41,8 @@ VIR_LOG_INIT("util.firewalld");
  * understood by the firewalld.direct "passthrough" method
  */
 VIR_ENUM_DECL(virFirewallLayerFirewallD);
-VIR_ENUM_IMPL(virFirewallLayerFirewallD, VIR_FIREWALL_LAYER_LAST,
+VIR_ENUM_IMPL(virFirewallLayerFirewallD,
+              VIR_FIREWALL_LAYER_LAST,
               "eb",
               "ipv4",
               "ipv6",
@@ -49,7 +50,8 @@ VIR_ENUM_IMPL(virFirewallLayerFirewallD, VIR_FIREWALL_LAYER_LAST,
 
 
 VIR_ENUM_DECL(virFirewallDBackend);
-VIR_ENUM_IMPL(virFirewallDBackend, VIR_FIREWALLD_BACKEND_LAST,
+VIR_ENUM_IMPL(virFirewallDBackend,
+              VIR_FIREWALLD_BACKEND_LAST,
               "",
               "iptables",
               "nftables",
diff --git a/src/util/virgic.c b/src/util/virgic.c
index 9a8a07d33d..a3ea3ce6ff 100644
--- a/src/util/virgic.c
+++ b/src/util/virgic.c
@@ -23,7 +23,8 @@
 #include "virgic.h"
 #include "virutil.h"
 
-VIR_ENUM_IMPL(virGICVersion, VIR_GIC_VERSION_LAST,
+VIR_ENUM_IMPL(virGICVersion,
+              VIR_GIC_VERSION_LAST,
               "none",
               "host",
               "2",
diff --git a/src/util/virhook.c b/src/util/virhook.c
index 37de0cb39e..57549ef8e5 100644
--- a/src/util/virhook.c
+++ b/src/util/virhook.c
@@ -58,19 +58,22 @@ VIR_ENUM_IMPL(virHookDriver,
               "libxl",
 );
 
-VIR_ENUM_IMPL(virHookDaemonOp, VIR_HOOK_DAEMON_OP_LAST,
+VIR_ENUM_IMPL(virHookDaemonOp,
+              VIR_HOOK_DAEMON_OP_LAST,
               "start",
               "shutdown",
               "reload",
 );
 
-VIR_ENUM_IMPL(virHookSubop, VIR_HOOK_SUBOP_LAST,
+VIR_ENUM_IMPL(virHookSubop,
+              VIR_HOOK_SUBOP_LAST,
               "-",
               "begin",
               "end",
 );
 
-VIR_ENUM_IMPL(virHookQemuOp, VIR_HOOK_QEMU_OP_LAST,
+VIR_ENUM_IMPL(virHookQemuOp,
+              VIR_HOOK_QEMU_OP_LAST,
               "start",
               "stopped",
               "prepare",
@@ -82,7 +85,8 @@ VIR_ENUM_IMPL(virHookQemuOp, VIR_HOOK_QEMU_OP_LAST,
               "restore",
 );
 
-VIR_ENUM_IMPL(virHookLxcOp, VIR_HOOK_LXC_OP_LAST,
+VIR_ENUM_IMPL(virHookLxcOp,
+              VIR_HOOK_LXC_OP_LAST,
               "start",
               "stopped",
               "prepare",
@@ -91,7 +95,8 @@ VIR_ENUM_IMPL(virHookLxcOp, VIR_HOOK_LXC_OP_LAST,
               "reconnect",
 );
 
-VIR_ENUM_IMPL(virHookNetworkOp, VIR_HOOK_NETWORK_OP_LAST,
+VIR_ENUM_IMPL(virHookNetworkOp,
+              VIR_HOOK_NETWORK_OP_LAST,
               "start",
               "started",
               "stopped",
@@ -100,7 +105,8 @@ VIR_ENUM_IMPL(virHookNetworkOp, VIR_HOOK_NETWORK_OP_LAST,
               "updated",
 );
 
-VIR_ENUM_IMPL(virHookLibxlOp, VIR_HOOK_LIBXL_OP_LAST,
+VIR_ENUM_IMPL(virHookLibxlOp,
+              VIR_HOOK_LIBXL_OP_LAST,
               "start",
               "stopped",
               "prepare",
diff --git a/src/util/virkeycode.c b/src/util/virkeycode.c
index d5ce367b13..336443e01d 100644
--- a/src/util/virkeycode.c
+++ b/src/util/virkeycode.c
@@ -68,7 +68,8 @@ verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyNameTable_linux));
 verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyNameTable_osx));
 verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyNameTable_win32));
 
-VIR_ENUM_IMPL(virKeycodeSet, VIR_KEYCODE_SET_LAST,
+VIR_ENUM_IMPL(virKeycodeSet,
+              VIR_KEYCODE_SET_LAST,
               "linux",
               "xt",
               "atset1",
diff --git a/src/util/virlog.c b/src/util/virlog.c
index 269a5f89d4..248ce19902 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -76,7 +76,8 @@ static char virLogHostname[HOST_NAME_MAX+1];
     VIR_LOG_PID_REGEX ": " VIR_LOG_LEVEL_REGEX " : "
 
 VIR_ENUM_DECL(virLogDestination);
-VIR_ENUM_IMPL(virLogDestination, VIR_LOG_TO_OUTPUT_LAST,
+VIR_ENUM_IMPL(virLogDestination,
+              VIR_LOG_TO_OUTPUT_LAST,
               "stderr", "syslog", "file", "journald",
 );
 
diff --git a/src/util/virmdev.c b/src/util/virmdev.c
index aa046f519e..3d5488cdae 100644
--- a/src/util/virmdev.c
+++ b/src/util/virmdev.c
@@ -47,7 +47,8 @@ struct _virMediatedDeviceList {
     virMediatedDevicePtr *devs;
 };
 
-VIR_ENUM_IMPL(virMediatedDeviceModel, VIR_MDEV_MODEL_TYPE_LAST,
+VIR_ENUM_IMPL(virMediatedDeviceModel,
+              VIR_MDEV_MODEL_TYPE_LAST,
               "vfio-pci",
               "vfio-ccw",
               "vfio-ap",
diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index e916ba0a0a..f09510646c 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -34,7 +34,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NET
 
-VIR_ENUM_IMPL(virNetDevMacVLanMode, VIR_NETDEV_MACVLAN_MODE_LAST,
+VIR_ENUM_IMPL(virNetDevMacVLanMode,
+              VIR_NETDEV_MACVLAN_MODE_LAST,
               "vepa",
               "private",
               "bridge",
diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index b30204fe7f..810feba615 100644
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -27,7 +27,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NET
 
-VIR_ENUM_IMPL(virNetDevVPort, VIR_NETDEV_VPORT_PROFILE_LAST,
+VIR_ENUM_IMPL(virNetDevVPort,
+              VIR_NETDEV_VPORT_PROFILE_LAST,
               "none",
               "802.1Qbg",
               "802.1Qbh",
@@ -35,7 +36,8 @@ VIR_ENUM_IMPL(virNetDevVPort, VIR_NETDEV_VPORT_PROFILE_LAST,
               "midonet",
 );
 
-VIR_ENUM_IMPL(virNetDevVPortProfileOp, VIR_NETDEV_VPORT_PROFILE_OP_LAST,
+VIR_ENUM_IMPL(virNetDevVPortProfileOp,
+              VIR_NETDEV_VPORT_PROFILE_OP_LAST,
               "create",
               "save",
               "restore",
diff --git a/src/util/virpci.c b/src/util/virpci.c
index 871aaa392d..8f2936c23a 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -46,18 +46,21 @@ VIR_LOG_INIT("util.pci");
 #define PCI_ID_LEN 10   /* "XXXX XXXX" */
 #define PCI_ADDR_LEN 13 /* "XXXX:XX:XX.X" */
 
-VIR_ENUM_IMPL(virPCIELinkSpeed, VIR_PCIE_LINK_SPEED_LAST,
+VIR_ENUM_IMPL(virPCIELinkSpeed,
+              VIR_PCIE_LINK_SPEED_LAST,
               "", "2.5", "5", "8", "16",
 );
 
-VIR_ENUM_IMPL(virPCIStubDriver, VIR_PCI_STUB_DRIVER_LAST,
+VIR_ENUM_IMPL(virPCIStubDriver,
+              VIR_PCI_STUB_DRIVER_LAST,
               "none",
               "pciback", /* XEN */
               "pci-stub", /* KVM */
               "vfio-pci", /* VFIO */
 );
 
-VIR_ENUM_IMPL(virPCIHeader, VIR_PCI_HEADER_LAST,
+VIR_ENUM_IMPL(virPCIHeader,
+              VIR_PCI_HEADER_LAST,
               "endpoint",
               "pci-bridge",
               "cardbus-bridge",
diff --git a/src/util/virperf.c b/src/util/virperf.c
index 9bde5c1246..3e4b2eea8d 100644
--- a/src/util/virperf.c
+++ b/src/util/virperf.c
@@ -35,7 +35,8 @@ VIR_LOG_INIT("util.perf");
 
 #define VIR_FROM_THIS VIR_FROM_PERF
 
-VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST,
+VIR_ENUM_IMPL(virPerfEvent,
+              VIR_PERF_EVENT_LAST,
               "cmt", "mbmt", "mbml",
               "cpu_cycles", "instructions",
               "cache_references", "cache_misses",
diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index 52b86c549d..f2533f639f 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -107,7 +107,8 @@ static inline int setns(int fd ATTRIBUTE_UNUSED, int nstype ATTRIBUTE_UNUSED)
 }
 #endif
 
-VIR_ENUM_IMPL(virProcessSchedPolicy, VIR_PROC_POLICY_LAST,
+VIR_ENUM_IMPL(virProcessSchedPolicy,
+              VIR_PROC_POLICY_LAST,
               "none",
               "batch",
               "idle",
diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
index e495233110..6196c3cdbf 100644
--- a/src/util/virresctrl.c
+++ b/src/util/virresctrl.c
@@ -54,14 +54,16 @@ VIR_LOG_INIT("util.virresctrl");
  * consistent in between all of them. */
 
 /* Cache name mapping for Linux kernel naming. */
-VIR_ENUM_IMPL(virCacheKernel, VIR_CACHE_TYPE_LAST,
+VIR_ENUM_IMPL(virCacheKernel,
+              VIR_CACHE_TYPE_LAST,
               "Unified",
               "Instruction",
               "Data",
 );
 
 /* Cache name mapping for our XML naming. */
-VIR_ENUM_IMPL(virCache, VIR_CACHE_TYPE_LAST,
+VIR_ENUM_IMPL(virCache,
+              VIR_CACHE_TYPE_LAST,
               "both",
               "code",
               "data",
@@ -69,14 +71,16 @@ VIR_ENUM_IMPL(virCache, VIR_CACHE_TYPE_LAST,
 
 /* Cache name mapping for resctrl interface naming. */
 VIR_ENUM_DECL(virResctrl);
-VIR_ENUM_IMPL(virResctrl, VIR_CACHE_TYPE_LAST,
+VIR_ENUM_IMPL(virResctrl,
+              VIR_CACHE_TYPE_LAST,
               "",
               "CODE",
               "DATA",
 );
 
 /* Monitor feature name prefix mapping for monitor naming */
-VIR_ENUM_IMPL(virResctrlMonitorPrefix, VIR_RESCTRL_MONITOR_TYPE_LAST,
+VIR_ENUM_IMPL(virResctrlMonitorPrefix,
+              VIR_RESCTRL_MONITOR_TYPE_LAST,
               "__unsupported__",
               "llc_",
               "mbm_",
diff --git a/src/util/virsecret.c b/src/util/virsecret.c
index b503cf5de6..854dc72b06 100644
--- a/src/util/virsecret.c
+++ b/src/util/virsecret.c
@@ -32,7 +32,8 @@
 
 VIR_LOG_INIT("util.secret");
 
-VIR_ENUM_IMPL(virSecretUsage, VIR_SECRET_USAGE_TYPE_LAST,
+VIR_ENUM_IMPL(virSecretUsage,
+              VIR_SECRET_USAGE_TYPE_LAST,
               "none", "volume", "ceph", "iscsi", "tls",
 );
 
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 50ee9b574c..2b1c0a5b8e 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -49,7 +49,8 @@ VIR_LOG_INIT("util.storagefile");
 
 static virClassPtr virStorageSourceClass;
 
-VIR_ENUM_IMPL(virStorage, VIR_STORAGE_TYPE_LAST,
+VIR_ENUM_IMPL(virStorage,
+              VIR_STORAGE_TYPE_LAST,
               "none",
               "file",
               "block",
@@ -75,7 +76,8 @@ VIR_ENUM_IMPL(virStorageFileFeature,
               "lazy_refcounts",
 );
 
-VIR_ENUM_IMPL(virStorageNetProtocol, VIR_STORAGE_NET_PROTOCOL_LAST,
+VIR_ENUM_IMPL(virStorageNetProtocol,
+              VIR_STORAGE_NET_PROTOCOL_LAST,
               "none",
               "nbd",
               "rbd",
@@ -91,7 +93,8 @@ VIR_ENUM_IMPL(virStorageNetProtocol, VIR_STORAGE_NET_PROTOCOL_LAST,
               "vxhs",
 );
 
-VIR_ENUM_IMPL(virStorageNetHostTransport, VIR_STORAGE_NET_HOST_TRANS_LAST,
+VIR_ENUM_IMPL(virStorageNetHostTransport,
+              VIR_STORAGE_NET_HOST_TRANS_LAST,
               "tcp",
               "unix",
               "rdma",
diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
index 8d24f6f0a3..79a935b90a 100644
--- a/src/util/virsysinfo.c
+++ b/src/util/virsysinfo.c
@@ -41,7 +41,8 @@
 
 VIR_LOG_INIT("util.sysinfo");
 
-VIR_ENUM_IMPL(virSysinfo, VIR_SYSINFO_LAST,
+VIR_ENUM_IMPL(virSysinfo,
+              VIR_SYSINFO_LAST,
               "smbios",
 );
 
diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c
index 464f41eea5..8f23348d97 100644
--- a/src/util/virtypedparam.c
+++ b/src/util/virtypedparam.c
@@ -31,7 +31,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
-VIR_ENUM_IMPL(virTypedParameter, VIR_TYPED_PARAM_LAST,
+VIR_ENUM_IMPL(virTypedParameter,
+              VIR_TYPED_PARAM_LAST,
               "unknown",
               "int",
               "uint",
diff --git a/src/util/virutil.c b/src/util/virutil.c
index f0c30063f2..e5917d33de 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -84,7 +84,6 @@ verify(sizeof(gid_t) <= sizeof(unsigned int) &&
 
 VIR_LOG_INIT("util.util");
 
-
 #ifndef WIN32
 
 int virSetInherit(int fd, bool inherit)
diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index 0c1b1f9550..963e7a9876 100644
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -38,7 +38,8 @@
 
 VIR_LOG_INIT("vmware.vmware_conf");
 
-VIR_ENUM_IMPL(vmwareDriver, VMWARE_DRIVER_LAST,
+VIR_ENUM_IMPL(vmwareDriver,
+              VMWARE_DRIVER_LAST,
               "player",
               "ws",
               "fusion",
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index ae9ee87be3..cf2d4df945 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -509,7 +509,8 @@ def->parallels[0]...
  * 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_IMPL(virVMXControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST,
+VIR_ENUM_IMPL(virVMXControllerModelSCSI,
+              VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST,
               "auto", /* just to match virDomainControllerModel, will never be used */
               "buslogic",
               "lsilogic",
diff --git a/tests/group-qemu-caps.pl b/tests/group-qemu-caps.pl
index 514764f47f..829e63a562 100755
--- a/tests/group-qemu-caps.pl
+++ b/tests/group-qemu-caps.pl
@@ -39,7 +39,7 @@ if (defined $ARGV[0]) {
 
 my $ret = 0;
 if (&regroup_caps($prefix . 'src/qemu/qemu_capabilities.c',
-                  '^VIR_ENUM_IMPL\(virQEMUCaps,',
+                  'virQEMUCaps grouping marker',
                   '\);',
                   0,
                   "              ") < 0) {
diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c
index e134ccfe1c..963e9e0977 100644
--- a/tests/virkeycodetest.c
+++ b/tests/virkeycodetest.c
@@ -83,7 +83,8 @@ static int testKeycodeStrings(const void *data ATTRIBUTE_UNUSED)
 
     TRANSLATE(LINUX, "KEY_DELETE", 111);
     TRANSLATE(LINUX, "KEY_RFKILL", 524);
-    TRANSLATE(LINUX, "KEY_WIBBLE", -1);
+    TRANSLATE(LINUX, "KEY_WIBBLE",
+              -1);
     TRANSLATE(OSX, "Function", 0x3f);
     TRANSLATE(WIN32, "VK_UP", 0x26);
 
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index e8d5404acf..688480db75 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -5644,12 +5644,14 @@ static const vshCmdOptDef opts_setLifecycleAction[] = {
     {.name = NULL}
 };
 
-VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_LAST,
+VIR_ENUM_IMPL(virDomainLifecycle,
+              VIR_DOMAIN_LIFECYCLE_LAST,
               "poweroff",
               "reboot",
               "crash");
 
-VIR_ENUM_IMPL(virDomainLifecycleAction, VIR_DOMAIN_LIFECYCLE_ACTION_LAST,
+VIR_ENUM_IMPL(virDomainLifecycleAction,
+              VIR_DOMAIN_LIFECYCLE_ACTION_LAST,
               "destroy",
               "restart",
               "rename-restart",
diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index be3c2cf1cb..f12d7829b8 100644
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -773,7 +773,8 @@ typedef enum {
 } virshCPUStats;
 
 VIR_ENUM_DECL(virshCPUStats);
-VIR_ENUM_IMPL(virshCPUStats, VIRSH_CPU_LAST,
+VIR_ENUM_IMPL(virshCPUStats,
+              VIRSH_CPU_LAST,
               VIR_NODE_CPU_STATS_USER,
               VIR_NODE_CPU_STATS_KERNEL,
               VIR_NODE_CPU_STATS_IDLE,
diff --git a/tools/virsh-network.c b/tools/virsh-network.c
index 9adc63a8fa..62bf4fe5a8 100644
--- a/tools/virsh-network.c
+++ b/tools/virsh-network.c
@@ -905,11 +905,13 @@ static const vshCmdOptDef opts_network_update[] = {
 };
 
 VIR_ENUM_DECL(virNetworkUpdateCommand);
-VIR_ENUM_IMPL(virNetworkUpdateCommand, VIR_NETWORK_UPDATE_COMMAND_LAST,
+VIR_ENUM_IMPL(virNetworkUpdateCommand,
+              VIR_NETWORK_UPDATE_COMMAND_LAST,
               "none", "modify", "delete", "add-last", "add-first");
 
 VIR_ENUM_DECL(virNetworkSection);
-VIR_ENUM_IMPL(virNetworkSection, VIR_NETWORK_SECTION_LAST,
+VIR_ENUM_IMPL(virNetworkSection,
+              VIR_NETWORK_SECTION_LAST,
               "none", "bridge", "domain", "ip", "ip-dhcp-host",
               "ip-dhcp-range", "forward", "forward-interface",
               "forward-pf", "portgroup", "dns-host", "dns-txt",
diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index 59a75f3d8c..f697781330 100644
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -936,7 +936,8 @@ static const vshCmdOptDef opts_vol_wipe[] = {
 };
 
 VIR_ENUM_DECL(virStorageVolWipeAlgorithm);
-VIR_ENUM_IMPL(virStorageVolWipeAlgorithm, VIR_STORAGE_VOL_WIPE_ALG_LAST,
+VIR_ENUM_IMPL(virStorageVolWipeAlgorithm,
+              VIR_STORAGE_VOL_WIPE_ALG_LAST,
               "zero", "nnsa", "dod", "bsi", "gutmann", "schneier",
               "pfitzner7", "pfitzner33", "random", "trim");
 
diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c
index 40f7367b0c..804c0adc2d 100644
--- a/tools/virt-host-validate-common.c
+++ b/tools/virt-host-validate-common.c
@@ -35,7 +35,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
-VIR_ENUM_IMPL(virHostValidateCPUFlag, VIR_HOST_VALIDATE_CPU_FLAG_LAST,
+VIR_ENUM_IMPL(virHostValidateCPUFlag,
+              VIR_HOST_VALIDATE_CPU_FLAG_LAST,
               "vmx",
               "svm",
               "sie");
