[libvirt] [PATCH 8/8] DO NOT PUSH: fix capabilities grouping

Ján Tomko jtomko at redhat.com
Thu Feb 21 15:42:30 UTC 2019


To be squashed into the previous patch.
Best viewed with --patience
---
 src/qemu/qemu_capabilities.c | 177 ++++++++++++++++++-----------------
 src/qemu/qemu_capabilities.h | 177 ++++++++++++++++++-----------------
 2 files changed, 180 insertions(+), 174 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 7b760d95b4..3bb4bfbbf2 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -63,333 +63,336 @@ VIR_LOG_INIT("qemu.qemu_capabilities");
  * daemon restarts
  */
 VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
+              /* 0 */
               "kvm",
               "no-hpet",
               "spice",
-
-              /* 50 */
               "hda-duplex",
               "ccid-emulated",
 
-              /* 55 */
+              /* 5 */
               "ccid-passthru",
               "virtio-tx-alg",
               "virtio-blk-pci.ioeventfd",
               "sga",
               "virtio-blk-pci.event_idx",
+
+              /* 10 */
               "virtio-net-pci.event_idx",
               "piix3-usb-uhci",
               "piix4-usb-uhci",
               "usb-ehci",
               "ich9-usb-ehci1",
 
-              /* 70 */
+              /* 15 */
               "vt82c686b-usb-uhci",
               "pci-ohci",
               "usb-redir",
               "usb-hub",
               "ich9-ahci",
-              "no-acpi",
 
-              /* 80 */
+              /* 20 */
+              "no-acpi",
               "virtio-blk-pci.scsi",
               "scsi-disk.channel",
               "scsi-block",
               "transaction",
-              "block-job-async",
 
-              /* 95 */
+              /* 25 */
+              "block-job-async",
               "hda-micro",
               "dump-guest-memory",
               "nec-usb-xhci",
               "virtio-s390",
+
+              /* 30 */
               "lsi",
               "virtio-scsi-pci",
               "blockio",
               "disable-s3",
-
-              /* 105 */
               "disable-s4",
+
+              /* 35 */
               "usb-redir.filter",
               "ide-drive.wwn",
               "scsi-disk.wwn",
               "seccomp-sandbox",
-
-              /* 110 */
               "reboot-timeout",
+
+              /* 40 */
               "block-commit",
               "vnc",
-
-              /* 115 */
               "drive-mirror",
               "blockdev-snapshot-sync",
               "qxl",
 
-              /* 120 */
+              /* 45 */
               "VGA",
               "cirrus-vga",
               "vmware-svga",
               "device-video-primary",
               "s390-sclp",
 
-              /* 125 */
+              /* 50 */
               "usb-serial",
               "nbd-server",
               "virtio-rng",
-
-              /* 130 */
               "rng-random",
               "rng-egd",
+
+              /* 55 */
               "virtio-ccw",
               "megasas",
               "tpm-passthrough",
               "tpm-tis",
-
-              /* 140 */
               "nvram",
+
+              /* 60 */
               "pci-bridge",
               "vfio-pci",
               "mem-merge",
               "drive-discard",
               "mlock",
+
+              /* 65 */
               "dmi-to-pci-bridge",
               "i440fx-pci-hole64-size",
               "q35-pci-hole64-size",
-
-              /* 155 */
               "usb-storage",
               "usb-storage.removable",
+
+              /* 70 */
               "virtio-mmio",
               "ich9-intel-hda",
               "kvm-pit-lost-tick-policy",
-
-              /* 160 */
               "boot-strict",
               "pvpanic",
+
+              /* 75 */
               "enable-fips",
               "spice-file-xfer-disable",
-
-              /* 165 */
               "usb-kbd",
               "msg-timestamp",
               "active-commit",
-              "change-backing-file",
 
-              /* 170 */
+              /* 80 */
+              "change-backing-file",
               "memory-backend-ram",
               "numa",
               "memory-backend-file",
               "usb-audio",
-              "rtc-reset-reinjection",
 
-              /* 175 */
+              /* 85 */
+              "rtc-reset-reinjection",
               "splash-timeout",
               "iothread",
               "migrate-rdma",
               "ivshmem",
-              "drive-iotune-max",
 
-              /* 180 */
+              /* 90 */
+              "drive-iotune-max",
               "VGA.vgamem_mb",
               "vmware-svga.vgamem_mb",
               "qxl.vgamem_mb",
               "qxl-vga.vgamem_mb",
-              "pc-dimm",
 
-              /* 185 */
+              /* 95 */
+              "pc-dimm",
               "machine-vmport-opt",
               "aes-key-wrap",
               "dea-key-wrap",
               "pci-serial",
