[PATCH 02/22] virQEMUCapsCommandLine: Group by commandline argument name alphabetically

Further commits will be refactoring and minimizing capabilities being parsed from 'query-command-line-options'. Group the struct driving the detection by argument name so it's easier to spot options belonging together. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9558938866..0d8c9667f1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3223,39 +3223,39 @@ struct virQEMUCapsCommandLineProps { }; static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { - { "machine", "mem-merge", QEMU_CAPS_MEM_MERGE }, - { "drive", "discard", QEMU_CAPS_DRIVE_DISCARD }, - { "drive", "detect-zeroes", QEMU_CAPS_DRIVE_DETECT_ZEROES }, { "boot-opts", "strict", QEMU_CAPS_BOOT_STRICT }, { "boot-opts", "reboot-timeout", QEMU_CAPS_REBOOT_TIMEOUT }, { "boot-opts", "splash-time", QEMU_CAPS_SPLASH_TIMEOUT }, - { "spice", "disable-agent-file-xfer", QEMU_CAPS_SPICE_FILE_XFER_DISABLE }, - { "msg", "timestamp", QEMU_CAPS_MSG_TIMESTAMP }, - { "numa", NULL, QEMU_CAPS_NUMA }, - { "drive", "throttling.bps-total-max", QEMU_CAPS_DRIVE_IOTUNE_MAX}, - { "machine", "aes-key-wrap", QEMU_CAPS_AES_KEY_WRAP }, - { "machine", "dea-key-wrap", QEMU_CAPS_DEA_KEY_WRAP }, { "chardev", "append", QEMU_CAPS_CHARDEV_FILE_APPEND }, - { "spice", "gl", QEMU_CAPS_SPICE_GL }, { "chardev", "logfile", QEMU_CAPS_CHARDEV_LOGFILE }, - { "name", "debug-threads", QEMU_CAPS_NAME_DEBUG_THREADS }, - { "name", "guest", QEMU_CAPS_NAME_GUEST }, - { "spice", "unix", QEMU_CAPS_SPICE_UNIX }, + { "chardev", "reconnect", QEMU_CAPS_CHARDEV_RECONNECT }, + { "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS }, + { "drive", "discard", QEMU_CAPS_DRIVE_DISCARD }, + { "drive", "detect-zeroes", QEMU_CAPS_DRIVE_DETECT_ZEROES }, + { "drive", "throttling.bps-total-max", QEMU_CAPS_DRIVE_IOTUNE_MAX}, { "drive", "throttling.bps-total-max-length", QEMU_CAPS_DRIVE_IOTUNE_MAX_LENGTH }, { "drive", "throttling.group", QEMU_CAPS_DRIVE_IOTUNE_GROUP }, - { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE }, + { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS }, + { "fsdev", "fmode", QEMU_CAPS_FSDEV_CREATEMODE }, /* Could have also checked fsdev->dmode */ + { "fw_cfg", "file", QEMU_CAPS_FW_CFG }, + { "machine", "mem-merge", QEMU_CAPS_MEM_MERGE }, + { "machine", "aes-key-wrap", QEMU_CAPS_AES_KEY_WRAP }, + { "machine", "dea-key-wrap", QEMU_CAPS_DEA_KEY_WRAP }, { "machine", "kernel_irqchip", QEMU_CAPS_MACHINE_KERNEL_IRQCHIP }, { "machine", "loadparm", QEMU_CAPS_LOADPARM }, - { "vnc", "vnc", QEMU_CAPS_VNC_MULTI_SERVERS }, - { "chardev", "reconnect", QEMU_CAPS_CHARDEV_RECONNECT }, + { "msg", "timestamp", QEMU_CAPS_MSG_TIMESTAMP }, + { "name", "debug-threads", QEMU_CAPS_NAME_DEBUG_THREADS }, + { "name", "guest", QEMU_CAPS_NAME_GUEST }, + { "numa", NULL, QEMU_CAPS_NUMA }, + { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT }, { "sandbox", "enable", QEMU_CAPS_SECCOMP_SANDBOX }, { "sandbox", "elevateprivileges", QEMU_CAPS_SECCOMP_BLACKLIST }, - { "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS }, - { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT }, { "smp-opts", "dies", QEMU_CAPS_SMP_DIES }, - { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS }, - { "fw_cfg", "file", QEMU_CAPS_FW_CFG }, - { "fsdev", "fmode", QEMU_CAPS_FSDEV_CREATEMODE }, /* Could have also checked fsdev->dmode */ + { "spice", "disable-agent-file-xfer", QEMU_CAPS_SPICE_FILE_XFER_DISABLE }, + { "spice", "gl", QEMU_CAPS_SPICE_GL }, + { "spice", "unix", QEMU_CAPS_SPICE_UNIX }, + { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE }, + { "vnc", "vnc", QEMU_CAPS_VNC_MULTI_SERVERS }, { "vnc", "display", QEMU_CAPS_VNC_OPTS }, { "vnc", "power-control", QEMU_CAPS_VNC_POWER_CONTROL }, { "vnc", "audiodev", QEMU_CAPS_AUDIODEV }, -- 2.31.1