From 6ed121924459bc5c94529618e37ed1b0697c5164 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 22 Apr 2020 12:39:10 +0200
Subject: [PATCH] qemucapstest: Refresh data for qemu 5.0 on x86_64
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bump to v5.0.0-rc3-8-g3119154db0 and make sure that 'liburing' is picked
up by qemu.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 .../caps_5.0.0.x86_64.replies                 | 99 +++++++++++++++++--
 .../caps_5.0.0.x86_64.xml                     | 68 ++++++++++++-
 2 files changed, 156 insertions(+), 11 deletions(-)

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
index af2299a41e..39b6d4f182 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
@@ -17,11 +17,11 @@
 {
   "return": {
     "qemu": {
-      "micro": 91,
+      "micro": 93,
       "minor": 2,
       "major": 4
     },
-    "package": "v5.0.0-rc1"
+    "package": "v5.0.0-rc3-8-g3119154db0"
   },
   "id": "libvirt-2"
 }
@@ -882,6 +882,10 @@
       "name": "tpm-passthrough",
       "parent": "tpm-backend"
     },
+    {
+      "name": "Icelake-Server-v3-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "pentium3-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -1291,8 +1295,8 @@
       "parent": "base-xhci"
     },
     {
-      "name": "pc-i440fx-2.6-machine",
-      "parent": "generic-pc-machine"
+      "name": "mioe3680_pci",
+      "parent": "pci-device"
     },
     {
       "name": "i82551",
@@ -1315,11 +1319,11 @@
       "parent": "pci-ide"
     },
     {
-      "name": "nvme",
-      "parent": "pci-device"
+      "name": "pc-i440fx-2.6-machine",
+      "parent": "generic-pc-machine"
     },
     {
-      "name": "vmxnet3",
+      "name": "nvme",
       "parent": "pci-device"
     },
     {
@@ -1327,7 +1331,7 @@
       "parent": "object"
     },
     {
-      "name": "mioe3680_pci",
+      "name": "vmxnet3",
       "parent": "pci-device"
     },
     {
@@ -9055,6 +9059,39 @@
       "static": false,
       "migration-safe": true
     },
+    {
+      "name": "Icelake-Server-v3",
+      "typename": "Icelake-Server-v3-x86_64-cpu",
+      "unavailable-features": [
+        "avx512f",
+        "avx512dq",
+        "clwb",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "avx512vbmi",
+        "pku",
+        "avx512vbmi2",
+        "gfni",
+        "vaes",
+        "vpclmulqdq",
+        "avx512vnni",
+        "avx512bitalg",
+        "avx512-vpopcntdq",
+        "la57",
+        "wbnoinvd",
+        "avx512f",
+        "avx512f",
+        "avx512f",
+        "pku",
+        "rdctl-no",
+        "ibrs-all",
+        "mds-no",
+        "taa-no"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
     {
       "name": "Icelake-Server-v2",
       "typename": "Icelake-Server-v2-x86_64-cpu",
@@ -22244,7 +22281,8 @@
       "meta-type": "enum",
       "values": [
         "threads",
-        "native"
+        "native",
+        "io_uring"
       ]
     },
     {
@@ -26527,6 +26565,49 @@
       "static": false,
       "migration-safe": true
     },
+    {
+      "name": "Icelake-Server-v3",
+      "typename": "Icelake-Server-v3-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "avx2",
+        "invpcid",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "avx512vbmi",
+        "umip",
+        "avx512vbmi2",
+        "gfni",
+        "vaes",
+        "vpclmulqdq",
+        "avx512vnni",
+        "avx512bitalg",
+        "avx512-vpopcntdq",
+        "spec-ctrl",
+        "arch-capabilities",
+        "ssbd",
+        "3dnowprefetch",
+        "wbnoinvd",
+        "xsavec",
+        "rdctl-no",
+        "ibrs-all",
+        "skip-l1dfl-vmentry",
+        "mds-no",
+        "pschange-mc-no",
+        "taa-no"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
     {
       "name": "Icelake-Server-v2",
       "typename": "Icelake-Server-v2-x86_64-cpu",
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 496d0e90d7..d524340843 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -230,10 +230,10 @@
   <flag name='fsdev.multidevs'/>
   <flag name='virtio.packed'/>
   <flag name='pcie-root-port.hotplug'/>
-  <version>4002091</version>
+  <version>4002093</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100241</microcodeVersion>
-  <package>v5.0.0-rc1</package>
+  <package>v5.0.0-rc3-8-g3119154db0</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
     <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/>
@@ -780,6 +780,33 @@
   <cpu type='kvm' name='IvyBridge-v1' typename='IvyBridge-v1-x86_64-cpu' usable='yes'/>
   <cpu type='kvm' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='yes'/>
   <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Icelake-Server-v3' typename='Icelake-Server-v3-x86_64-cpu' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='clwb'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='avx512vbmi'/>
+    <blocker name='pku'/>
+    <blocker name='avx512vbmi2'/>
+    <blocker name='gfni'/>
+    <blocker name='vaes'/>
+    <blocker name='vpclmulqdq'/>
+    <blocker name='avx512vnni'/>
+    <blocker name='avx512bitalg'/>
+    <blocker name='avx512-vpopcntdq'/>
+    <blocker name='la57'/>
+    <blocker name='wbnoinvd'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='pku'/>
+    <blocker name='rdctl-no'/>
+    <blocker name='ibrs-all'/>
+    <blocker name='mds-no'/>
+    <blocker name='taa-no'/>
+  </cpu>
   <cpu type='kvm' name='Icelake-Server-v2' typename='Icelake-Server-v2-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
@@ -1978,6 +2005,43 @@
     <blocker name='avx'/>
     <blocker name='f16c'/>
   </cpu>
+  <cpu type='tcg' name='Icelake-Server-v3' typename='Icelake-Server-v3-x86_64-cpu' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='pcid'/>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='avx2'/>
+    <blocker name='invpcid'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='rdseed'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='avx512vbmi'/>
+    <blocker name='umip'/>
+    <blocker name='avx512vbmi2'/>
+    <blocker name='gfni'/>
+    <blocker name='vaes'/>
+    <blocker name='vpclmulqdq'/>
+    <blocker name='avx512vnni'/>
+    <blocker name='avx512bitalg'/>
+    <blocker name='avx512-vpopcntdq'/>
+    <blocker name='spec-ctrl'/>
+    <blocker name='arch-capabilities'/>
+    <blocker name='ssbd'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='wbnoinvd'/>
+    <blocker name='xsavec'/>
+    <blocker name='rdctl-no'/>
+    <blocker name='ibrs-all'/>
+    <blocker name='skip-l1dfl-vmentry'/>
+    <blocker name='mds-no'/>
+    <blocker name='pschange-mc-no'/>
+    <blocker name='taa-no'/>
+  </cpu>
   <cpu type='tcg' name='Icelake-Server-v2' typename='Icelake-Server-v2-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>