-              "aarch64-off",
 
-              /* 190 */
+              /* 100 */
+              "aarch64-off",
               "vhost-user-multiqueue",
               "migration-event",
               "gpex-pcihost",
               "ioh3420",
-              "x3130-upstream",
 
-              /* 195 */
+              /* 105 */
+              "x3130-upstream",
               "xio3130-downstream",
               "rtl8139",
               "e1000",
               "virtio-net",
-              "gic-version",
 
-              /* 200 */
+              /* 110 */
+              "gic-version",
               "incoming-defer",
               "virtio-gpu",
               "virtio-gpu.virgl",
               "virtio-keyboard",
-              "virtio-mouse",
 
-              /* 205 */
+              /* 115 */
+              "virtio-mouse",
               "virtio-tablet",
               "virtio-input-host",
               "chardev-file-append",
               "ich9-disable-s3",
-              "ich9-disable-s4",
 
-              /* 210 */
+              /* 120 */
+              "ich9-disable-s4",
               "vserport-change-event",
               "virtio-balloon-pci.deflate-on-oom",
               "mptsas1068",
               "spice-gl",
-              "qxl.vram64_size_mb",
 
-              /* 215 */
+              /* 125 */
+              "qxl.vram64_size_mb",
               "qxl-vga.vram64_size_mb",
               "chardev-logfile",
               "debug-threads",
               "secret",
-              "pxb",
 
-              /* 220 */
+              /* 130 */
+              "pxb",
               "pxb-pcie",
               "nec-usb-xhci-ports",
               "virtio-scsi-pci.iothread",
               "name-guest",
 
-              /* 225 */
+              /* 135 */
               "qxl.max_outputs",
               "spice-unix",
               "drive-detect-zeroes",
               "tls-creds-x509",
               "intel-iommu",
+
+              /* 140 */
               "smm",
               "virtio-pci-disable-legacy",
               "query-hotpluggable-cpus",
-
-              /* 235 */
               "virtio-net.rx_queue_size",
               "machine-iommu",
+
+              /* 145 */
               "virtio-vga",
               "drive-iotune-max-length",
               "ivshmem-plain",
-
-              /* 240 */
               "ivshmem-doorbell",
               "query-qmp-schema",
+
+              /* 150 */
               "gluster.debug_level",
               "vhost-scsi",
               "drive-iotune-group",
-
-              /* 245 */
               "query-cpu-model-expansion",
               "virtio-net.host_mtu",
+
+              /* 155 */
               "spice-rendernode",
               "nvdimm",
               "pcie-root-port",
-
-              /* 250 */
               "query-cpu-definitions",
               "block-write-threshold",
+
+              /* 160 */
               "query-named-block-nodes",
               "cpu-cache",
               "qemu-xhci",
-
-              /* 255 */
               "kernel-irqchip",
               "kernel-irqchip.split",
+
+              /* 165 */
               "intel-iommu.intremap",
               "intel-iommu.caching-mode",
               "intel-iommu.eim",
-
-              /* 260 */
               "intel-iommu.device-iotlb",
               "virtio.iommu_platform",
+
+              /* 170 */
               "virtio.ats",
               "loadparm",
               "spapr-pci-host-bridge",
-
-              /* 265 */
               "spapr-pci-host-bridge.numa_node",
               "vnc-multi-servers",
+
+              /* 175 */
               "virtio-net.tx_queue_size",
               "chardev-reconnect",
               "virtio-gpu.max_outputs",
-
-              /* 270 */
               "vxhs",
               "virtio-blk.num-queues",
+
+              /* 180 */
               "machine.pseries.resize-hpt",
               "vmcoreinfo",
               "spapr-vty",
-
-              /* 275 */
               "sclplmconsole",
               "numa.dist",
+
+              /* 185 */
               "disk-share-rw",
               "iscsi.password-secret",
               "isa-serial",
-
-              /* 280 */
               "pl011",
               "machine.pseries.max-cpu-compat",
+
+              /* 190 */
               "dump-completed",
               "virtio-gpu-ccw",
               "virtio-keyboard-ccw",
-
-              /* 285 */
               "virtio-mouse-ccw",
               "virtio-tablet-ccw",
+
+              /* 195 */
               "qcow2-luks",
               "pcie-pci-bridge",
               "seccomp-blacklist",
-
-              /* 290 */
               "query-cpus-fast",
               "disk-write-cache",
+
+              /* 200 */
               "nbd-tls",
               "tpm-crb",
               "pr-manager-helper",
-
-              /* 295 */
               "qom-list-properties",
               "memory-backend-file.discard-data",
