tests: qemucapabilities: Update capabilities for qemu-5.2 release (x86_64)

qemu-5.2 is out! Let's update the capabilities for the final version.

Note that the 'enable-fips' feature vanishing in this update is expected
as the removal was tied to a version check (see commit 7b1ed1cd733a0 ).

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
index 140a3312a545d8c0a2efde075d1dad49436927d5..6988ae010f3625bd8369ba7737adbdfbfc918e8d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
@@ -17,11 +17,11 @@
 {
   "return": {
     "qemu": {
-      "micro": 91,
-      "minor": 1,
+      "micro": 0,
+      "minor": 2,
       "major": 5
     },
-    "package": "v5.2.0-rc1"
+    "package": "v5.2.0"
   },
   "id": "libvirt-2"
 }
@@ -1154,8 +1154,8 @@
       "parent": "sys-bus-device"
     },
     {
-      "name": "pc-q35-2.8-machine",
-      "parent": "generic-pc-machine"
+      "name": "i82557a",
+      "parent": "pci-device"
     },
     {
       "name": "vhost-user-scsi-pci-non-transitional",
@@ -1170,12 +1170,12 @@
       "parent": "chardev"
     },
     {
-      "name": "generic-sdhci",
-      "parent": "sys-bus-device"
+      "name": "pc-q35-2.8-machine",
+      "parent": "generic-pc-machine"
     },
     {
-      "name": "i82557a",
-      "parent": "pci-device"
+      "name": "generic-sdhci",
+      "parent": "sys-bus-device"
     },
     {
       "name": "virtio-scsi-pci-non-transitional",
@@ -1310,12 +1310,12 @@
       "parent": "ide-device"
     },
     {
-      "name": "tcg-accel",
-      "parent": "accel"
+      "name": "EPYC-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
-      "name": "piix4-ide",
-      "parent": "pci-ide"
+      "name": "tcg-accel",
+      "parent": "accel"
     },
     {
       "name": "virtio-balloon-pci",
@@ -1350,24 +1350,24 @@
       "parent": "pci-device"
     },
     {
-      "name": "i82551",
-      "parent": "pci-device"
-    },
-    {
-      "name": "EPYC-v1-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "pc-i440fx-2.6-machine",
+      "parent": "generic-pc-machine"
     },
     {
       "name": "isa-ipmi-kcs",
       "parent": "isa-device"
     },
