External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always put _LAST enums on second line of VIR_ENUM_IMPL

Browse Source 
Standardize on putting the _LAST enum value on the second line
of VIR_ENUM_IMPL invocations. Later patches that add string labels
to VIR_ENUM_IMPL will push most of these to the second line anyways,
so this saves some noise.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2019-03-16 14:20:32 -04:00
parent ae076bb40e
commit 1d31526b52
59 changed files with 395 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/conf/capabilities.c
View File

@ -50,7 +50,8 @@
VIR_LOG_INIT("conf.capabilities"); VIR_LOG_INIT("conf.capabilities");
VIR_ENUM_DECL(virCapsHostPMTarget); 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", "suspend_mem", "suspend_disk", "suspend_hybrid",
); );

21
src/conf/cpu_conf.c
View File

@ -32,35 +32,41 @@
VIR_LOG_INIT("conf.cpu_conf"); 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", "host", "guest", "auto",
); );
VIR_ENUM_IMPL(virCPUMode, VIR_CPU_MODE_LAST, VIR_ENUM_IMPL(virCPUMode,
VIR_CPU_MODE_LAST,
"custom", "custom",
"host-model", "host-model",
"host-passthrough", "host-passthrough",
); );
VIR_ENUM_IMPL(virCPUMatch, VIR_CPU_MATCH_LAST, VIR_ENUM_IMPL(virCPUMatch,
VIR_CPU_MATCH_LAST,
"minimum", "minimum",
"exact", "exact",
"strict", "strict",
); );
VIR_ENUM_IMPL(virCPUCheck, VIR_CPU_CHECK_LAST, VIR_ENUM_IMPL(virCPUCheck,
VIR_CPU_CHECK_LAST,
"default", "default",
"none", "none",
"partial", "partial",
"full", "full",
); );
VIR_ENUM_IMPL(virCPUFallback, VIR_CPU_FALLBACK_LAST, VIR_ENUM_IMPL(virCPUFallback,
VIR_CPU_FALLBACK_LAST,
"allow", "allow",
"forbid", "forbid",
); );
VIR_ENUM_IMPL(virCPUFeaturePolicy, VIR_CPU_FEATURE_LAST, VIR_ENUM_IMPL(virCPUFeaturePolicy,
VIR_CPU_FEATURE_LAST,
"force", "force",
"require", "require",
"optional", "optional",
@ -68,7 +74,8 @@ VIR_ENUM_IMPL(virCPUFeaturePolicy, VIR_CPU_FEATURE_LAST,
"forbid", "forbid",
); );
VIR_ENUM_IMPL(virCPUCacheMode, VIR_CPU_CACHE_MODE_LAST, VIR_ENUM_IMPL(virCPUCacheMode,
VIR_CPU_CACHE_MODE_LAST,
"emulate", "emulate",
"passthrough", "passthrough",
"disable", "disable",

3
src/conf/device_conf.c
View File

@ -31,7 +31,8 @@
#define VIR_FROM_THIS VIR_FROM_DEVICE #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", "none",
"pci", "pci",
"drive", "drive",

3
src/conf/domain_capabilities.c
View File

@ -27,7 +27,8 @@
#define VIR_FROM_THIS VIR_FROM_CAPABILITIES #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", "unknown", "yes", "no",
); );

279
src/conf/domain_conf.c
View File

@ -89,7 +89,8 @@ struct _virDomainXMLOption {
VIR_DOMAIN_DEF_FORMAT_INACTIVE | \ VIR_DOMAIN_DEF_FORMAT_INACTIVE | \
VIR_DOMAIN_DEF_FORMAT_MIGRATABLE) VIR_DOMAIN_DEF_FORMAT_MIGRATABLE)
VIR_ENUM_IMPL(virDomainTaint, VIR_DOMAIN_TAINT_LAST, VIR_ENUM_IMPL(virDomainTaint,
VIR_DOMAIN_TAINT_LAST,
"custom-argv", "custom-argv",
"custom-monitor", "custom-monitor",
"high-privileges", "high-privileges",
@ -103,7 +104,8 @@ VIR_ENUM_IMPL(virDomainTaint, VIR_DOMAIN_TAINT_LAST,
"custom-ga-command", "custom-ga-command",
); );
VIR_ENUM_IMPL(virDomainVirt, VIR_DOMAIN_VIRT_LAST, VIR_ENUM_IMPL(virDomainVirt,
VIR_DOMAIN_VIRT_LAST,
"none", "none",
"qemu", "qemu",
"kqemu", "kqemu",
@ -122,7 +124,8 @@ VIR_ENUM_IMPL(virDomainVirt, VIR_DOMAIN_VIRT_LAST,
"vz", "vz",
); );
VIR_ENUM_IMPL(virDomainOS, VIR_DOMAIN_OSTYPE_LAST, VIR_ENUM_IMPL(virDomainOS,
VIR_DOMAIN_OSTYPE_LAST,
"hvm", "hvm",
"xen", "xen",
"linux", "linux",
@ -131,14 +134,16 @@ VIR_ENUM_IMPL(virDomainOS, VIR_DOMAIN_OSTYPE_LAST,
"xenpvh", "xenpvh",
); );
VIR_ENUM_IMPL(virDomainBoot, VIR_DOMAIN_BOOT_LAST, VIR_ENUM_IMPL(virDomainBoot,
VIR_DOMAIN_BOOT_LAST,
"fd", "fd",
"cdrom", "cdrom",
"hd", "hd",
"network", "network",
); );
VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST, VIR_ENUM_IMPL(virDomainFeature,
VIR_DOMAIN_FEATURE_LAST,
"acpi", "acpi",
"apic", "apic",
"pae", "pae",
@ -161,13 +166,15 @@ VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST,
"msrs", "msrs",
); );
VIR_ENUM_IMPL(virDomainCapabilitiesPolicy, VIR_DOMAIN_CAPABILITIES_POLICY_LAST, VIR_ENUM_IMPL(virDomainCapabilitiesPolicy,
VIR_DOMAIN_CAPABILITIES_POLICY_LAST,
"default", "default",
"allow", "allow",
"deny", "deny",
); );
VIR_ENUM_IMPL(virDomainHyperv, VIR_DOMAIN_HYPERV_LAST, VIR_ENUM_IMPL(virDomainHyperv,
VIR_DOMAIN_HYPERV_LAST,
"relaxed", "relaxed",
"vapic", "vapic",
"spinlocks", "spinlocks",
@ -184,16 +191,19 @@ VIR_ENUM_IMPL(virDomainHyperv, VIR_DOMAIN_HYPERV_LAST,
"evmcs", "evmcs",
); );
VIR_ENUM_IMPL(virDomainKVM, VIR_DOMAIN_KVM_LAST, VIR_ENUM_IMPL(virDomainKVM,
VIR_DOMAIN_KVM_LAST,
"hidden", "hidden",
); );
VIR_ENUM_IMPL(virDomainMsrsUnknown, VIR_DOMAIN_MSRS_UNKNOWN_LAST, VIR_ENUM_IMPL(virDomainMsrsUnknown,
VIR_DOMAIN_MSRS_UNKNOWN_LAST,
"ignore", "ignore",
"fault", "fault",
); );
VIR_ENUM_IMPL(virDomainCapsFeature, VIR_DOMAIN_CAPS_FEATURE_LAST, VIR_ENUM_IMPL(virDomainCapsFeature,
VIR_DOMAIN_CAPS_FEATURE_LAST,
"audit_control", "audit_control",
"audit_write", "audit_write",
"block_suspend", "block_suspend",
@ -233,13 +243,15 @@ VIR_ENUM_IMPL(virDomainCapsFeature, VIR_DOMAIN_CAPS_FEATURE_LAST,
"wake_alarm", "wake_alarm",
); );
VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_LAST, VIR_ENUM_IMPL(virDomainLifecycle,
VIR_DOMAIN_LIFECYCLE_LAST,
"poweroff", "poweroff",
"reboot", "reboot",
"crash", "crash",
); );
VIR_ENUM_IMPL(virDomainLifecycleAction, VIR_DOMAIN_LIFECYCLE_ACTION_LAST, VIR_ENUM_IMPL(virDomainLifecycleAction,
VIR_DOMAIN_LIFECYCLE_ACTION_LAST,
"destroy", "destroy",
"restart", "restart",
"rename-restart", "rename-restart",
@ -248,7 +260,8 @@ VIR_ENUM_IMPL(virDomainLifecycleAction, VIR_DOMAIN_LIFECYCLE_ACTION_LAST,
"coredump-restart", "coredump-restart",
); );
VIR_ENUM_IMPL(virDomainLockFailure, VIR_DOMAIN_LOCK_FAILURE_LAST, VIR_ENUM_IMPL(virDomainLockFailure,
VIR_DOMAIN_LOCK_FAILURE_LAST,
"default", "default",
"poweroff", "poweroff",
"restart", "restart",
@ -256,7 +269,8 @@ VIR_ENUM_IMPL(virDomainLockFailure, VIR_DOMAIN_LOCK_FAILURE_LAST,
"ignore", "ignore",
); );
VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST, VIR_ENUM_IMPL(virDomainDevice,
VIR_DOMAIN_DEVICE_LAST,
"none", "none",
"disk", "disk",
"lease", "lease",
@ -284,21 +298,24 @@ VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST,
"vsock", "vsock",
); );
VIR_ENUM_IMPL(virDomainDiskDevice, VIR_DOMAIN_DISK_DEVICE_LAST, VIR_ENUM_IMPL(virDomainDiskDevice,
VIR_DOMAIN_DISK_DEVICE_LAST,
"disk", "disk",
"cdrom", "cdrom",
"floppy", "floppy",
"lun", "lun",
); );
VIR_ENUM_IMPL(virDomainDiskGeometryTrans, VIR_DOMAIN_DISK_TRANS_LAST, VIR_ENUM_IMPL(virDomainDiskGeometryTrans,
VIR_DOMAIN_DISK_TRANS_LAST,
"default", "default",
"none", "none",
"auto", "auto",
"lba", "lba",
); );
VIR_ENUM_IMPL(virDomainDiskBus, VIR_DOMAIN_DISK_BUS_LAST, VIR_ENUM_IMPL(virDomainDiskBus,
VIR_DOMAIN_DISK_BUS_LAST,
"ide", "ide",
"fdc", "fdc",
"scsi", "scsi",
@ -310,7 +327,8 @@ VIR_ENUM_IMPL(virDomainDiskBus, VIR_DOMAIN_DISK_BUS_LAST,
"sd", "sd",
); );
VIR_ENUM_IMPL(virDomainDiskCache, VIR_DOMAIN_DISK_CACHE_LAST, VIR_ENUM_IMPL(virDomainDiskCache,
VIR_DOMAIN_DISK_CACHE_LAST,
"default", "default",
"none", "none",
"writethrough", "writethrough",
@ -319,7 +337,8 @@ VIR_ENUM_IMPL(virDomainDiskCache, VIR_DOMAIN_DISK_CACHE_LAST,
"unsafe", "unsafe",
); );
VIR_ENUM_IMPL(virDomainDiskErrorPolicy, VIR_DOMAIN_DISK_ERROR_POLICY_LAST, VIR_ENUM_IMPL(virDomainDiskErrorPolicy,
VIR_DOMAIN_DISK_ERROR_POLICY_LAST,
"default", "default",
"stop", "stop",
"report", "report",
@ -327,19 +346,22 @@ VIR_ENUM_IMPL(virDomainDiskErrorPolicy, VIR_DOMAIN_DISK_ERROR_POLICY_LAST,
"enospace", "enospace",
); );
VIR_ENUM_IMPL(virDomainDiskIo, VIR_DOMAIN_DISK_IO_LAST, VIR_ENUM_IMPL(virDomainDiskIo,
VIR_DOMAIN_DISK_IO_LAST,
"default", "default",
"native", "native",
"threads", "threads",
); );
VIR_ENUM_IMPL(virDomainDeviceSGIO, VIR_DOMAIN_DEVICE_SGIO_LAST, VIR_ENUM_IMPL(virDomainDeviceSGIO,
VIR_DOMAIN_DEVICE_SGIO_LAST,
"default", "default",
"filtered", "filtered",
"unfiltered", "unfiltered",
); );
VIR_ENUM_IMPL(virDomainController, VIR_DOMAIN_CONTROLLER_TYPE_LAST, VIR_ENUM_IMPL(virDomainController,
VIR_DOMAIN_CONTROLLER_TYPE_LAST,
"ide", "ide",
"fdc", "fdc",
"scsi", "scsi",
@ -351,7 +373,8 @@ VIR_ENUM_IMPL(virDomainController, VIR_DOMAIN_CONTROLLER_TYPE_LAST,
"xenbus", "xenbus",
); );
VIR_ENUM_IMPL(virDomainControllerModelPCI, VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST, VIR_ENUM_IMPL(virDomainControllerModelPCI,
VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST,
"pci-root", "pci-root",
"pcie-root", "pcie-root",
"pci-bridge", "pci-bridge",
@ -379,7 +402,8 @@ VIR_ENUM_IMPL(virDomainControllerPCIModelName,
"pcie-pci-bridge", "pcie-pci-bridge",
); );
VIR_ENUM_IMPL(virDomainControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST, VIR_ENUM_IMPL(virDomainControllerModelSCSI,
VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST,
"auto", "auto",
"buslogic", "buslogic",
"lsilogic", "lsilogic",
@ -392,7 +416,8 @@ VIR_ENUM_IMPL(virDomainControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAS
"virtio-non-transitional", "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", "piix3-uhci",
"piix4-uhci", "piix4-uhci",
"ehci", "ehci",
@ -409,7 +434,8 @@ VIR_ENUM_IMPL(virDomainControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST,
"none", "none",
); );
VIR_ENUM_IMPL(virDomainControllerModelIDE, VIR_DOMAIN_CONTROLLER_MODEL_IDE_LAST, VIR_ENUM_IMPL(virDomainControllerModelIDE,
VIR_DOMAIN_CONTROLLER_MODEL_IDE_LAST,
"piix3", "piix3",
"piix4", "piix4",
"ich6", "ich6",
@ -422,7 +448,8 @@ VIR_ENUM_IMPL(virDomainControllerModelVirtioSerial,
"virtio-non-transitional", "virtio-non-transitional",
); );
VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, VIR_ENUM_IMPL(virDomainFS,
VIR_DOMAIN_FS_TYPE_LAST,
"mount", "mount",
"block", "block",
"file", "file",
@ -432,7 +459,8 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST,
"volume", "volume",
); );
VIR_ENUM_IMPL(virDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, VIR_ENUM_IMPL(virDomainFSDriver,
VIR_DOMAIN_FS_DRIVER_TYPE_LAST,
"default", "default",
"path", "path",
"handle", "handle",
@ -441,25 +469,29 @@ VIR_ENUM_IMPL(virDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST,
"ploop", "ploop",
); );
VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST, VIR_ENUM_IMPL(virDomainFSAccessMode,
VIR_DOMAIN_FS_ACCESSMODE_LAST,
"passthrough", "passthrough",
"mapped", "mapped",
"squash", "squash",
); );
VIR_ENUM_IMPL(virDomainFSWrpolicy, VIR_DOMAIN_FS_WRPOLICY_LAST, VIR_ENUM_IMPL(virDomainFSWrpolicy,
VIR_DOMAIN_FS_WRPOLICY_LAST,
"default", "default",
"immediate", "immediate",
); );
VIR_ENUM_IMPL(virDomainFSModel, VIR_DOMAIN_FS_MODEL_LAST, VIR_ENUM_IMPL(virDomainFSModel,
VIR_DOMAIN_FS_MODEL_LAST,
"default", "default",
"virtio", "virtio",
"virtio-transitional", "virtio-transitional",
"virtio-non-transitional", "virtio-non-transitional",
); );
VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, VIR_ENUM_IMPL(virDomainNet,
VIR_DOMAIN_NET_TYPE_LAST,
"user", "user",
"ethernet", "ethernet",
"vhostuser", "vhostuser",
@ -474,25 +506,29 @@ VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST,
"udp", "udp",
); );
VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST, VIR_ENUM_IMPL(virDomainNetBackend,
VIR_DOMAIN_NET_BACKEND_TYPE_LAST,
"default", "default",
"qemu", "qemu",
"vhost", "vhost",
); );
VIR_ENUM_IMPL(virDomainNetVirtioTxMode, VIR_DOMAIN_NET_VIRTIO_TX_MODE_LAST, VIR_ENUM_IMPL(virDomainNetVirtioTxMode,
VIR_DOMAIN_NET_VIRTIO_TX_MODE_LAST,
"default", "default",
"iothread", "iothread",
"timer", "timer",
); );
VIR_ENUM_IMPL(virDomainNetInterfaceLinkState, VIR_DOMAIN_NET_INTERFACE_LINK_STATE_LAST, VIR_ENUM_IMPL(virDomainNetInterfaceLinkState,
VIR_DOMAIN_NET_INTERFACE_LINK_STATE_LAST,
"default", "default",
"up", "up",
"down", "down",
); );
VIR_ENUM_IMPL(virDomainChrDeviceState, VIR_DOMAIN_CHR_DEVICE_STATE_LAST, VIR_ENUM_IMPL(virDomainChrDeviceState,
VIR_DOMAIN_CHR_DEVICE_STATE_LAST,
"default", "default",
"connected", "connected",
"disconnected", "disconnected",
@ -543,14 +579,16 @@ VIR_ENUM_IMPL(virDomainChrSerialTargetModel,
"16550a", "16550a",
); );
VIR_ENUM_IMPL(virDomainChrDevice, VIR_DOMAIN_CHR_DEVICE_TYPE_LAST, VIR_ENUM_IMPL(virDomainChrDevice,
VIR_DOMAIN_CHR_DEVICE_TYPE_LAST,
"parallel", "parallel",
"serial", "serial",
"console", "console",
"channel", "channel",
); );
VIR_ENUM_IMPL(virDomainChr, VIR_DOMAIN_CHR_TYPE_LAST, VIR_ENUM_IMPL(virDomainChr,
VIR_DOMAIN_CHR_TYPE_LAST,
"null", "null",
"vc", "vc",
"pty", "pty",
@ -566,32 +604,37 @@ VIR_ENUM_IMPL(virDomainChr, VIR_DOMAIN_CHR_TYPE_LAST,
"nmdm", "nmdm",
); );
VIR_ENUM_IMPL(virDomainChrTcpProtocol, VIR_DOMAIN_CHR_TCP_PROTOCOL_LAST, VIR_ENUM_IMPL(virDomainChrTcpProtocol,
VIR_DOMAIN_CHR_TCP_PROTOCOL_LAST,
"raw", "raw",
"telnet", "telnet",
"telnets", "telnets",
"tls", "tls",
); );
VIR_ENUM_IMPL(virDomainChrSpicevmc, VIR_DOMAIN_CHR_SPICEVMC_LAST, VIR_ENUM_IMPL(virDomainChrSpicevmc,
VIR_DOMAIN_CHR_SPICEVMC_LAST,
"vdagent", "vdagent",
"smartcard", "smartcard",
"usbredir", "usbredir",
); );
VIR_ENUM_IMPL(virDomainSmartcard, VIR_DOMAIN_SMARTCARD_TYPE_LAST, VIR_ENUM_IMPL(virDomainSmartcard,
VIR_DOMAIN_SMARTCARD_TYPE_LAST,
"host", "host",
"host-certificates", "host-certificates",
"passthrough", "passthrough",
); );
VIR_ENUM_IMPL(virDomainSoundCodec, VIR_DOMAIN_SOUND_CODEC_TYPE_LAST, VIR_ENUM_IMPL(virDomainSoundCodec,
VIR_DOMAIN_SOUND_CODEC_TYPE_LAST,
"duplex", "duplex",
"micro", "micro",
"output", "output",
); );
VIR_ENUM_IMPL(virDomainSoundModel, VIR_DOMAIN_SOUND_MODEL_LAST, VIR_ENUM_IMPL(virDomainSoundModel,
VIR_DOMAIN_SOUND_MODEL_LAST,
"sb16", "sb16",
"es1370", "es1370",
"pcspk", "pcspk",
@ -607,7 +650,8 @@ VIR_ENUM_IMPL(virDomainKeyWrapCipherName,
"dea", "dea",
); );
VIR_ENUM_IMPL(virDomainMemballoonModel, VIR_DOMAIN_MEMBALLOON_MODEL_LAST, VIR_ENUM_IMPL(virDomainMemballoonModel,
VIR_DOMAIN_MEMBALLOON_MODEL_LAST,
"virtio", "virtio",
"xen", "xen",
"none", "none",
@ -615,20 +659,23 @@ VIR_ENUM_IMPL(virDomainMemballoonModel, VIR_DOMAIN_MEMBALLOON_MODEL_LAST,
"virtio-non-transitional", "virtio-non-transitional",
); );
VIR_ENUM_IMPL(virDomainSmbiosMode, VIR_DOMAIN_SMBIOS_LAST, VIR_ENUM_IMPL(virDomainSmbiosMode,
VIR_DOMAIN_SMBIOS_LAST,
"none", "none",
"emulate", "emulate",
"host", "host",
"sysinfo", "sysinfo",
); );
VIR_ENUM_IMPL(virDomainWatchdogModel, VIR_DOMAIN_WATCHDOG_MODEL_LAST, VIR_ENUM_IMPL(virDomainWatchdogModel,
VIR_DOMAIN_WATCHDOG_MODEL_LAST,
"i6300esb", "i6300esb",
"ib700", "ib700",
"diag288", "diag288",
); );
VIR_ENUM_IMPL(virDomainWatchdogAction, VIR_DOMAIN_WATCHDOG_ACTION_LAST, VIR_ENUM_IMPL(virDomainWatchdogAction,
VIR_DOMAIN_WATCHDOG_ACTION_LAST,
"reset", "reset",
"shutdown", "shutdown",
"poweroff", "poweroff",
@ -638,7 +685,8 @@ VIR_ENUM_IMPL(virDomainWatchdogAction, VIR_DOMAIN_WATCHDOG_ACTION_LAST,
"inject-nmi", "inject-nmi",
); );
VIR_ENUM_IMPL(virDomainPanicModel, VIR_DOMAIN_PANIC_MODEL_LAST, VIR_ENUM_IMPL(virDomainPanicModel,
VIR_DOMAIN_PANIC_MODEL_LAST,
"default", "default",
"isa", "isa",
"pseries", "pseries",
@ -646,7 +694,8 @@ VIR_ENUM_IMPL(virDomainPanicModel, VIR_DOMAIN_PANIC_MODEL_LAST,
"s390", "s390",
); );
VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, VIR_ENUM_IMPL(virDomainVideo,
VIR_DOMAIN_VIDEO_TYPE_LAST,
"default", "default",
"vga", "vga",
"cirrus", "cirrus",
@ -660,20 +709,23 @@ VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
"none", "none",
); );
VIR_ENUM_IMPL(virDomainVideoVGAConf, VIR_DOMAIN_VIDEO_VGACONF_LAST, VIR_ENUM_IMPL(virDomainVideoVGAConf,
VIR_DOMAIN_VIDEO_VGACONF_LAST,
"io", "io",
"on", "on",
"off", "off",
); );
VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST, VIR_ENUM_IMPL(virDomainInput,
VIR_DOMAIN_INPUT_TYPE_LAST,
"mouse", "mouse",
"tablet", "tablet",
"keyboard", "keyboard",
"passthrough", "passthrough",
); );
VIR_ENUM_IMPL(virDomainInputBus, VIR_DOMAIN_INPUT_BUS_LAST, VIR_ENUM_IMPL(virDomainInputBus,
VIR_DOMAIN_INPUT_BUS_LAST,
"ps2", "ps2",
"usb", "usb",
"xen", "xen",
@ -681,14 +733,16 @@ VIR_ENUM_IMPL(virDomainInputBus, VIR_DOMAIN_INPUT_BUS_LAST,
"virtio", "virtio",
); );
VIR_ENUM_IMPL(virDomainInputModel, VIR_DOMAIN_INPUT_MODEL_LAST, VIR_ENUM_IMPL(virDomainInputModel,
VIR_DOMAIN_INPUT_MODEL_LAST,
"default", "default",
"virtio", "virtio",
"virtio-transitional", "virtio-transitional",
"virtio-non-transitional", "virtio-non-transitional",
); );
VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST, VIR_ENUM_IMPL(virDomainGraphics,
VIR_DOMAIN_GRAPHICS_TYPE_LAST,
"sdl", "sdl",
"vnc", "vnc",
"rdp", "rdp",
@ -697,7 +751,8 @@ VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST,
"egl-headless", "egl-headless",
); );
VIR_ENUM_IMPL(virDomainGraphicsListen, VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST, VIR_ENUM_IMPL(virDomainGraphicsListen,
VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST,
"none", "none",
"address", "address",
"network", "network",
@ -781,12 +836,14 @@ VIR_ENUM_IMPL(virDomainGraphicsSpiceStreamingMode,
"off", "off",
); );
VIR_ENUM_IMPL(virDomainHostdevMode, VIR_DOMAIN_HOSTDEV_MODE_LAST, VIR_ENUM_IMPL(virDomainHostdevMode,
VIR_DOMAIN_HOSTDEV_MODE_LAST,
"subsystem", "subsystem",
"capabilities", "capabilities",
); );
VIR_ENUM_IMPL(virDomainHostdevSubsys, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST, VIR_ENUM_IMPL(virDomainHostdevSubsys,
VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST,
"usb", "usb",
"pci", "pci",
"scsi", "scsi",
@ -822,21 +879,25 @@ VIR_ENUM_IMPL(virDomainHostdevSubsysSCSIVHostModel,
"virtio-non-transitional", "virtio-non-transitional",
); );
VIR_ENUM_IMPL(virDomainHostdevCaps, VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST, VIR_ENUM_IMPL(virDomainHostdevCaps,
VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST,
"storage", "storage",
"misc", "misc",
"net", "net",
); );
VIR_ENUM_IMPL(virDomainHub, VIR_DOMAIN_HUB_TYPE_LAST, VIR_ENUM_IMPL(virDomainHub,
VIR_DOMAIN_HUB_TYPE_LAST,
"usb", "usb",
); );
VIR_ENUM_IMPL(virDomainRedirdevBus, VIR_DOMAIN_REDIRDEV_BUS_LAST, VIR_ENUM_IMPL(virDomainRedirdevBus,
VIR_DOMAIN_REDIRDEV_BUS_LAST,
"usb", "usb",
); );
VIR_ENUM_IMPL(virDomainState, VIR_DOMAIN_LAST, VIR_ENUM_IMPL(virDomainState,
VIR_DOMAIN_LAST,
"nostate", "nostate",
"running", "running",
"blocked", "blocked",
@ -847,11 +908,13 @@ VIR_ENUM_IMPL(virDomainState, VIR_DOMAIN_LAST,
"pmsuspended", "pmsuspended",
); );
VIR_ENUM_IMPL(virDomainNostateReason, VIR_DOMAIN_NOSTATE_LAST, VIR_ENUM_IMPL(virDomainNostateReason,
VIR_DOMAIN_NOSTATE_LAST,
"unknown", "unknown",
); );
VIR_ENUM_IMPL(virDomainRunningReason, VIR_DOMAIN_RUNNING_LAST, VIR_ENUM_IMPL(virDomainRunningReason,
VIR_DOMAIN_RUNNING_LAST,
"unknown", "unknown",
"booted", "booted",
"migrated", "migrated",
@ -865,11 +928,13 @@ VIR_ENUM_IMPL(virDomainRunningReason, VIR_DOMAIN_RUNNING_LAST,
"post-copy", "post-copy",
); );
VIR_ENUM_IMPL(virDomainBlockedReason, VIR_DOMAIN_BLOCKED_LAST, VIR_ENUM_IMPL(virDomainBlockedReason,
VIR_DOMAIN_BLOCKED_LAST,
"unknown", "unknown",
); );
VIR_ENUM_IMPL(virDomainPausedReason, VIR_DOMAIN_PAUSED_LAST, VIR_ENUM_IMPL(virDomainPausedReason,
VIR_DOMAIN_PAUSED_LAST,
"unknown", "unknown",
"user", "user",
"migration", "migration",
@ -886,12 +951,14 @@ VIR_ENUM_IMPL(virDomainPausedReason, VIR_DOMAIN_PAUSED_LAST,
"post-copy failed", "post-copy failed",
); );
VIR_ENUM_IMPL(virDomainShutdownReason, VIR_DOMAIN_SHUTDOWN_LAST, VIR_ENUM_IMPL(virDomainShutdownReason,
VIR_DOMAIN_SHUTDOWN_LAST,
"unknown", "unknown",
"user", "user",
); );
VIR_ENUM_IMPL(virDomainShutoffReason, VIR_DOMAIN_SHUTOFF_LAST, VIR_ENUM_IMPL(virDomainShutoffReason,
VIR_DOMAIN_SHUTOFF_LAST,
"unknown", "unknown",
"shutdown", "shutdown",
"destroyed", "destroyed",
@ -903,35 +970,41 @@ VIR_ENUM_IMPL(virDomainShutoffReason, VIR_DOMAIN_SHUTOFF_LAST,
"daemon", "daemon",
); );
VIR_ENUM_IMPL(virDomainCrashedReason, VIR_DOMAIN_CRASHED_LAST, VIR_ENUM_IMPL(virDomainCrashedReason,
VIR_DOMAIN_CRASHED_LAST,
"unknown", "unknown",
"panicked", "panicked",
); );
VIR_ENUM_IMPL(virDomainPMSuspendedReason, VIR_DOMAIN_PMSUSPENDED_LAST, VIR_ENUM_IMPL(virDomainPMSuspendedReason,
VIR_DOMAIN_PMSUSPENDED_LAST,
"unknown", "unknown",
); );
VIR_ENUM_IMPL(virDomainSeclabel, VIR_DOMAIN_SECLABEL_LAST, VIR_ENUM_IMPL(virDomainSeclabel,
VIR_DOMAIN_SECLABEL_LAST,
"default", "default",
"none", "none",
"dynamic", "dynamic",
"static", "static",
); );
VIR_ENUM_IMPL(virDomainClockOffset, VIR_DOMAIN_CLOCK_OFFSET_LAST, VIR_ENUM_IMPL(virDomainClockOffset,
VIR_DOMAIN_CLOCK_OFFSET_LAST,
"utc", "utc",
"localtime", "localtime",
"variable", "variable",
"timezone", "timezone",
); );
VIR_ENUM_IMPL(virDomainClockBasis, VIR_DOMAIN_CLOCK_BASIS_LAST, VIR_ENUM_IMPL(virDomainClockBasis,
VIR_DOMAIN_CLOCK_BASIS_LAST,
"utc", "utc",
"localtime", "localtime",
); );
VIR_ENUM_IMPL(virDomainTimerName, VIR_DOMAIN_TIMER_NAME_LAST, VIR_ENUM_IMPL(virDomainTimerName,
VIR_DOMAIN_TIMER_NAME_LAST,
"platform", "platform",
"pit", "pit",
"rtc", "rtc",
@ -941,20 +1014,23 @@ VIR_ENUM_IMPL(virDomainTimerName, VIR_DOMAIN_TIMER_NAME_LAST,
"hypervclock", "hypervclock",
); );
VIR_ENUM_IMPL(virDomainTimerTrack, VIR_DOMAIN_TIMER_TRACK_LAST, VIR_ENUM_IMPL(virDomainTimerTrack,
VIR_DOMAIN_TIMER_TRACK_LAST,
"boot", "boot",
"guest", "guest",
"wall", "wall",
); );
VIR_ENUM_IMPL(virDomainTimerTickpolicy, VIR_DOMAIN_TIMER_TICKPOLICY_LAST, VIR_ENUM_IMPL(virDomainTimerTickpolicy,
VIR_DOMAIN_TIMER_TICKPOLICY_LAST,
"delay", "delay",
"catchup", "catchup",
"merge", "merge",
"discard", "discard",
); );
VIR_ENUM_IMPL(virDomainTimerMode, VIR_DOMAIN_TIMER_MODE_LAST, VIR_ENUM_IMPL(virDomainTimerMode,
VIR_DOMAIN_TIMER_MODE_LAST,
"auto", "auto",
"native", "native",
"emulate", "emulate",
@ -962,19 +1038,22 @@ VIR_ENUM_IMPL(virDomainTimerMode, VIR_DOMAIN_TIMER_MODE_LAST,
"smpsafe", "smpsafe",
); );
VIR_ENUM_IMPL(virDomainStartupPolicy, VIR_DOMAIN_STARTUP_POLICY_LAST, VIR_ENUM_IMPL(virDomainStartupPolicy,
VIR_DOMAIN_STARTUP_POLICY_LAST,
"default", "default",
"mandatory", "mandatory",
"requisite", "requisite",
"optional", "optional",
); );
VIR_ENUM_IMPL(virDomainCpuPlacementMode, VIR_DOMAIN_CPU_PLACEMENT_MODE_LAST, VIR_ENUM_IMPL(virDomainCpuPlacementMode,
VIR_DOMAIN_CPU_PLACEMENT_MODE_LAST,
"static", "static",
"auto", "auto",
); );
VIR_ENUM_IMPL(virDomainDiskTray, VIR_DOMAIN_DISK_TRAY_LAST, VIR_ENUM_IMPL(virDomainDiskTray,
VIR_DOMAIN_DISK_TRAY_LAST,
"closed", "closed",
"open", "open",
); );
@ -992,68 +1071,79 @@ VIR_ENUM_IMPL(virDomainRNGBackend,
"egd", "egd",
); );
VIR_ENUM_IMPL(virDomainTPMModel, VIR_DOMAIN_TPM_MODEL_LAST, VIR_ENUM_IMPL(virDomainTPMModel,
VIR_DOMAIN_TPM_MODEL_LAST,
"tpm-tis", "tpm-tis",
"tpm-crb", "tpm-crb",
); );
VIR_ENUM_IMPL(virDomainTPMBackend, VIR_DOMAIN_TPM_TYPE_LAST, VIR_ENUM_IMPL(virDomainTPMBackend,
VIR_DOMAIN_TPM_TYPE_LAST,
"passthrough", "passthrough",
"emulator", "emulator",
); );
VIR_ENUM_IMPL(virDomainTPMVersion, VIR_DOMAIN_TPM_VERSION_LAST, VIR_ENUM_IMPL(virDomainTPMVersion,
VIR_DOMAIN_TPM_VERSION_LAST,
"default", "default",
"1.2", "1.2",
"2.0", "2.0",
); );
VIR_ENUM_IMPL(virDomainIOMMUModel, VIR_DOMAIN_IOMMU_MODEL_LAST, VIR_ENUM_IMPL(virDomainIOMMUModel,
VIR_DOMAIN_IOMMU_MODEL_LAST,
"intel", "intel",
); );
VIR_ENUM_IMPL(virDomainVsockModel, VIR_DOMAIN_VSOCK_MODEL_LAST, VIR_ENUM_IMPL(virDomainVsockModel,
VIR_DOMAIN_VSOCK_MODEL_LAST,
"default", "default",
"virtio", "virtio",
"virtio-transitional", "virtio-transitional",
"virtio-non-transitional", "virtio-non-transitional",
); );
VIR_ENUM_IMPL(virDomainDiskDiscard, VIR_DOMAIN_DISK_DISCARD_LAST, VIR_ENUM_IMPL(virDomainDiskDiscard,
VIR_DOMAIN_DISK_DISCARD_LAST,
"default", "default",
"unmap", "unmap",
"ignore", "ignore",
); );
VIR_ENUM_IMPL(virDomainDiskDetectZeroes, VIR_DOMAIN_DISK_DETECT_ZEROES_LAST, VIR_ENUM_IMPL(virDomainDiskDetectZeroes,
VIR_DOMAIN_DISK_DETECT_ZEROES_LAST,
"default", "default",
"off", "off",
"on", "on",
"unmap", "unmap",
); );
VIR_ENUM_IMPL(virDomainDiskModel, VIR_DOMAIN_DISK_MODEL_LAST, VIR_ENUM_IMPL(virDomainDiskModel,
VIR_DOMAIN_DISK_MODEL_LAST,
"default", "default",
"virtio", "virtio",
"virtio-transitional", "virtio-transitional",
"virtio-non-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", "none",
"yes", "yes",
"abort", "abort",
"pivot", "pivot",
); );
VIR_ENUM_IMPL(virDomainMemorySource, VIR_DOMAIN_MEMORY_SOURCE_LAST, VIR_ENUM_IMPL(virDomainMemorySource,
VIR_DOMAIN_MEMORY_SOURCE_LAST,
"none", "none",
"file", "file",
"anonymous", "anonymous",
"memfd", "memfd",
); );
VIR_ENUM_IMPL(virDomainMemoryAllocation, VIR_DOMAIN_MEMORY_ALLOCATION_LAST, VIR_ENUM_IMPL(virDomainMemoryAllocation,
VIR_DOMAIN_MEMORY_ALLOCATION_LAST,
"none", "none",
"immediate", "immediate",
"ondemand", "ondemand",
@ -1091,7 +1181,8 @@ VIR_ENUM_IMPL(virDomainOsDefFirmware,
/* Internal mapping: subset of block job types that can be present in /* Internal mapping: subset of block job types that can be present in
* <mirror> XML (remaining types are not two-phase). */ * <mirror> XML (remaining types are not two-phase). */
VIR_ENUM_DECL(virDomainBlockJob); VIR_ENUM_DECL(virDomainBlockJob);
VIR_ENUM_IMPL(virDomainBlockJob, VIR_DOMAIN_BLOCK_JOB_TYPE_LAST, VIR_ENUM_IMPL(virDomainBlockJob,
VIR_DOMAIN_BLOCK_JOB_TYPE_LAST,
"", "", "copy", "", "active-commit", "", "", "copy", "", "active-commit",
); );
@ -1102,13 +1193,15 @@ VIR_ENUM_IMPL(virDomainMemoryModel,
"nvdimm", "nvdimm",
); );
VIR_ENUM_IMPL(virDomainShmemModel, VIR_DOMAIN_SHMEM_MODEL_LAST, VIR_ENUM_IMPL(virDomainShmemModel,
VIR_DOMAIN_SHMEM_MODEL_LAST,
"ivshmem", "ivshmem",
"ivshmem-plain", "ivshmem-plain",
"ivshmem-doorbell", "ivshmem-doorbell",
); );
VIR_ENUM_IMPL(virDomainLaunchSecurity, VIR_DOMAIN_LAUNCH_SECURITY_LAST, VIR_ENUM_IMPL(virDomainLaunchSecurity,
VIR_DOMAIN_LAUNCH_SECURITY_LAST,
"", "",
"sev", "sev",
); );

3
src/conf/netdev_vlan_conf.c
View File

@ -24,7 +24,8 @@
#define VIR_FROM_THIS VIR_FROM_NONE #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", "default", "tagged", "untagged",
); );

3
src/conf/network_conf.c
View File

@ -68,7 +68,8 @@ VIR_ENUM_IMPL(virNetworkForwardDriverName,
"vfio", "vfio",
); );
VIR_ENUM_IMPL(virNetworkTaint, VIR_NETWORK_TAINT_LAST, VIR_ENUM_IMPL(virNetworkTaint,
VIR_NETWORK_TAINT_LAST,
"hook-script", "hook-script",
); );

12
src/conf/node_device_conf.c
View File

@ -42,12 +42,14 @@
VIR_LOG_INIT("conf.node_device_conf"); 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", "dev",
"link", "link",
); );
VIR_ENUM_IMPL(virNodeDevCap, VIR_NODE_DEV_CAP_LAST, VIR_ENUM_IMPL(virNodeDevCap,
VIR_NODE_DEV_CAP_LAST,
"system", "system",
"pci", "pci",
"usb_device", "usb_device",
@ -66,12 +68,14 @@ VIR_ENUM_IMPL(virNodeDevCap, VIR_NODE_DEV_CAP_LAST,
"ccw", "ccw",
); );
VIR_ENUM_IMPL(virNodeDevNetCap, VIR_NODE_DEV_CAP_NET_LAST, VIR_ENUM_IMPL(virNodeDevNetCap,
VIR_NODE_DEV_CAP_NET_LAST,
"80203", "80203",
"80211", "80211",
); );
VIR_ENUM_IMPL(virNodeDevDRM, VIR_NODE_DEV_DRM_LAST, VIR_ENUM_IMPL(virNodeDevDRM,
VIR_NODE_DEV_DRM_LAST,
"primary", "primary",
"control", "control",
"render", "render",

3
src/conf/numa_conf.c
View File

@ -52,7 +52,8 @@ VIR_ENUM_IMPL(virDomainNumatunePlacement,
"auto", "auto",
); );
VIR_ENUM_IMPL(virDomainMemoryAccess, VIR_DOMAIN_MEMORY_ACCESS_LAST, VIR_ENUM_IMPL(virDomainMemoryAccess,
VIR_DOMAIN_MEMORY_ACCESS_LAST,
"default", "default",
"shared", "shared",
"private", "private",

21
src/conf/nwfilter_conf.c
View File

@ -49,7 +49,8 @@
#define VIR_FROM_THIS VIR_FROM_NWFILTER #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", "drop",
"accept", "accept",
"reject", "reject",
@ -57,7 +58,8 @@ VIR_ENUM_IMPL(virNWFilterRuleAction, VIR_NWFILTER_RULE_ACTION_LAST,
"continue", "continue",
); );
VIR_ENUM_IMPL(virNWFilterJumpTarget, VIR_NWFILTER_RULE_ACTION_LAST, VIR_ENUM_IMPL(virNWFilterJumpTarget,
VIR_NWFILTER_RULE_ACTION_LAST,
"DROP", "DROP",
"ACCEPT", "ACCEPT",
"REJECT", "REJECT",
@ -65,24 +67,28 @@ VIR_ENUM_IMPL(virNWFilterJumpTarget, VIR_NWFILTER_RULE_ACTION_LAST,
"CONTINUE", "CONTINUE",
); );
VIR_ENUM_IMPL(virNWFilterRuleDirection, VIR_NWFILTER_RULE_DIRECTION_LAST, VIR_ENUM_IMPL(virNWFilterRuleDirection,
VIR_NWFILTER_RULE_DIRECTION_LAST,
"in", "in",
"out", "out",
"inout", "inout",
); );
VIR_ENUM_IMPL(virNWFilterChainPolicy, VIR_NWFILTER_CHAIN_POLICY_LAST, VIR_ENUM_IMPL(virNWFilterChainPolicy,
VIR_NWFILTER_CHAIN_POLICY_LAST,
"ACCEPT", "ACCEPT",
"DROP", "DROP",
); );
VIR_ENUM_IMPL(virNWFilterEbtablesTable, VIR_NWFILTER_EBTABLES_TABLE_LAST, VIR_ENUM_IMPL(virNWFilterEbtablesTable,
VIR_NWFILTER_EBTABLES_TABLE_LAST,
"filter", "filter",
"nat", "nat",
"broute", "broute",
); );
VIR_ENUM_IMPL(virNWFilterChainSuffix, VIR_NWFILTER_CHAINSUFFIX_LAST, VIR_ENUM_IMPL(virNWFilterChainSuffix,
VIR_NWFILTER_CHAINSUFFIX_LAST,
"root", "root",
"mac", "mac",
"vlan", "vlan",
@ -93,7 +99,8 @@ VIR_ENUM_IMPL(virNWFilterChainSuffix, VIR_NWFILTER_CHAINSUFFIX_LAST,
"ipv6", "ipv6",
); );
VIR_ENUM_IMPL(virNWFilterRuleProtocol, VIR_NWFILTER_RULE_PROTOCOL_LAST, VIR_ENUM_IMPL(virNWFilterRuleProtocol,
VIR_NWFILTER_RULE_PROTOCOL_LAST,
"none", "none",
"mac", "mac",
"vlan", "vlan",

6
src/conf/snapshot_conf.c
View File

@ -51,7 +51,8 @@
VIR_LOG_INIT("conf.snapshot_conf"); 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", "default",
"no", "no",
"internal", "internal",
@ -59,7 +60,8 @@ VIR_ENUM_IMPL(virDomainSnapshotLocation, VIR_DOMAIN_SNAPSHOT_LOCATION_LAST,
); );
/* virDomainSnapshotState is really virDomainState plus one extra state */ /* 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", "nostate",
"running", "running",
"blocked", "blocked",

3
src/libxl/libxl_domain.c
View File

@ -40,7 +40,8 @@
VIR_LOG_INIT("libxl.libxl_domain"); VIR_LOG_INIT("libxl.libxl_domain");
VIR_ENUM_IMPL(libxlDomainJob, LIBXL_JOB_LAST, VIR_ENUM_IMPL(libxlDomainJob,
LIBXL_JOB_LAST,
"none", "none",
"query", "query",
"destroy", "destroy",

3
src/locking/lock_daemon.c
View File

@ -85,7 +85,8 @@ enum {
}; };
VIR_ENUM_DECL(virDaemonErr); VIR_ENUM_DECL(virDaemonErr);
VIR_ENUM_IMPL(virDaemonErr, VIR_LOCK_DAEMON_ERR_LAST, VIR_ENUM_IMPL(virDaemonErr,
VIR_LOCK_DAEMON_ERR_LAST,
"Initialization successful", "Initialization successful",
"Unable to obtain pidfile", "Unable to obtain pidfile",
"Unable to create rundir", "Unable to create rundir",

3
src/logging/log_daemon.c
View File

@ -81,7 +81,8 @@ enum {
}; };
VIR_ENUM_DECL(virDaemonErr); VIR_ENUM_DECL(virDaemonErr);
VIR_ENUM_IMPL(virDaemonErr, VIR_LOG_DAEMON_ERR_LAST, VIR_ENUM_IMPL(virDaemonErr,
VIR_LOG_DAEMON_ERR_LAST,
"Initialization successful", "Initialization successful",
"Unable to obtain pidfile", "Unable to obtain pidfile",
"Unable to create rundir", "Unable to create rundir",

3
src/lxc/lxc_domain.c
View File

@ -37,7 +37,8 @@
#define VIR_FROM_THIS VIR_FROM_LXC #define VIR_FROM_THIS VIR_FROM_LXC
#define LXC_NAMESPACE_HREF "http://libvirt.org/schemas/domain/lxc/1.0" #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", "none",
"query", "query",
"destroy", "destroy",

3
src/lxc/lxc_native.c
View File

@ -35,7 +35,8 @@
VIR_LOG_INIT("lxc.lxc_native"); 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", "name",
"type", "type",
"link", "link",

3
src/network/leaseshelper.c
View File

@ -73,7 +73,8 @@ enum virLeaseActionFlags {
VIR_ENUM_DECL(virLeaseAction); VIR_ENUM_DECL(virLeaseAction);
VIR_ENUM_IMPL(virLeaseAction, VIR_LEASE_ACTION_LAST, VIR_ENUM_IMPL(virLeaseAction,
VIR_LEASE_ACTION_LAST,
"add", "old", "del", "init", "add", "old", "del", "init",
); );

3
src/qemu/qemu_capabilities.c
View File

@ -63,7 +63,8 @@ VIR_LOG_INIT("qemu.qemu_capabilities");
* are used in domain status files which are read on * are used in domain status files which are read on
* daemon restarts * daemon restarts
*/ */
VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, VIR_ENUM_IMPL(virQEMUCaps,
QEMU_CAPS_LAST, /* virQEMUCaps grouping marker */
/* 0 */ /* 0 */
"kqemu", "kqemu",
"vnc-colon", "vnc-colon",

27
src/qemu/qemu_command.c
View File

@ -72,7 +72,8 @@
VIR_LOG_INIT("qemu.qemu_command"); VIR_LOG_INIT("qemu.qemu_command");
VIR_ENUM_DECL(virDomainDiskQEMUBus); VIR_ENUM_DECL(virDomainDiskQEMUBus);
VIR_ENUM_IMPL(virDomainDiskQEMUBus, VIR_DOMAIN_DISK_BUS_LAST, VIR_ENUM_IMPL(virDomainDiskQEMUBus,
VIR_DOMAIN_DISK_BUS_LAST,
"ide", "ide",
"floppy", "floppy",
"scsi", "scsi",
@ -87,7 +88,8 @@ VIR_ENUM_IMPL(virDomainDiskQEMUBus, VIR_DOMAIN_DISK_BUS_LAST,
VIR_ENUM_DECL(qemuDiskCacheV2); VIR_ENUM_DECL(qemuDiskCacheV2);
VIR_ENUM_IMPL(qemuDiskCacheV2, VIR_DOMAIN_DISK_CACHE_LAST, VIR_ENUM_IMPL(qemuDiskCacheV2,
VIR_DOMAIN_DISK_CACHE_LAST,
"default", "default",
"none", "none",
"writethrough", "writethrough",
@ -96,7 +98,8 @@ VIR_ENUM_IMPL(qemuDiskCacheV2, VIR_DOMAIN_DISK_CACHE_LAST,
"unsafe", "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 */ "", /* default value, we shouldn't see this */
"std", "std",
"cirrus", "cirrus",
@ -112,7 +115,8 @@ VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
VIR_ENUM_DECL(qemuDeviceVideo); 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 */ "", /* default value, we shouldn't see this */
"VGA", "VGA",
"cirrus-vga", "cirrus-vga",
@ -128,7 +132,8 @@ VIR_ENUM_IMPL(qemuDeviceVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
VIR_ENUM_DECL(qemuDeviceVideoSecondary); 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 */ "", /* default value, we shouldn't see this */
"", /* no secondary device for VGA */ "", /* no secondary device for VGA */
"", /* no secondary device for cirrus-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_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-duplex",
"hda-micro", "hda-micro",
"hda-output", "hda-output",
@ -152,7 +158,8 @@ VIR_ENUM_IMPL(qemuSoundCodec, VIR_DOMAIN_SOUND_CODEC_TYPE_LAST,
VIR_ENUM_DECL(qemuControllerModelUSB); 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", "piix3-usb-uhci",
"piix4-usb-uhci", "piix4-usb-uhci",
"usb-ehci", "usb-ehci",
@ -170,7 +177,8 @@ VIR_ENUM_IMPL(qemuControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST,
); );
VIR_ENUM_DECL(qemuDomainFSDriver); 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",
"local", "local",
"handle", "handle",
@ -180,7 +188,8 @@ VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST,
); );
VIR_ENUM_DECL(qemuNumaPolicy); VIR_ENUM_DECL(qemuNumaPolicy);
VIR_ENUM_IMPL(qemuNumaPolicy, VIR_DOMAIN_NUMATUNE_MEM_LAST, VIR_ENUM_IMPL(qemuNumaPolicy,
VIR_DOMAIN_NUMATUNE_MEM_LAST,
"bind", "bind",
"preferred", "preferred",
"interleave", "interleave",

12
src/qemu/qemu_domain.c
View File

@ -80,7 +80,8 @@ VIR_LOG_INIT("qemu.qemu_domain");
#define QEMU_NAMESPACE_HREF "http://libvirt.org/schemas/domain/qemu/1.0" #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", "none",
"query", "query",
"destroy", "destroy",
@ -92,13 +93,15 @@ VIR_ENUM_IMPL(qemuDomainJob, QEMU_JOB_LAST,
"async nested", "async nested",
); );
VIR_ENUM_IMPL(qemuDomainAgentJob, QEMU_AGENT_JOB_LAST, VIR_ENUM_IMPL(qemuDomainAgentJob,
QEMU_AGENT_JOB_LAST,
"none", "none",
"query", "query",
"modify", "modify",
); );
VIR_ENUM_IMPL(qemuDomainAsyncJob, QEMU_ASYNC_JOB_LAST, VIR_ENUM_IMPL(qemuDomainAsyncJob,
QEMU_ASYNC_JOB_LAST,
"none", "none",
"migration out", "migration out",
"migration in", "migration in",
@ -108,7 +111,8 @@ VIR_ENUM_IMPL(qemuDomainAsyncJob, QEMU_ASYNC_JOB_LAST,
"start", "start",
); );
VIR_ENUM_IMPL(qemuDomainNamespace, QEMU_DOMAIN_NS_LAST, VIR_ENUM_IMPL(qemuDomainNamespace,
QEMU_DOMAIN_NS_LAST,
"mount", "mount",
); );

6
src/qemu/qemu_driver.c
View File

@ -2715,7 +2715,8 @@ typedef enum {
} virQEMUSaveFormat; } virQEMUSaveFormat;
VIR_ENUM_DECL(qemuSaveCompression); VIR_ENUM_DECL(qemuSaveCompression);
VIR_ENUM_IMPL(qemuSaveCompression, QEMU_SAVE_FORMAT_LAST, VIR_ENUM_IMPL(qemuSaveCompression,
QEMU_SAVE_FORMAT_LAST,
"raw", "raw",
"gzip", "gzip",
"bzip2", "bzip2",
@ -2724,7 +2725,8 @@ VIR_ENUM_IMPL(qemuSaveCompression, QEMU_SAVE_FORMAT_LAST,
); );
VIR_ENUM_DECL(qemuDumpFormat); 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", "elf",
"kdump-zlib", "kdump-zlib",
"kdump-lzo", "kdump-lzo",

3
src/qemu/qemu_migration.c
View File

@ -66,7 +66,8 @@
VIR_LOG_INIT("qemu.qemu_migration"); VIR_LOG_INIT("qemu.qemu_migration");
VIR_ENUM_IMPL(qemuMigrationJobPhase, QEMU_MIGRATION_PHASE_LAST, VIR_ENUM_IMPL(qemuMigrationJobPhase,
QEMU_MIGRATION_PHASE_LAST,
"none", "none",
"perform2", "perform2",
"begin3", "begin3",

9
src/qemu/qemu_migration_params.c
View File

@ -72,12 +72,14 @@ typedef enum {
QEMU_MIGRATION_COMPRESS_LAST QEMU_MIGRATION_COMPRESS_LAST
} qemuMigrationCompressMethod; } qemuMigrationCompressMethod;
VIR_ENUM_DECL(qemuMigrationCompressMethod); VIR_ENUM_DECL(qemuMigrationCompressMethod);
VIR_ENUM_IMPL(qemuMigrationCompressMethod, QEMU_MIGRATION_COMPRESS_LAST, VIR_ENUM_IMPL(qemuMigrationCompressMethod,
QEMU_MIGRATION_COMPRESS_LAST,
"xbzrle", "xbzrle",
"mt", "mt",
); );
VIR_ENUM_IMPL(qemuMigrationCapability, QEMU_MIGRATION_CAP_LAST, VIR_ENUM_IMPL(qemuMigrationCapability,
QEMU_MIGRATION_CAP_LAST,
"xbzrle", "xbzrle",
"auto-converge", "auto-converge",
"rdma-pin-all", "rdma-pin-all",
@ -91,7 +93,8 @@ VIR_ENUM_IMPL(qemuMigrationCapability, QEMU_MIGRATION_CAP_LAST,
VIR_ENUM_DECL(qemuMigrationParam); VIR_ENUM_DECL(qemuMigrationParam);
VIR_ENUM_IMPL(qemuMigrationParam, QEMU_MIGRATION_PARAM_LAST, VIR_ENUM_IMPL(qemuMigrationParam,
QEMU_MIGRATION_PARAM_LAST,
"compress-level", "compress-level",
"compress-threads", "compress-threads",
"decompress-threads", "decompress-threads",

6
src/qemu/qemu_monitor_json.c
View File

@ -733,7 +733,8 @@ static void qemuMonitorJSONHandleRTCChange(qemuMonitorPtr mon, virJSONValuePtr d
} }
VIR_ENUM_DECL(qemuMonitorWatchdogAction); 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", "none", "pause", "reset", "poweroff", "shutdown", "debug", "inject-nmi",
); );
@ -755,7 +756,8 @@ static void qemuMonitorJSONHandleWatchdog(qemuMonitorPtr mon, virJSONValuePtr da
} }
VIR_ENUM_DECL(qemuMonitorIOErrorAction); 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", "ignore", "stop", "report",
); );

3
src/remote/remote_daemon.c
View File

@ -90,7 +90,8 @@ enum {
}; };
VIR_ENUM_DECL(virDaemonErr); VIR_ENUM_DECL(virDaemonErr);
VIR_ENUM_IMPL(virDaemonErr, VIR_DAEMON_ERR_LAST, VIR_ENUM_IMPL(virDaemonErr,
VIR_DAEMON_ERR_LAST,
"Initialization successful", "Initialization successful",
"Unable to obtain pidfile", "Unable to obtain pidfile",
"Unable to create rundir", "Unable to create rundir",

3
src/util/vircgroup.c
View File

@ -62,7 +62,8 @@ VIR_LOG_INIT("util.cgroup");
#define CGROUP_NB_TOTAL_CPU_STAT_PARAM 3 #define CGROUP_NB_TOTAL_CPU_STAT_PARAM 3
#define CGROUP_NB_PER_CPU_STAT_PARAM 1 #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", "cpu", "cpuacct", "cpuset", "memory", "devices",
"freezer", "blkio", "net_cls", "perf_event", "freezer", "blkio", "net_cls", "perf_event",
"name=systemd", "name=systemd",

3
src/util/vircgroupbackend.c
View File

@ -30,7 +30,8 @@
#define VIR_FROM_THIS VIR_FROM_CGROUP #define VIR_FROM_THIS VIR_FROM_CGROUP
VIR_ENUM_DECL(virCgroupBackend); 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 V2",
"cgroup V1", "cgroup V1",
); );

3
src/util/vircgroupv1.c
View File

@ -47,7 +47,8 @@ VIR_LOG_INIT("util.cgroup");
VIR_ENUM_DECL(virCgroupV1Controller); 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", "cpu", "cpuacct", "cpuset", "memory", "devices",
"freezer", "blkio", "net_cls", "perf_event", "freezer", "blkio", "net_cls", "perf_event",
"name=systemd", "name=systemd",

3
src/util/vircgroupv2.c
View File

@ -44,7 +44,8 @@ VIR_LOG_INIT("util.cgroup");
#define VIR_FROM_THIS VIR_FROM_CGROUP #define VIR_FROM_THIS VIR_FROM_CGROUP
VIR_ENUM_DECL(virCgroupV2Controller); 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", "cpu", "cpuacct", "cpuset", "memory", "devices",
"freezer", "io", "net_cls", "perf_event", "name=systemd", "freezer", "io", "net_cls", "perf_event", "name=systemd",
); );

3
src/util/virconf.c
View File

@ -65,7 +65,8 @@ struct _virConfParserCtxt {
do { while ((ctxt->cur < ctxt->end) && (c_isblank(CUR))) \ do { while ((ctxt->cur < ctxt->end) && (c_isblank(CUR))) \
ctxt->cur++; } while (0) ctxt->cur++; } while (0)
VIR_ENUM_IMPL(virConf, VIR_CONF_LAST, VIR_ENUM_IMPL(virConf,
VIR_CONF_LAST,
"*unexpected*", "*unexpected*",
"long", "long",
"unsigned long", "unsigned long",

6
src/util/virenum.c
View File

@ -22,13 +22,15 @@
#define VIR_FROM_THIS VIR_FROM_NONE #define VIR_FROM_THIS VIR_FROM_NONE
VIR_ENUM_IMPL(virTristateBool, VIR_TRISTATE_BOOL_LAST, VIR_ENUM_IMPL(virTristateBool,
VIR_TRISTATE_BOOL_LAST,
"default", "default",
"yes", "yes",
"no", "no",
); );
VIR_ENUM_IMPL(virTristateSwitch, VIR_TRISTATE_SWITCH_LAST, VIR_ENUM_IMPL(virTristateSwitch,
VIR_TRISTATE_SWITCH_LAST,
"default", "default",
"on", "on",
"off", "off",

3
src/util/virerror.c
View File

@ -57,7 +57,8 @@ static virLogPriority virErrorLevelPriority(virErrorLevel level)
VIR_ENUM_DECL(virErrorDomain); VIR_ENUM_DECL(virErrorDomain);
VIR_ENUM_IMPL(virErrorDomain, VIR_ERR_DOMAIN_LAST, VIR_ENUM_IMPL(virErrorDomain,
VIR_ERR_DOMAIN_LAST,
"", /* 0 */ "", /* 0 */
"Xen Driver", "Xen Driver",
"Xen Daemon", "Xen Daemon",

3
src/util/virfirewall.c
View File

@ -42,7 +42,8 @@ typedef struct _virFirewallGroup virFirewallGroup;
typedef virFirewallGroup *virFirewallGroupPtr; typedef virFirewallGroup *virFirewallGroupPtr;
VIR_ENUM_DECL(virFirewallLayerCommand); VIR_ENUM_DECL(virFirewallLayerCommand);
VIR_ENUM_IMPL(virFirewallLayerCommand, VIR_FIREWALL_LAYER_LAST, VIR_ENUM_IMPL(virFirewallLayerCommand,
VIR_FIREWALL_LAYER_LAST,
EBTABLES_PATH, EBTABLES_PATH,
IPTABLES_PATH, IPTABLES_PATH,
IP6TABLES_PATH, IP6TABLES_PATH,

6
src/util/virfirewalld.c
View File

@ -41,7 +41,8 @@ VIR_LOG_INIT("util.firewalld");
* understood by the firewalld.direct "passthrough" method * understood by the firewalld.direct "passthrough" method
*/ */
VIR_ENUM_DECL(virFirewallLayerFirewallD); VIR_ENUM_DECL(virFirewallLayerFirewallD);
VIR_ENUM_IMPL(virFirewallLayerFirewallD, VIR_FIREWALL_LAYER_LAST, VIR_ENUM_IMPL(virFirewallLayerFirewallD,
VIR_FIREWALL_LAYER_LAST,
"eb", "eb",
"ipv4", "ipv4",
"ipv6", "ipv6",
@ -49,7 +50,8 @@ VIR_ENUM_IMPL(virFirewallLayerFirewallD, VIR_FIREWALL_LAYER_LAST,
VIR_ENUM_DECL(virFirewallDBackend); VIR_ENUM_DECL(virFirewallDBackend);
VIR_ENUM_IMPL(virFirewallDBackend, VIR_FIREWALLD_BACKEND_LAST, VIR_ENUM_IMPL(virFirewallDBackend,
VIR_FIREWALLD_BACKEND_LAST,
"", "",
"iptables", "iptables",
"nftables", "nftables",

3
src/util/virgic.c
View File

@ -23,7 +23,8 @@
#include "virgic.h" #include "virgic.h"
#include "virutil.h" #include "virutil.h"
VIR_ENUM_IMPL(virGICVersion, VIR_GIC_VERSION_LAST, VIR_ENUM_IMPL(virGICVersion,
VIR_GIC_VERSION_LAST,
"none", "none",
"host", "host",
"2", "2",

18
src/util/virhook.c
View File

@ -58,19 +58,22 @@ VIR_ENUM_IMPL(virHookDriver,
"libxl", "libxl",
); );
VIR_ENUM_IMPL(virHookDaemonOp, VIR_HOOK_DAEMON_OP_LAST, VIR_ENUM_IMPL(virHookDaemonOp,
VIR_HOOK_DAEMON_OP_LAST,
"start", "start",
"shutdown", "shutdown",
"reload", "reload",
); );
VIR_ENUM_IMPL(virHookSubop, VIR_HOOK_SUBOP_LAST, VIR_ENUM_IMPL(virHookSubop,
VIR_HOOK_SUBOP_LAST,
"-", "-",
"begin", "begin",
"end", "end",
); );
VIR_ENUM_IMPL(virHookQemuOp, VIR_HOOK_QEMU_OP_LAST, VIR_ENUM_IMPL(virHookQemuOp,
VIR_HOOK_QEMU_OP_LAST,
"start", "start",
"stopped", "stopped",
"prepare", "prepare",
@ -82,7 +85,8 @@ VIR_ENUM_IMPL(virHookQemuOp, VIR_HOOK_QEMU_OP_LAST,
"restore", "restore",
); );
VIR_ENUM_IMPL(virHookLxcOp, VIR_HOOK_LXC_OP_LAST, VIR_ENUM_IMPL(virHookLxcOp,
VIR_HOOK_LXC_OP_LAST,
"start", "start",
"stopped", "stopped",
"prepare", "prepare",
@ -91,7 +95,8 @@ VIR_ENUM_IMPL(virHookLxcOp, VIR_HOOK_LXC_OP_LAST,
"reconnect", "reconnect",
); );
VIR_ENUM_IMPL(virHookNetworkOp, VIR_HOOK_NETWORK_OP_LAST, VIR_ENUM_IMPL(virHookNetworkOp,
VIR_HOOK_NETWORK_OP_LAST,
"start", "start",
"started", "started",
"stopped", "stopped",
@ -100,7 +105,8 @@ VIR_ENUM_IMPL(virHookNetworkOp, VIR_HOOK_NETWORK_OP_LAST,
"updated", "updated",
); );
VIR_ENUM_IMPL(virHookLibxlOp, VIR_HOOK_LIBXL_OP_LAST, VIR_ENUM_IMPL(virHookLibxlOp,
VIR_HOOK_LIBXL_OP_LAST,
"start", "start",
"stopped", "stopped",
"prepare", "prepare",

3
src/util/virkeycode.c
View File

@ -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_osx));
verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyNameTable_win32)); 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", "linux",
"xt", "xt",
"atset1", "atset1",

3
src/util/virlog.c
View File

@ -76,7 +76,8 @@ static char virLogHostname[HOST_NAME_MAX+1];
VIR_LOG_PID_REGEX ": " VIR_LOG_LEVEL_REGEX " : " VIR_LOG_PID_REGEX ": " VIR_LOG_LEVEL_REGEX " : "
VIR_ENUM_DECL(virLogDestination); 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", "stderr", "syslog", "file", "journald",
); );

3
src/util/virmdev.c
View File

@ -47,7 +47,8 @@ struct _virMediatedDeviceList {
virMediatedDevicePtr *devs; virMediatedDevicePtr *devs;
}; };
VIR_ENUM_IMPL(virMediatedDeviceModel, VIR_MDEV_MODEL_TYPE_LAST, VIR_ENUM_IMPL(virMediatedDeviceModel,
VIR_MDEV_MODEL_TYPE_LAST,
"vfio-pci", "vfio-pci",
"vfio-ccw", "vfio-ccw",
"vfio-ap", "vfio-ap",

3
src/util/virnetdevmacvlan.c
View File

@ -32,7 +32,8 @@
#define VIR_FROM_THIS VIR_FROM_NET #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", "vepa",
"private", "private",
"bridge", "bridge",

6
src/util/virnetdevvportprofile.c
View File

@ -25,7 +25,8 @@
#define VIR_FROM_THIS VIR_FROM_NET #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", "none",
"802.1Qbg", "802.1Qbg",
"802.1Qbh", "802.1Qbh",
@ -33,7 +34,8 @@ VIR_ENUM_IMPL(virNetDevVPort, VIR_NETDEV_VPORT_PROFILE_LAST,
"midonet", "midonet",
); );
VIR_ENUM_IMPL(virNetDevVPortProfileOp, VIR_NETDEV_VPORT_PROFILE_OP_LAST, VIR_ENUM_IMPL(virNetDevVPortProfileOp,
VIR_NETDEV_VPORT_PROFILE_OP_LAST,
"create", "create",
"save", "save",
"restore", "restore",

9
src/util/virpci.c
View File

@ -46,18 +46,21 @@ VIR_LOG_INIT("util.pci");
#define PCI_ID_LEN 10 /* "XXXX XXXX" */ #define PCI_ID_LEN 10 /* "XXXX XXXX" */
#define PCI_ADDR_LEN 13 /* "XXXX:XX:XX.X" */ #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", "", "2.5", "5", "8", "16",
); );
VIR_ENUM_IMPL(virPCIStubDriver, VIR_PCI_STUB_DRIVER_LAST, VIR_ENUM_IMPL(virPCIStubDriver,
VIR_PCI_STUB_DRIVER_LAST,
"none", "none",
"pciback", /* XEN */ "pciback", /* XEN */
"pci-stub", /* KVM */ "pci-stub", /* KVM */
"vfio-pci", /* VFIO */ "vfio-pci", /* VFIO */
); );
VIR_ENUM_IMPL(virPCIHeader, VIR_PCI_HEADER_LAST, VIR_ENUM_IMPL(virPCIHeader,
VIR_PCI_HEADER_LAST,
"endpoint", "endpoint",
"pci-bridge", "pci-bridge",
"cardbus-bridge", "cardbus-bridge",

3
src/util/virperf.c
View File

@ -34,7 +34,8 @@ VIR_LOG_INIT("util.perf");
#define VIR_FROM_THIS VIR_FROM_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", "cmt", "mbmt", "mbml",
"cpu_cycles", "instructions", "cpu_cycles", "instructions",
"cache_references", "cache_misses", "cache_references", "cache_misses",

3
src/util/virprocess.c
View File

@ -107,7 +107,8 @@ static inline int setns(int fd ATTRIBUTE_UNUSED, int nstype ATTRIBUTE_UNUSED)
} }
#endif #endif
VIR_ENUM_IMPL(virProcessSchedPolicy, VIR_PROC_POLICY_LAST, VIR_ENUM_IMPL(virProcessSchedPolicy,
VIR_PROC_POLICY_LAST,
"none", "none",
"batch", "batch",
"idle", "idle",

12
src/util/virresctrl.c
View File

@ -53,14 +53,16 @@ VIR_LOG_INIT("util.virresctrl");
* consistent in between all of them. */ * consistent in between all of them. */
/* Cache name mapping for Linux kernel naming. */ /* Cache name mapping for Linux kernel naming. */
VIR_ENUM_IMPL(virCacheKernel, VIR_CACHE_TYPE_LAST, VIR_ENUM_IMPL(virCacheKernel,
VIR_CACHE_TYPE_LAST,
"Unified", "Unified",
"Instruction", "Instruction",
"Data", "Data",
); );
/* Cache name mapping for our XML naming. */ /* Cache name mapping for our XML naming. */
VIR_ENUM_IMPL(virCache, VIR_CACHE_TYPE_LAST, VIR_ENUM_IMPL(virCache,
VIR_CACHE_TYPE_LAST,
"both", "both",
"code", "code",
"data", "data",
@ -68,14 +70,16 @@ VIR_ENUM_IMPL(virCache, VIR_CACHE_TYPE_LAST,
/* Cache name mapping for resctrl interface naming. */ /* Cache name mapping for resctrl interface naming. */
VIR_ENUM_DECL(virResctrl); VIR_ENUM_DECL(virResctrl);
VIR_ENUM_IMPL(virResctrl, VIR_CACHE_TYPE_LAST, VIR_ENUM_IMPL(virResctrl,
VIR_CACHE_TYPE_LAST,
"", "",
"CODE", "CODE",
"DATA", "DATA",
); );
/* Monitor feature name prefix mapping for monitor naming */ /* 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__", "__unsupported__",
"llc_", "llc_",
"mbm_", "mbm_",

3
src/util/virsecret.c
View File

@ -32,7 +32,8 @@
VIR_LOG_INIT("util.secret"); 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", "none", "volume", "ceph", "iscsi", "tls",
); );

9
src/util/virstoragefile.c
View File

@ -49,7 +49,8 @@ VIR_LOG_INIT("util.storagefile");
static virClassPtr virStorageSourceClass; static virClassPtr virStorageSourceClass;
VIR_ENUM_IMPL(virStorage, VIR_STORAGE_TYPE_LAST, VIR_ENUM_IMPL(virStorage,
VIR_STORAGE_TYPE_LAST,
"none", "none",
"file", "file",
"block", "block",
@ -75,7 +76,8 @@ VIR_ENUM_IMPL(virStorageFileFeature,
"lazy_refcounts", "lazy_refcounts",
); );
VIR_ENUM_IMPL(virStorageNetProtocol, VIR_STORAGE_NET_PROTOCOL_LAST, VIR_ENUM_IMPL(virStorageNetProtocol,
VIR_STORAGE_NET_PROTOCOL_LAST,
"none", "none",
"nbd", "nbd",
"rbd", "rbd",
@ -91,7 +93,8 @@ VIR_ENUM_IMPL(virStorageNetProtocol, VIR_STORAGE_NET_PROTOCOL_LAST,
"vxhs", "vxhs",
); );
VIR_ENUM_IMPL(virStorageNetHostTransport, VIR_STORAGE_NET_HOST_TRANS_LAST, VIR_ENUM_IMPL(virStorageNetHostTransport,
VIR_STORAGE_NET_HOST_TRANS_LAST,
"tcp", "tcp",
"unix", "unix",
"rdma", "rdma",

3
src/util/virsysinfo.c
View File

@ -41,7 +41,8 @@
VIR_LOG_INIT("util.sysinfo"); VIR_LOG_INIT("util.sysinfo");
VIR_ENUM_IMPL(virSysinfo, VIR_SYSINFO_LAST, VIR_ENUM_IMPL(virSysinfo,
VIR_SYSINFO_LAST,
"smbios", "smbios",
); );

3
src/util/virtypedparam.c
View File

@ -31,7 +31,8 @@
#define VIR_FROM_THIS VIR_FROM_NONE #define VIR_FROM_THIS VIR_FROM_NONE
VIR_ENUM_IMPL(virTypedParameter, VIR_TYPED_PARAM_LAST, VIR_ENUM_IMPL(virTypedParameter,
VIR_TYPED_PARAM_LAST,
"unknown", "unknown",
"int", "int",
"uint", "uint",

1
src/util/virutil.c
View File

@ -84,7 +84,6 @@ verify(sizeof(gid_t) <= sizeof(unsigned int) &&
VIR_LOG_INIT("util.util"); VIR_LOG_INIT("util.util");
#ifndef WIN32 #ifndef WIN32
int virSetInherit(int fd, bool inherit) int virSetInherit(int fd, bool inherit)

3
src/vmware/vmware_conf.c
View File

@ -38,7 +38,8 @@
VIR_LOG_INIT("vmware.vmware_conf"); VIR_LOG_INIT("vmware.vmware_conf");
VIR_ENUM_IMPL(vmwareDriver, VMWARE_DRIVER_LAST, VIR_ENUM_IMPL(vmwareDriver,
VMWARE_DRIVER_LAST,
"player", "player",
"ws", "ws",
"fusion", "fusion",

3
src/vmx/vmx.c
View File

@ -509,7 +509,8 @@ def->parallels[0]...
* this is good enough for now because all virDomainControllerModel values * this is good enough for now because all virDomainControllerModel values
* are actually SCSI controller models in the ESX case */ * are actually SCSI controller models in the ESX case */
VIR_ENUM_DECL(virVMXControllerModelSCSI); VIR_ENUM_DECL(virVMXControllerModelSCSI);
VIR_ENUM_IMPL(virVMXControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST, VIR_ENUM_IMPL(virVMXControllerModelSCSI,
VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST,
"auto", /* just to match virDomainControllerModel, will never be used */ "auto", /* just to match virDomainControllerModel, will never be used */
"buslogic", "buslogic",
"lsilogic", "lsilogic",

2
tests/group-qemu-caps.pl
View File

@ -39,7 +39,7 @@ if (defined $ARGV[0]) {
my $ret = 0; my $ret = 0;
if (&regroup_caps($prefix . 'src/qemu/qemu_capabilities.c', if (&regroup_caps($prefix . 'src/qemu/qemu_capabilities.c',
'^VIR_ENUM_IMPL\(virQEMUCaps,', 'virQEMUCaps grouping marker',
'\);', '\);',
0, 0,
" ") < 0) { " ") < 0) {

3
tests/virkeycodetest.c
View File

@ -83,7 +83,8 @@ static int testKeycodeStrings(const void *data ATTRIBUTE_UNUSED)
TRANSLATE(LINUX, "KEY_DELETE", 111); TRANSLATE(LINUX, "KEY_DELETE", 111);
TRANSLATE(LINUX, "KEY_RFKILL", 524); TRANSLATE(LINUX, "KEY_RFKILL", 524);
TRANSLATE(LINUX, "KEY_WIBBLE", -1); TRANSLATE(LINUX, "KEY_WIBBLE",
-1);
TRANSLATE(OSX, "Function", 0x3f); TRANSLATE(OSX, "Function", 0x3f);
TRANSLATE(WIN32, "VK_UP", 0x26); TRANSLATE(WIN32, "VK_UP", 0x26);

6
tools/virsh-domain.c
View File

@ -5645,12 +5645,14 @@ static const vshCmdOptDef opts_setLifecycleAction[] = {
{.name = NULL} {.name = NULL}
}; };
VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_LAST, VIR_ENUM_IMPL(virDomainLifecycle,
VIR_DOMAIN_LIFECYCLE_LAST,
"poweroff", "poweroff",
"reboot", "reboot",
"crash"); "crash");
VIR_ENUM_IMPL(virDomainLifecycleAction, VIR_DOMAIN_LIFECYCLE_ACTION_LAST, VIR_ENUM_IMPL(virDomainLifecycleAction,
VIR_DOMAIN_LIFECYCLE_ACTION_LAST,
"destroy", "destroy",
"restart", "restart",
"rename-restart", "rename-restart",

3
tools/virsh-host.c
View File

@ -774,7 +774,8 @@ typedef enum {
} virshCPUStats; } virshCPUStats;
VIR_ENUM_DECL(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_USER,
VIR_NODE_CPU_STATS_KERNEL, VIR_NODE_CPU_STATS_KERNEL,
VIR_NODE_CPU_STATS_IDLE, VIR_NODE_CPU_STATS_IDLE,

6
tools/virsh-network.c
View File

@ -906,11 +906,13 @@ static const vshCmdOptDef opts_network_update[] = {
}; };
VIR_ENUM_DECL(virNetworkUpdateCommand); 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"); "none", "modify", "delete", "add-last", "add-first");
VIR_ENUM_DECL(virNetworkSection); 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", "none", "bridge", "domain", "ip", "ip-dhcp-host",
"ip-dhcp-range", "forward", "forward-interface", "ip-dhcp-range", "forward", "forward-interface",
"forward-pf", "portgroup", "dns-host", "dns-txt", "forward-pf", "portgroup", "dns-host", "dns-txt",

3
tools/virsh-volume.c
View File

@ -937,7 +937,8 @@ static const vshCmdOptDef opts_vol_wipe[] = {
}; };
VIR_ENUM_DECL(virStorageVolWipeAlgorithm); 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", "zero", "nnsa", "dod", "bsi", "gutmann", "schneier",
"pfitzner7", "pfitzner33", "random", "trim"); "pfitzner7", "pfitzner33", "random", "trim");

3
tools/virt-host-validate-common.c
View File

@ -35,7 +35,8 @@
#define VIR_FROM_THIS VIR_FROM_NONE #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", "vmx",
"svm", "svm",
"sie"); "sie");