+
+              /* 205 */
               "virtual-css-bridge",
               "virtual-css-bridge.cssid-unrestricted",
               "vfio-ccw",
-
-              /* 300 */
               "sdl-gl",
               "screendump_device",
+
+              /* 210 */
               "hda-output",
               "blockdev-del",
               "vmgenid",
-
-              /* 305 */
               "vhost-vsock",
               "chardev-fd-pass",
+
+              /* 215 */
               "tpm-emulator",
               "mch",
               "mch.extended-tseg-mbytes",
-
-              /* 310 */
               "sev-guest",
               "machine.pseries.cap-hpt-max-page-size",
+
+              /* 220 */
               "machine.pseries.cap-htm",
               "usb-storage.werror",
               "egl-headless",
-
-              /* 315 */
               "vfio-pci.display",
               "blockdev",
+
+              /* 225 */
               "vfio-ap",
               "zpci",
               "memory-backend-memfd",
-
-              /* 320 */
               "memory-backend-memfd.hugetlb",
               "iothread.poll-max-ns",
+
+              /* 230 */
               "machine.pseries.cap-nested-hv",
               "egl-headless.rendernode",
               "memory-backend-file.align",
-
-              /* 325 */
               "memory-backend-file.pmem",
               "nvdimm.unarmed",
+
+              /* 235 */
               "scsi-disk.device_id",
     );
 
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 32dc8ccc1e..7e373f8dcd 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -45,334 +45,337 @@
  * X_ flags and re-group what's left.
  */
 typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
+    /* 0 */
     QEMU_CAPS_KVM, /* Whether KVM is usable / was used during probing */
     QEMU_CAPS_NO_HPET, /* -no-hpet flag is supported */
     QEMU_CAPS_SPICE, /* Is -spice avail */
-
-    /* 50 */
     QEMU_CAPS_HDA_DUPLEX, /* -device hda-duplex */
     QEMU_CAPS_CCID_EMULATED, /* -device ccid-card-emulated */
 
-    /* 55 */
+    /* 5 */
     QEMU_CAPS_CCID_PASSTHRU, /* -device ccid-card-passthru */
     QEMU_CAPS_VIRTIO_TX_ALG, /* -device virtio-net-pci,tx=string */
     QEMU_CAPS_VIRTIO_IOEVENTFD, /* virtio-{net|blk}-pci.ioeventfd=on */
     QEMU_CAPS_SGA, /* Serial Graphics Adapter */
     QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, /* virtio-blk-pci.event_idx */
+
+    /* 10 */
     QEMU_CAPS_VIRTIO_NET_EVENT_IDX, /* virtio-net-pci.event_idx */
     QEMU_CAPS_PIIX3_USB_UHCI, /* -device piix3-usb-uhci */
     QEMU_CAPS_PIIX4_USB_UHCI, /* -device piix4-usb-uhci */
     QEMU_CAPS_USB_EHCI, /* -device usb-ehci */
     QEMU_CAPS_ICH9_USB_EHCI1, /* -device ich9-usb-ehci1 and friends */
 
-    /* 70 */
+    /* 15 */
     QEMU_CAPS_VT82C686B_USB_UHCI, /* -device vt82c686b-usb-uhci */
     QEMU_CAPS_PCI_OHCI, /* -device pci-ohci */
     QEMU_CAPS_USB_REDIR, /* -device usb-redir */
     QEMU_CAPS_USB_HUB, /* -device usb-hub */
     QEMU_CAPS_ICH9_AHCI, /* -device ich9-ahci */
-    QEMU_CAPS_NO_ACPI, /* -no-acpi */
 
-    /* 80 */
+    /* 20 */
+    QEMU_CAPS_NO_ACPI, /* -no-acpi */
     QEMU_CAPS_VIRTIO_BLK_SCSI, /* virtio-blk-pci.scsi */
     QEMU_CAPS_SCSI_DISK_CHANNEL, /* Is scsi-disk.channel available? */
     QEMU_CAPS_SCSI_BLOCK, /* -device scsi-block */
     QEMU_CAPS_TRANSACTION, /* transaction monitor command */
-    QEMU_CAPS_BLOCKJOB_ASYNC, /* new block-job-cancel, block-stream */
 
-    /* 95 */
+    /* 25 */
+    QEMU_CAPS_BLOCKJOB_ASYNC, /* new block-job-cancel, block-stream */
     QEMU_CAPS_HDA_MICRO, /* -device hda-micro */
     QEMU_CAPS_DUMP_GUEST_MEMORY, /* dump-guest-memory command */
     QEMU_CAPS_NEC_USB_XHCI, /* -device nec-usb-xhci */
     QEMU_CAPS_VIRTIO_S390, /* -device virtio-*-s390 */