+    {
+      "name": "i82551",
+      "parent": "pci-device"
+    },
     {
       "name": "Icelake-Server-noTSX-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
     {
-      "name": "pc-i440fx-2.6-machine",
-      "parent": "generic-pc-machine"
+      "name": "piix4-ide",
+      "parent": "pci-ide"
     },
     {
       "name": "SandyBridge-x86_64-cpu",
@@ -1405,14 +1405,14 @@
       "name": "kvm-apic",
       "parent": "apic-common"
     },
-    {
-      "name": "kvm64-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "isa-pit",
       "parent": "pit-common"
     },
+    {
+      "name": "kvm64-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "Broadwell-v4-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -1461,14 +1461,14 @@
       "name": "ati-vga",
       "parent": "pci-device"
     },
-    {
-      "name": "pentium3-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "kvm-i8259",
       "parent": "pic-common"
     },
+    {
+      "name": "pentium3-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "isa-serial",
       "parent": "isa-device"
@@ -1485,6 +1485,10 @@
       "name": "vhost-user-blk-pci-non-transitional",
       "parent": "vhost-user-blk-pci-base"
     },
+    {
+      "name": "virtio-rng-pci-non-transitional",
+      "parent": "virtio-rng-pci-base"
+    },
     {
       "name": "cirrus-vga",
       "parent": "pci-device"
@@ -1501,17 +1505,13 @@
       "name": "pc-i440fx-2.1-machine",
       "parent": "generic-pc-machine"
     },
-    {
-      "name": "virtio-serial-pci",
-      "parent": "virtio-serial-pci-base"
-    },
     {
       "name": "i82559er",
       "parent": "pci-device"
     },
     {
-      "name": "virtio-rng-pci-non-transitional",
-      "parent": "virtio-rng-pci-base"
+      "name": "virtio-serial-pci",
+      "parent": "virtio-serial-pci-base"
     },
     {
       "name": "Skylake-Client-x86_64-cpu",
@@ -1750,11 +1750,11 @@
       "parent": "base-sysbus-fdc"
     },
     {
-      "name": "AMDVI-PCI",
+      "name": "i82559c",
       "parent": "pci-device"
     },
     {
-      "name": "i82559c",
+      "name": "AMDVI-PCI",
       "parent": "pci-device"
     },
     {
@@ -1989,14 +1989,14 @@
       "name": "usb-ehci",
       "parent": "pci-ehci-usb"
     },
-    {
-      "name": "pc-i440fx-2.11-machine",
-      "parent": "generic-pc-machine"
-    },
     {
       "name": "pxb",
       "parent": "pci-device"
     },
+    {
+      "name": "pc-i440fx-2.11-machine",
+      "parent": "generic-pc-machine"
+    },
     {
       "name": "AC97",
       "parent": "pci-device"
@@ -2026,8 +2026,8 @@
       "parent": "isa-device"
     },
     {
-      "name": "virtio-iommu-pci-non-transitional",
-      "parent": "virtio-iommu-device-base"
+      "name": "hyperv-testdev",
+      "parent": "isa-device"
     },
     {
       "name": "scsi-hd",
@@ -2074,28 +2074,28 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "hyperv-testdev",
-      "parent": "isa-device"
+      "name": "virtio-iommu-pci-non-transitional",
+      "parent": "virtio-iommu-device-base"
     },
     {
       "name": "s3c-sdhci",
       "parent": "generic-sdhci"
     },
     {
-      "name": "Westmere-v2-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "tpm-tis",
+      "parent": "isa-device"
     },
     {
       "name": "fw_cfg_mem",
       "parent": "fw_cfg"
     },
     {
-      "name": "ccid-card-emulated",
-      "parent": "ccid-card"
+      "name": "Westmere-v2-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
-      "name": "tpm-tis",
-      "parent": "isa-device"
+      "name": "ccid-card-emulated",
+      "parent": "ccid-card"
     },
     {
       "name": "pc-q35-5.1-machine",
@@ -2517,14 +2517,14 @@
       "name": "vhost-user-gpu",
       "parent": "virtio-gpu-base"
     },
-    {
-      "name": "hda-duplex",
-      "parent": "hda-audio"
-    },
     {
       "name": "pentium-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "hda-duplex",
+      "parent": "hda-audio"
+    },
     {
       "name": "amd-iommu-iommu-memory-region",
       "parent": "qemu:iommu-memory-region"
@@ -2533,10 +2533,6 @@
       "name": "can-bus",
       "parent": "object"
     },
-    {
-      "name": "virtio-balloon-device",
-      "parent": "virtio-device"
-    },
     {
       "name": "Cooperlake-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -2545,14 +2541,18 @@
       "name": "Cascadelake-Server-v3-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
-    {
-      "name": "Nehalem-IBRS-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "cfi.pflash01",
       "parent": "sys-bus-device"
     },
+    {
+      "name": "virtio-balloon-device",
+      "parent": "virtio-device"
+    },
+    {
+      "name": "Nehalem-IBRS-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "pc-q35-2.7-machine",
       "parent": "generic-pc-machine"
@@ -2782,8 +2782,8 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "kvm64-v1-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "pcie-root-port",
+      "parent": "pcie-root-port-base"
     },
     {
       "name": "IDE",
@@ -2793,10 +2793,6 @@
       "name": "486-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
-    {
-      "name": "pcie-root-port",
-      "parent": "pcie-root-port-base"
-    },
     {
       "name": "mptsas1068",
       "parent": "pci-device"
@@ -2805,6 +2801,10 @@
       "name": "scsi-block",
       "parent": "scsi-disk-base"
     },
+    {
+      "name": "kvm64-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "Snowridge-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -4006,11 +4006,6 @@
       "name": "x-no-kvm-msix",
       "type": "bool"
     },
-    {
-      "default-value": false,
-      "name": "x-no-mmap",
-      "type": "bool"
-    },
     {
       "default-value": 0,
       "name": "yres",
@@ -4022,6 +4017,17 @@
       "description": "on/off",
       "type": "bool"
     },
+    {
+      "default-value": "on",
+      "name": "x-pre-copy-dirty-page-tracking",
+      "description": "on/off/auto",
+      "type": "OnOffAuto"
+    },
+    {
+      "name": "x-nv-gpudirect-clique",
+      "description": "NVIDIA GPUDirect Clique ID (0 - 15)",
+      "type": "uint4"
+    },
     {
       "default-value": "off",
       "name": "x-msix-relocation",
@@ -4057,6 +4063,11 @@
       "name": "x-pci-sub-vendor-id",
       "type": "uint32"
     },
+    {
+      "default-value": false,
+      "name": "x-enable-migration",
+      "type": "bool"
+    },
     {
       "default-value": false,
       "name": "x-no-geforce-quirks",
@@ -4106,9 +4117,9 @@
       "type": "bool"
     },
     {
-      "name": "x-nv-gpudirect-clique",
-      "description": "NVIDIA GPUDirect Clique ID (0 - 15)",
-      "type": "uint4"
+      "default-value": 4294967295,
+      "name": "x-pci-vendor-id",
+      "type": "uint32"
     },
     {
       "default-value": 0,
@@ -4116,9 +4127,9 @@
       "type": "uint32"
     },
     {
-      "default-value": 4294967295,
-      "name": "x-pci-vendor-id",
-      "type": "uint32"
+      "default-value": false,
+      "name": "x-no-mmap",
+      "type": "bool"
     },
     {
       "default-value": false,
@@ -4809,7 +4820,6 @@
     {
       "default-value": false,
       "name": "removable",
-      "description": "on/off",
       "type": "bool"
     },
     {
@@ -4834,6 +4844,11 @@
       "name": "opt_io_size",
       "type": "size"
     },
+    {
+      "default-value": false,
+      "name": "commandlog",
+      "type": "bool"
+    },
     {
       "name": "drive",
       "description": "Node name or ID of a block device to use as a backend",
@@ -10724,6 +10739,170 @@
       ],
       "option": "vnc"
     },
+    {
+      "parameters": [
+        {
+          "name": "resourcecontrol",
+          "type": "string"
+        },
+        {
+          "name": "spawn",
+          "type": "string"
+        },
+        {
+          "name": "elevateprivileges",
+          "type": "string"
+        },
+        {
+          "name": "obsolete",
+          "type": "string"
+        },
+        {
+          "name": "enable",
+          "type": "boolean"
+        }
+      ],
+      "option": "sandbox"
+    },
+    {
+      "parameters": [
+      ],
+      "option": "smbios"
+    },
+    {
+      "parameters": [
+        {
+          "name": "rendernode",
+          "type": "string"
+        },
+        {
+          "name": "gl",
+          "type": "boolean"
+        },
+        {
+          "name": "head",
+          "type": "number"
+        },
+        {
+          "name": "display",
+          "type": "string"
+        },
+        {
+          "name": "seamless-migration",
+          "type": "boolean"
+        },
+        {
+          "name": "playback-compression",
+          "type": "boolean"
+        },
+        {
+          "name": "agent-mouse",
+          "type": "boolean"
+        },
+        {
+          "name": "streaming-video",
+          "type": "string"
+        },
+        {
+          "name": "zlib-glz-wan-compression",
+          "type": "string"
+        },
+        {
+          "name": "jpeg-wan-compression",
+          "type": "string"
+        },
+        {
+          "name": "image-compression",
+          "type": "string"
+        },
+        {
+          "name": "plaintext-channel",
+          "type": "string"
+        },
+        {
+          "name": "tls-channel",
+          "type": "string"
+        },
+        {
+          "name": "tls-ciphers",
+          "type": "string"
+        },
+        {
+          "name": "x509-dh-key-file",
+          "type": "string"
+        },
+        {
+          "name": "x509-cacert-file",
+          "type": "string"
+        },
+        {
+          "name": "x509-cert-file",
+          "type": "string"
+        },
+        {
+          "name": "x509-key-password",
+          "type": "string"
+        },
+        {
+          "name": "x509-key-file",
+          "type": "string"
+        },
+        {
+          "name": "x509-dir",
+          "type": "string"
+        },
+        {
+          "name": "sasl",
+          "type": "boolean"
+        },
+        {
+          "name": "disable-agent-file-xfer",
+          "type": "boolean"
+        },
+        {
+          "name": "disable-copy-paste",
+          "type": "boolean"
+        },
+        {
+          "name": "disable-ticketing",
+          "type": "boolean"
+        },
+        {
+          "name": "password",
+          "type": "string"
+        },
+        {
+          "name": "unix",
+          "type": "boolean"
+        },
+        {
+          "name": "ipv6",
+          "type": "boolean"
+        },
+        {
+          "name": "ipv4",
+          "type": "boolean"
+        },
+        {
+          "name": "addr",
+          "type": "string"
+        },
+        {
+          "name": "tls-port",
+          "type": "number"
+        },
+        {
+          "name": "port",
+          "type": "number"
+        }
+      ],
+      "option": "spice"
+    },
+    {
+      "parameters": [
+      ],
+      "option": "acpi"
+    },
     {
       "parameters": [
         {
@@ -10913,170 +11092,6 @@
       ],
       "option": "fsdev"
     },
-    {
-      "parameters": [
-        {
-          "name": "rendernode",
-          "type": "string"
-        },
-        {
-          "name": "gl",
-          "type": "boolean"
-        },
-        {
-          "name": "head",
-          "type": "number"
-        },
-        {
-          "name": "display",
-          "type": "string"
-        },
-        {
-          "name": "seamless-migration",
-          "type": "boolean"
-        },
-        {
-          "name": "playback-compression",
-          "type": "boolean"
-        },
-        {
-          "name": "agent-mouse",
-          "type": "boolean"
-        },
-        {
-          "name": "streaming-video",
-          "type": "string"
-        },
-        {
-          "name": "zlib-glz-wan-compression",
-          "type": "string"
-        },
-        {
-          "name": "jpeg-wan-compression",
-          "type": "string"
-        },
-        {
-          "name": "image-compression",
-          "type": "string"
-        },
-        {
-          "name": "plaintext-channel",
-          "type": "string"
-        },
-        {
-          "name": "tls-channel",
-          "type": "string"
-        },
-        {
-          "name": "tls-ciphers",
-          "type": "string"
-        },
-        {
-          "name": "x509-dh-key-file",
-          "type": "string"
-        },
-        {
-          "name": "x509-cacert-file",
-          "type": "string"
-        },
-        {
-          "name": "x509-cert-file",
-          "type": "string"
-        },
-        {
-          "name": "x509-key-password",
-          "type": "string"
-        },
-        {
-          "name": "x509-key-file",
-          "type": "string"
-        },
-        {
-          "name": "x509-dir",
-          "type": "string"
-        },
-        {
-          "name": "sasl",
-          "type": "boolean"
-        },
-        {
-          "name": "disable-agent-file-xfer",
-          "type": "boolean"
-        },
-        {
-          "name": "disable-copy-paste",
-          "type": "boolean"
-        },
-        {
-          "name": "disable-ticketing",
-          "type": "boolean"
-        },
-        {
-          "name": "password",
-          "type": "string"
-        },
-        {
-          "name": "unix",
-          "type": "boolean"
-        },
-        {
-          "name": "ipv6",
-          "type": "boolean"
-        },
-        {
-          "name": "ipv4",
-          "type": "boolean"
-        },
-        {
-          "name": "addr",
-          "type": "string"
-        },
-        {
-          "name": "tls-port",
-          "type": "number"
-        },
-        {
-          "name": "port",
-          "type": "number"
-        }
-      ],
-      "option": "spice"
-    },
-    {
-      "parameters": [
-        {
-          "name": "resourcecontrol",
-          "type": "string"
-        },
-        {
-          "name": "spawn",
-          "type": "string"
-        },
-        {
-          "name": "elevateprivileges",
-          "type": "string"
-        },
-        {
-          "name": "obsolete",
-          "type": "string"
-        },
-        {
-          "name": "enable",
-          "type": "boolean"
-        }
-      ],
-      "option": "sandbox"
-    },
-    {
-      "parameters": [
-      ],
-      "option": "acpi"
-    },
-    {
-      "parameters": [
-      ],
-      "option": "smbios"
-    },
     {
       "parameters": [
         {

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 5e9fa8575afcb4b2acb767eeabfc8092ed5b048e..cebacc249da86b334146fca0d653f75d096bc9b8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -68,7 +68,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='boot-strict'/>
   <flag name='pvpanic'/>
-  <flag name='enable-fips'/>
   <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
@@ -251,10 +250,10 @@
   <flag name='fsdev.createmode'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
-  <version>5001091</version>
+  <version>5002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
-  <package>v5.2.0-rc1</package>
+  <package>v5.2.0</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
     <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/>

diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args
index c06046c3984d939c046e07ba317417eeaf039e99..4740e52499d16aa9af1961c269dbb7c247488441 100644 (file)
--- a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args
@@ -12,7 +12,6 @@ QEMU_AUDIO_DRV=none \
 -S \
 -object secret,id=masterKey0,format=raw,\
 file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--enable-fips \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -cpu qemu64 \
 -m 214 \