+
+    /* 30 */
     QEMU_CAPS_SCSI_LSI, /* -device lsi */
     QEMU_CAPS_VIRTIO_SCSI, /* -device virtio-scsi-* */
     QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */
     QEMU_CAPS_PIIX_DISABLE_S3, /* -M pc S3 BIOS Advertisement on/off */
-
-    /* 105 */
     QEMU_CAPS_PIIX_DISABLE_S4, /* -M pc S4 BIOS Advertisement on/off */
+
+    /* 35 */
     QEMU_CAPS_USB_REDIR_FILTER, /* usb-redir.filter */
     QEMU_CAPS_IDE_DRIVE_WWN, /* Is ide-drive.wwn available? */
     QEMU_CAPS_SCSI_DISK_WWN, /* Is scsi-disk.wwn available? */
     QEMU_CAPS_SECCOMP_SANDBOX, /* -sandbox */
-
-    /* 110 */
     QEMU_CAPS_REBOOT_TIMEOUT, /* -boot reboot-timeout */
+
+    /* 40 */
     QEMU_CAPS_BLOCK_COMMIT, /* block-commit */
     QEMU_CAPS_VNC, /* Is -vnc available? */
-
-    /* 115 */
     QEMU_CAPS_DRIVE_MIRROR, /* drive-mirror monitor command */
     QEMU_CAPS_DISK_SNAPSHOT, /* blockdev-snapshot-sync command */
     QEMU_CAPS_DEVICE_QXL, /* -device qxl */
 
-    /* 120 */
+    /* 45 */
     QEMU_CAPS_DEVICE_VGA, /* -device VGA */
     QEMU_CAPS_DEVICE_CIRRUS_VGA, /* -device cirrus-vga */
     QEMU_CAPS_DEVICE_VMWARE_SVGA, /* -device vmware-svga */
     QEMU_CAPS_DEVICE_VIDEO_PRIMARY, /* -device safe for primary video device */
     QEMU_CAPS_DEVICE_SCLPCONSOLE, /* -device sclpconsole */
 
-    /* 125 */
+    /* 50 */
     QEMU_CAPS_DEVICE_USB_SERIAL, /* -device usb-serial */
     QEMU_CAPS_NBD_SERVER, /* nbd-server-start QMP command */
     QEMU_CAPS_DEVICE_VIRTIO_RNG, /* virtio-rng device */
-
-    /* 130 */
     QEMU_CAPS_OBJECT_RNG_RANDOM, /* the rng-random backend for virtio rng */
     QEMU_CAPS_OBJECT_RNG_EGD, /* EGD protocol daemon for rng */
+
+    /* 55 */
     QEMU_CAPS_VIRTIO_CCW, /* -device virtio-*-ccw */
     QEMU_CAPS_SCSI_MEGASAS, /* -device megasas */
     QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, /* -tpmdev passthrough */
     QEMU_CAPS_DEVICE_TPM_TIS, /* -device tpm_tis */
-
-    /* 140 */
     QEMU_CAPS_DEVICE_NVRAM, /* -global spapr-nvram.reg=xxxx */
+
+    /* 60 */
     QEMU_CAPS_DEVICE_PCI_BRIDGE, /* -device pci-bridge */
     QEMU_CAPS_DEVICE_VFIO_PCI, /* -device vfio-pci */
     QEMU_CAPS_MEM_MERGE, /* -machine mem-merge */
     QEMU_CAPS_DRIVE_DISCARD, /* -drive discard=off(ignore)|on(unmap) */
     QEMU_CAPS_REALTIME_MLOCK, /* -realtime mlock=on|off */
+
+    /* 65 */
     QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, /* -device i82801b11-bridge */
     QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, /* i440FX-pcihost.pci-hole64-size */
     QEMU_CAPS_Q35_PCI_HOLE64_SIZE, /* q35-pcihost.pci-hole64-size */
-
-    /* 155 */
     QEMU_CAPS_DEVICE_USB_STORAGE, /* -device usb-storage */
     QEMU_CAPS_USB_STORAGE_REMOVABLE, /* usb-storage.removable */
+
+    /* 70 */
     QEMU_CAPS_DEVICE_VIRTIO_MMIO, /* -device virtio-mmio */
     QEMU_CAPS_DEVICE_ICH9_INTEL_HDA, /* -device ich9-intel-hda */
     QEMU_CAPS_KVM_PIT_TICK_POLICY, /* kvm-pit.lost_tick_policy */
-
-    /* 160 */
     QEMU_CAPS_BOOT_STRICT, /* -boot strict */
     QEMU_CAPS_DEVICE_PANIC, /* -device pvpanic */
+
+    /* 75 */
     QEMU_CAPS_ENABLE_FIPS, /* -enable-fips */
     QEMU_CAPS_SPICE_FILE_XFER_DISABLE, /* -spice disable-agent-file-xfer */
-
-    /* 165 */
     QEMU_CAPS_DEVICE_USB_KBD, /* -device usb-kbd */
     QEMU_CAPS_MSG_TIMESTAMP, /* -msg timestamp */
     QEMU_CAPS_ACTIVE_COMMIT, /* block-commit works without 'top' */
-    QEMU_CAPS_CHANGE_BACKING_FILE, /* change name of backing file in metadata */
 
-    /* 170 */
+    /* 80 */
+    QEMU_CAPS_CHANGE_BACKING_FILE, /* change name of backing file in metadata */
     QEMU_CAPS_OBJECT_MEMORY_RAM, /* -object memory-backend-ram */
     QEMU_CAPS_NUMA, /* newer -numa handling with disjoint cpu ranges */
     QEMU_CAPS_OBJECT_MEMORY_FILE, /* -object memory-backend-file */
     QEMU_CAPS_OBJECT_USB_AUDIO, /* usb-audio device support */
-    QEMU_CAPS_RTC_RESET_REINJECTION, /* rtc-reset-reinjection monitor command */
 
-    /* 175 */
+    /* 85 */
+    QEMU_CAPS_RTC_RESET_REINJECTION, /* rtc-reset-reinjection monitor command */
     QEMU_CAPS_SPLASH_TIMEOUT, /* -boot splash-time */
     QEMU_CAPS_OBJECT_IOTHREAD, /* -object iothread */
     QEMU_CAPS_MIGRATE_RDMA, /* have rdma migration */
     QEMU_CAPS_DEVICE_IVSHMEM, /* -device ivshmem */
-    QEMU_CAPS_DRIVE_IOTUNE_MAX, /* -drive bps_max= and friends */
 
-    /* 180 */
+    /* 90 */
+    QEMU_CAPS_DRIVE_IOTUNE_MAX, /* -drive bps_max= and friends */
     QEMU_CAPS_VGA_VGAMEM, /* -device VGA.vgamem_mb */
     QEMU_CAPS_VMWARE_SVGA_VGAMEM, /* -device vmware-svga.vgamem_mb */
     QEMU_CAPS_QXL_VGAMEM, /* -device qxl.vgamem_mb */
     X_QEMU_CAPS_QXL_VGA_VGAMEM, /* -device qxl-vga.vgamem_mb */
-    QEMU_CAPS_DEVICE_PC_DIMM, /* pc-dimm device */
 
-    /* 185 */
+    /* 95 */
+    QEMU_CAPS_DEVICE_PC_DIMM, /* pc-dimm device */
     QEMU_CAPS_MACHINE_VMPORT_OPT, /* -machine xxx,vmport=on/off/auto */
     QEMU_CAPS_AES_KEY_WRAP, /* -machine aes_key_wrap */
     QEMU_CAPS_DEA_KEY_WRAP, /* -machine dea_key_wrap */
     QEMU_CAPS_DEVICE_PCI_SERIAL, /* -device pci-serial */
-    QEMU_CAPS_CPU_AARCH64_OFF, /* -cpu ...,aarch64=off */
 
-    /* 190 */
+    /* 100 */
+    QEMU_CAPS_CPU_AARCH64_OFF, /* -cpu ...,aarch64=off */
     QEMU_CAPS_VHOSTUSER_MULTIQUEUE, /* vhost-user with -netdev queues= */
     QEMU_CAPS_MIGRATION_EVENT, /* MIGRATION event */
     QEMU_CAPS_OBJECT_GPEX, /* have generic PCI host controller */
     QEMU_CAPS_DEVICE_IOH3420, /* -device ioh3420 */
-    QEMU_CAPS_DEVICE_X3130_UPSTREAM, /* -device x3130-upstream */
 
-    /* 195 */
+    /* 105 */
+    QEMU_CAPS_DEVICE_X3130_UPSTREAM, /* -device x3130-upstream */
     QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, /* -device xio3130-downstream */
     QEMU_CAPS_DEVICE_RTL8139, /* -device rtl8139 */
     QEMU_CAPS_DEVICE_E1000, /* -device e1000 */
     QEMU_CAPS_DEVICE_VIRTIO_NET, /* -device virtio-net-* */
-    QEMU_CAPS_MACH_VIRT_GIC_VERSION, /* -machine virt,gic-version */
 
-    /* 200 */
+    /* 110 */
+    QEMU_CAPS_MACH_VIRT_GIC_VERSION, /* -machine virt,gic-version */
     QEMU_CAPS_INCOMING_DEFER, /* -incoming defer and migrate_incoming */
     QEMU_CAPS_DEVICE_VIRTIO_GPU, /* -device virtio-gpu-* */
     QEMU_CAPS_VIRTIO_GPU_VIRGL, /* -device virtio-gpu-*.virgl */
     QEMU_CAPS_VIRTIO_KEYBOARD, /* -device virtio-keyboard-{device,pci} */
-    QEMU_CAPS_VIRTIO_MOUSE, /* -device virtio-mouse-{device,pci} */
 
-    /* 205 */
+    /* 115 */
+    QEMU_CAPS_VIRTIO_MOUSE, /* -device virtio-mouse-{device,pci} */
     QEMU_CAPS_VIRTIO_TABLET, /* -device virtio-tablet-{device,pci} */
     QEMU_CAPS_VIRTIO_INPUT_HOST, /* -device virtio-input-host-{device,pci} */
     QEMU_CAPS_CHARDEV_FILE_APPEND, /* -chardev file,append=on|off */
     QEMU_CAPS_ICH9_DISABLE_S3, /* -M q35 S3 BIOS Advertisement on/off */
-    QEMU_CAPS_ICH9_DISABLE_S4, /* -M q35 S4 BIOS Advertisement on/off */
 
-    /* 210 */
+    /* 120 */
+    QEMU_CAPS_ICH9_DISABLE_S4, /* -M q35 S4 BIOS Advertisement on/off */
     QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */
     QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, /* virtio-balloon-{device,pci,ccw}.
                                            * deflate-on-oom */
     QEMU_CAPS_SCSI_MPTSAS1068, /* -device mptsas1068 */
     QEMU_CAPS_SPICE_GL, /* -spice gl */
-    QEMU_CAPS_QXL_VRAM64, /* -device qxl.vram64_size_mb */
 
-    /* 215 */
+    /* 125 */
+    QEMU_CAPS_QXL_VRAM64, /* -device qxl.vram64_size_mb */
     X_QEMU_CAPS_QXL_VGA_VRAM64, /* -device qxl-vga.vram64_size_mb */
     QEMU_CAPS_CHARDEV_LOGFILE, /* -chardev logfile=xxxx */
     QEMU_CAPS_NAME_DEBUG_THREADS, /* Is -name debug-threads= available */
     QEMU_CAPS_OBJECT_SECRET, /* -object secret */
-    QEMU_CAPS_DEVICE_PXB, /* -device pxb */
 
-    /* 220 */
+    /* 130 */
+    QEMU_CAPS_DEVICE_PXB, /* -device pxb */
     QEMU_CAPS_DEVICE_PXB_PCIE, /* -device pxb-pcie */
     QEMU_CAPS_NEC_USB_XHCI_PORTS, /* -device nec-usb-xhci.p3 ports setting */
     QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, /* virtio-scsi-{pci,ccw}.iothread */
     QEMU_CAPS_NAME_GUEST, /* -name guest= */
 
-    /* 225 */
+    /* 135 */
     QEMU_CAPS_QXL_MAX_OUTPUTS, /* -device qxl,max-outputs= */
     QEMU_CAPS_SPICE_UNIX, /* -spice unix */
     QEMU_CAPS_DRIVE_DETECT_ZEROES, /* -drive detect-zeroes= */
     QEMU_CAPS_OBJECT_TLS_CREDS_X509, /* -object tls-creds-x509 */
     QEMU_CAPS_DEVICE_INTEL_IOMMU, /* -device intel-iommu */
+
+    /* 140 */
     QEMU_CAPS_MACHINE_SMM_OPT, /* -machine xxx,smm=on/off/auto */
     QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, /* virtio-*pci.disable-legacy */
     QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS, /* qmp command query-hotpluggable-cpus */
-
-    /* 235 */
     QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, /* virtio-net-*.rx_queue_size */
     QEMU_CAPS_MACHINE_IOMMU, /* -machine iommu=on */
+
+    /* 145 */
     QEMU_CAPS_DEVICE_VIRTIO_VGA, /* -device virtio-vga */
     QEMU_CAPS_DRIVE_IOTUNE_MAX_LENGTH, /* -drive bps_max_length = and friends */
     QEMU_CAPS_DEVICE_IVSHMEM_PLAIN, /* -device ivshmem-plain */
-
-    /* 240 */
     QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL, /* -device ivshmem-doorbell */
     QEMU_CAPS_QUERY_QMP_SCHEMA, /* query-qmp-schema command */
+
+    /* 150 */
     QEMU_CAPS_GLUSTER_DEBUG_LEVEL, /* -drive gluster.debug_level={0..9} */
     QEMU_CAPS_DEVICE_VHOST_SCSI, /* -device vhost-scsi-{ccw,pci} */
     QEMU_CAPS_DRIVE_IOTUNE_GROUP, /* -drive throttling.group=<name> */
-
-    /* 245 */
     QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION, /* qmp query-cpu-model-expansion */
     QEMU_CAPS_VIRTIO_NET_HOST_MTU, /* virtio-net-*.host_mtu */
+
+    /* 155 */
     QEMU_CAPS_SPICE_RENDERNODE, /* -spice rendernode */
     QEMU_CAPS_DEVICE_NVDIMM, /* -device nvdimm */
     QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, /* -device pcie-root-port */
-
-    /* 250 */
     QEMU_CAPS_QUERY_CPU_DEFINITIONS, /* qmp query-cpu-definitions */
     QEMU_CAPS_BLOCK_WRITE_THRESHOLD, /* BLOCK_WRITE_THRESHOLD event */
+
+    /* 160 */
     QEMU_CAPS_QUERY_NAMED_BLOCK_NODES, /* qmp query-named-block-nodes */
     QEMU_CAPS_CPU_CACHE, /* -cpu supports host-cache-info and l3-cache properties */
     QEMU_CAPS_DEVICE_QEMU_XHCI, /* -device qemu-xhci */
-
-    /* 255 */
     QEMU_CAPS_MACHINE_KERNEL_IRQCHIP, /* -machine kernel_irqchip */
     QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT, /* -machine kernel_irqchip=split */
+
+    /* 165 */
     QEMU_CAPS_INTEL_IOMMU_INTREMAP, /* intel-iommu.intremap */
     QEMU_CAPS_INTEL_IOMMU_CACHING_MODE, /* intel-iommu.caching-mode */
     QEMU_CAPS_INTEL_IOMMU_EIM, /* intel-iommu.eim */
-
-    /* 260 */
     QEMU_CAPS_INTEL_IOMMU_DEVICE_IOTLB, /* intel-iommu.device-iotlb */
     QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, /* virtio-*-pci.iommu_platform */
+
+    /* 170 */
     QEMU_CAPS_VIRTIO_PCI_ATS, /* virtio-*-pci.ats */
     QEMU_CAPS_LOADPARM, /* -machine loadparm */
     QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, /* -device spapr-pci-host-bridge */
-
-    /* 265 */
     QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE, /* spapr-pci-host-bridge.numa_node= */
     QEMU_CAPS_VNC_MULTI_SERVERS, /* -vnc vnc=unix:/path */
+
+    /* 175 */
     QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, /* virtio-net-*.tx_queue_size */
     QEMU_CAPS_CHARDEV_RECONNECT, /* -chardev reconnect */
     QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS, /* -device virtio-(vga|gpu-*),max-outputs= */
-
-    /* 270 */
     QEMU_CAPS_VXHS, /* -drive file.driver=vxhs via query-qmp-schema */
     QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, /* virtio-blk-*.num-queues */
+
+    /* 180 */
     QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT, /* -machine pseries,resize-hpt */
     QEMU_CAPS_DEVICE_VMCOREINFO, /* -device vmcoreinfo */
     QEMU_CAPS_DEVICE_SPAPR_VTY, /* -device spapr-vty */
-
-    /* 275 */
     QEMU_CAPS_DEVICE_SCLPLMCONSOLE, /* -device sclplmconsole */
     QEMU_CAPS_NUMA_DIST, /* -numa dist */
+
+    /* 185 */
     QEMU_CAPS_DISK_SHARE_RW, /* share-rw=on for concurrent disk access */
     QEMU_CAPS_ISCSI_PASSWORD_SECRET, /* -drive file.driver=iscsi,...,password-secret= */
     QEMU_CAPS_DEVICE_ISA_SERIAL, /* -device isa-serial */
-
-    /* 280 */
     QEMU_CAPS_DEVICE_PL011, /* -device pl011 (not user-instantiable) */
     QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, /* -machine pseries,max-cpu-compat= */
+
+    /* 190 */
     QEMU_CAPS_DUMP_COMPLETED, /* DUMP_COMPLETED event */
     QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW, /* -device virtio-gpu-ccw */
     QEMU_CAPS_DEVICE_VIRTIO_KEYBOARD_CCW, /* -device virtio-keyboard-ccw */
-
-    /* 285 */
     QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW, /* -device virtio-mouse-ccw */
     QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW, /* -device virtio-tablet-ccw */
+
+    /* 195 */
     QEMU_CAPS_QCOW2_LUKS, /* qcow2 format support LUKS encryption */
     QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, /* -device pcie-pci-bridge */
     QEMU_CAPS_SECCOMP_BLACKLIST, /* -sandbox.elevateprivileges */
-
-    /* 290 */
     QEMU_CAPS_QUERY_CPUS_FAST, /* query-cpus-fast command */
     QEMU_CAPS_DISK_WRITE_CACHE, /* qemu block frontends support write-cache param */
+
+    /* 200 */
     QEMU_CAPS_NBD_TLS, /* NBD server supports TLS transport */
     QEMU_CAPS_DEVICE_TPM_CRB, /* -device tpm-crb */
     QEMU_CAPS_PR_MANAGER_HELPER, /* -object pr-manager-helper */
-
-    /* 295 */
     QEMU_CAPS_QOM_LIST_PROPERTIES, /* qom-list-properties monitor command */
     QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD, /* -object memory-backend-file,discard-data */
+
+    /* 205 */
     QEMU_CAPS_CCW, /* -device virtual-css-bridge */
     QEMU_CAPS_CCW_CSSID_UNRESTRICTED, /* virtual-css-bridge.cssid-unrestricted= */
     QEMU_CAPS_DEVICE_VFIO_CCW, /* -device vfio-ccw */
-
-    /* 300 */
     QEMU_CAPS_SDL_GL, /* -sdl gl */
     QEMU_CAPS_SCREENDUMP_DEVICE, /* screendump command accepts device & head */
+
+    /* 210 */
     QEMU_CAPS_HDA_OUTPUT, /* -device hda-output */
     QEMU_CAPS_BLOCKDEV_DEL, /* blockdev-del is supported */
     QEMU_CAPS_DEVICE_VMGENID, /* -device vmgenid */
-
-    /* 305 */
     QEMU_CAPS_DEVICE_VHOST_VSOCK, /* -device vhost-vsock-* */
     QEMU_CAPS_CHARDEV_FD_PASS, /* Passing pre-opened FDs for chardevs */
+
+    /* 215 */
     QEMU_CAPS_DEVICE_TPM_EMULATOR, /* -tpmdev emulator */
     QEMU_CAPS_DEVICE_MCH, /* Northbridge in q35 machine types */
     QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES, /* -global mch.extended-tseg-mbytes */
-
-    /* 310 */
     QEMU_CAPS_SEV_GUEST, /* -object sev-guest,... */
     QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE, /* -machine pseries.cap-hpt-max-page-size */
+
+    /* 220 */
     QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, /* -machine pseries.cap-htm */
     QEMU_CAPS_USB_STORAGE_WERROR, /* -device usb-storage,werror=..,rerror=.. */
     QEMU_CAPS_EGL_HEADLESS, /* -display egl-headless */
-
-    /* 315 */
     QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */
     QEMU_CAPS_BLOCKDEV, /* -blockdev and blockdev-add are supported */
+
+    /* 225 */
     QEMU_CAPS_DEVICE_VFIO_AP, /* -device vfio-ap */
     QEMU_CAPS_DEVICE_ZPCI, /* -device zpci */
     QEMU_CAPS_OBJECT_MEMORY_MEMFD, /* -object memory-backend-memfd */
-
-    /* 320 */
     QEMU_CAPS_OBJECT_MEMORY_MEMFD_HUGETLB, /* -object memory-backend-memfd.hugetlb */
     QEMU_CAPS_IOTHREAD_POLLING, /* -object iothread.poll-max-ns */
+
+    /* 230 */
     QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, /* -machine pseries.cap-nested-hv */
     QEMU_CAPS_EGL_HEADLESS_RENDERNODE, /* -display egl-headless,rendernode= */
     QEMU_CAPS_OBJECT_MEMORY_FILE_ALIGN, /* -object memory-backend-file,align= */
-
-    /* 325 */
     QEMU_CAPS_OBJECT_MEMORY_FILE_PMEM, /* -object memory-backend-file,pmem= */
     QEMU_CAPS_DEVICE_NVDIMM_UNARMED, /* -device nvdimm,unarmed= */
+
+    /* 235 */
     QEMU_CAPS_SCSI_DISK_DEVICE_ID, /* 'device_id' property of scsi disk */
 
     QEMU_CAPS_LAST /* this must always be the last item */
-- 
2.19.2




More information about the libvir-list mailing list