[libvirt] [PATCH] tests: Update x86_64 replies, caps to QEMU 2.12

John Ferlan posted 1 patch 5 years, 11 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20180510194616.22870-1-jferlan@redhat.com
Test syntax-check passed
tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml  |  14 +-
.../caps_2.12.0.x86_64.replies                     | 328 +++++++++++++--------
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  |  57 ++--
3 files changed, 235 insertions(+), 164 deletions(-)
[libvirt] [PATCH] tests: Update x86_64 replies, caps to QEMU 2.12
Posted by John Ferlan 5 years, 11 months ago
Using a QEMU 2.12 tagged tree build and full build, used:

tests/qemucapsprobe /home/qemu/x64_64-softmmu/qemu-system-x86_64 > \
    tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies

VIR_TEST_REGENERATE_OUTPUT=1 tests/qemucapabilitiestest
VIR_TEST_REGENERATE_OUTPUT=1 tests/domaincapstest

Signed-off-by: John Ferlan <jferlan@redhat.com>
---

 Seems like a bit of change since 2.12-rc0, but for the most part
 it was parameter reorganization and cpudef differences. I'm never
 quite sure if it's using something from my host on those or something
 that is modeled.

 I did make a somewhat feeble attempt at doing something similar for
 other arches, but gave up because I never could figure out the magic
 incantation or rpm's to install in order to get libvirt to actually
 build on a "fresh" aarch64 system (it's where I started). I found even
 just cloning the libvirt.git repo resulted in a number "modified" tests/
 virhostcpudata/linux-test*/node/node*/cpu* files that were modified and
 then attempting an autogen.sh would fail because README got deleted.

 If someone wants to do all 4 in one commit - I'm happy to drop this.
 Just figured I'd get the ball rolling before the end of the month.

 tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml  |  14 +-
 .../caps_2.12.0.x86_64.replies                     | 328 +++++++++++++--------
 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  |  57 ++--
 3 files changed, 235 insertions(+), 164 deletions(-)

diff --git a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml
index d0e2866c49..9d752a0146 100644
--- a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml
@@ -23,10 +23,11 @@
   <cpu>
     <mode name='host-passthrough' supported='yes'/>
     <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>Haswell-noTSX</model>
+      <model fallback='forbid'>Haswell-noTSX-IBRS</model>
       <vendor>Intel</vendor>
       <feature policy='require' name='vme'/>
       <feature policy='require' name='ss'/>
+      <feature policy='require' name='vmx'/>
       <feature policy='require' name='f16c'/>
       <feature policy='require' name='rdrand'/>
       <feature policy='require' name='hypervisor'/>
@@ -36,6 +37,7 @@
       <feature policy='require' name='pdpe1gb'/>
       <feature policy='require' name='abm'/>
       <feature policy='require' name='invtsc'/>
+      <feature policy='require' name='ibpb'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes'>qemu64</model>
@@ -51,13 +53,13 @@
       <model usable='yes'>core2duo</model>
       <model usable='no'>athlon</model>
       <model usable='yes'>Westmere</model>
-      <model usable='no'>Westmere-IBRS</model>
+      <model usable='yes'>Westmere-IBRS</model>
       <model usable='no'>Skylake-Server</model>
       <model usable='no'>Skylake-Server-IBRS</model>
       <model usable='no'>Skylake-Client</model>
       <model usable='no'>Skylake-Client-IBRS</model>
       <model usable='yes'>SandyBridge</model>
-      <model usable='no'>SandyBridge-IBRS</model>
+      <model usable='yes'>SandyBridge-IBRS</model>
       <model usable='yes'>Penryn</model>
       <model usable='no'>Opteron_G5</model>
       <model usable='no'>Opteron_G4</model>
@@ -65,12 +67,12 @@
       <model usable='yes'>Opteron_G2</model>
       <model usable='yes'>Opteron_G1</model>
       <model usable='yes'>Nehalem</model>
-      <model usable='no'>Nehalem-IBRS</model>
+      <model usable='yes'>Nehalem-IBRS</model>
       <model usable='yes'>IvyBridge</model>
-      <model usable='no'>IvyBridge-IBRS</model>
+      <model usable='yes'>IvyBridge-IBRS</model>
       <model usable='no'>Haswell</model>
       <model usable='yes'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
+      <model usable='yes'>Haswell-noTSX-IBRS</model>
       <model usable='no'>Haswell-IBRS</model>
       <model usable='no'>EPYC</model>
       <model usable='no'>EPYC-IBPB</model>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
index c086e04afd..a5ffffc0b7 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
@@ -2,14 +2,13 @@
   "QMP": {
     "version": {
       "qemu": {
-        "micro": 90,
-        "minor": 11,
+        "micro": 0,
+        "minor": 12,
         "major": 2
       },
-      "package": "v2.12.0-rc0"
+      "package": "v2.12.0"
     },
     "capabilities": [
-      "oob"
     ]
   }
 }
@@ -23,11 +22,11 @@
 {
   "return": {
     "qemu": {
-      "micro": 90,
-      "minor": 11,
+      "micro": 0,
+      "minor": 12,
       "major": 2
     },
-    "package": "v2.12.0-rc0"
+    "package": "v2.12.0"
   },
   "id": "libvirt-2"
 }
@@ -536,7 +535,7 @@
 
 {
   "return": {
-    "fd": 19,
+    "fd": 17,
     "fdset-id": 0
   },
   "id": "libvirt-5"
@@ -735,6 +734,10 @@
       "name": "virtio-keyboard-pci",
       "parent": "virtio-input-hid-pci"
     },
+    {
+      "name": "xen-sysbus",
+      "parent": "bus"
+    },
     {
       "name": "i440FX",
       "parent": "pci-device"
@@ -767,6 +770,10 @@
       "name": "chardev-pty",
       "parent": "chardev"
     },
+    {
+      "name": "xen-apic",
+      "parent": "apic-common"
+    },
     {
       "name": "SUNW,fdtwo",
       "parent": "base-sysbus-fdc"
@@ -1023,6 +1030,10 @@
       "name": "pc-testdev",
       "parent": "isa-device"
     },
+    {
+      "name": "xen-backend",
+      "parent": "xen-sysdev"
+    },
     {
       "name": "Haswell-noTSX-IBRS-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -1063,6 +1074,10 @@
       "name": "virtio-balloon-pci",
       "parent": "virtio-pci"
     },
+    {
+      "name": "chardev-socket",
+      "parent": "chardev"
+    },
     {
       "name": "iothread",
       "parent": "object"
@@ -1072,13 +1087,9 @@
       "parent": "isa-device"
     },
     {
-      "name": "chardev-socket",
+      "name": "chardev-mux",
       "parent": "chardev"
     },
-    {
-      "name": "486-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "pc-q35-2.7-machine",
       "parent": "generic-pc-machine"
@@ -1088,8 +1099,8 @@
       "parent": "generic-pc-machine"
     },
     {
-      "name": "chardev-mux",
-      "parent": "chardev"
+      "name": "486-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "filter-redirector",
@@ -1223,14 +1234,14 @@
       "name": "chardev-msmouse",
       "parent": "chardev"
     },
-    {
-      "name": "pc-q35-2.9-machine",
-      "parent": "generic-pc-machine"
-    },
     {
       "name": "chardev-pipe",
       "parent": "chardev-fd"
     },
+    {
+      "name": "pc-q35-2.9-machine",
+      "parent": "generic-pc-machine"
+    },
     {
       "name": "pc-i440fx-1.7-machine",
       "parent": "generic-pc-machine"
@@ -1419,6 +1430,10 @@
       "name": "chardev-file",
       "parent": "chardev-fd"
     },
+    {
+      "name": "xen-sysdev",
+      "parent": "sys-bus-device"
+    },
     {
       "name": "intel-iommu",
       "parent": "x86-iommu"
@@ -1483,6 +1498,10 @@
       "name": "ccid-bus",
       "parent": "bus"
     },
+    {
+      "name": "xenpv-machine",
+      "parent": "machine"
+    },
     {
       "name": "EPYC-IBPB-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -1815,6 +1834,10 @@
       "name": "pc-i440fx-2.2-machine",
       "parent": "generic-pc-machine"
     },
+    {
+      "name": "xen-pci-passthrough",
+      "parent": "pci-device"
+    },
     {
       "name": "cryptodev-backend",
       "parent": "object"
@@ -1947,10 +1970,18 @@
       "name": "virtio-scsi-pci",
       "parent": "virtio-pci"
     },
+    {
+      "name": "piix3-ide",
+      "parent": "pci-ide"
+    },
     {
       "name": "ES1370",
       "parent": "pci-device"
     },
+    {
+      "name": "xen-pvdevice",
+      "parent": "pci-device"
+    },
     {
       "name": "virtio-pci-bus",
       "parent": "virtio-bus"
@@ -1960,8 +1991,8 @@
       "parent": "pcie-port"
     },
     {
-      "name": "piix3-ide",
-      "parent": "pci-ide"
+      "name": "xenfv-machine",
+      "parent": "generic-pc-machine"
     },
     {
       "name": "pci-testdev",
@@ -2015,6 +2046,10 @@
       "name": "pc-i440fx-2.6-machine",
       "parent": "generic-pc-machine"
     },
+    {
+      "name": "xen-platform",
+      "parent": "pci-device"
+    },
     {
       "name": "chardev-serial",
       "parent": "chardev-fd"
@@ -2111,6 +2146,10 @@
       "name": "isa-applesmc",
       "parent": "isa-device"
     },
+    {
+      "name": "xen-accel",
+      "parent": "accel"
+    },
     {
       "name": "secret",
       "parent": "object"
@@ -3192,102 +3231,93 @@
 {
   "return": [
     {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "port_index",
+      "name": "min_io_size",
       "type": "uint16"
     },
     {
-      "name": "dpofua",
+      "name": "removable",
       "description": "on/off",
       "type": "bool"
     },
     {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "logical_block_size",
-      "description": "A power of two between 512 and 32768",
-      "type": "uint16"
+      "name": "channel",
+      "type": "uint32"
     },
     {
-      "name": "discard_granularity",
-      "type": "uint32"
+      "name": "serial",
+      "type": "str"
     },
     {
       "name": "lun",
       "type": "uint32"
     },
     {
-      "name": "max_unmap_size",
-      "type": "uint64"
+      "name": "dpofua",
+      "description": "on/off",
+      "type": "bool"
     },
     {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
+      "name": "ver",
       "type": "str"
     },
     {
-      "name": "port_wwn",
-      "type": "uint64"
-    },
-    {
-      "name": "write-cache",
-      "description": "on/off/auto",
-      "type": "OnOffAuto"
-    },
-    {
-      "name": "share-rw",
-      "type": "bool"
-    },
-    {
-      "name": "opt_io_size",
+      "name": "scsi-id",
       "type": "uint32"
     },
     {
-      "name": "min_io_size",
+      "name": "logical_block_size",
+      "description": "A power of two between 512 and 32768",
       "type": "uint16"
     },
     {
-      "name": "product",
+      "name": "drive",
+      "description": "Node name or ID of a block device to use as a backend",
       "type": "str"
     },
     {
-      "name": "scsi-id",
-      "type": "uint32"
+      "name": "scsi_version",
+      "type": "int32"
     },
     {
-      "name": "channel",
+      "name": "werror",
+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
+      "type": "BlockdevOnError"
+    },
+    {
+      "name": "discard_granularity",
       "type": "uint32"
     },
     {
-      "name": "vendor",
-      "type": "str"
+      "name": "port_wwn",
+      "type": "uint64"
     },
     {
-      "name": "wwn",
+      "name": "max_unmap_size",
       "type": "uint64"
     },
     {
-      "name": "werror",
+      "name": "rerror",
       "description": "Error handling policy, report/ignore/enospc/stop/auto",
       "type": "BlockdevOnError"
     },
     {
-      "name": "removable",
-      "description": "on/off",
+      "name": "max_io_size",
+      "type": "uint64"
+    },
+    {
+      "name": "wwn",
+      "type": "uint64"
+    },
+    {
+      "name": "share-rw",
       "type": "bool"
     },
     {
-      "name": "rerror",
-      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-      "type": "BlockdevOnError"
+      "name": "product",
+      "type": "str"
     },
     {
-      "name": "ver",
+      "name": "vendor",
       "type": "str"
     },
     {
@@ -3296,8 +3326,21 @@
       "type": "uint16"
     },
     {
-      "name": "max_io_size",
-      "type": "uint64"
+      "name": "port_index",
+      "type": "uint16"
+    },
+    {
+      "name": "bootindex",
+      "type": "int32"
+    },
+    {
+      "name": "write-cache",
+      "description": "on/off/auto",
+      "type": "OnOffAuto"
+    },
+    {
+      "name": "opt_io_size",
+      "type": "uint32"
     }
   ],
   "id": "libvirt-19"
@@ -4103,6 +4146,11 @@
       "name": "vectors",
       "type": "uint32"
     },
+    {
+      "name": "iommu_platform",
+      "description": "on/off",
+      "type": "bool"
+    },
     {
       "name": "x-pcie-extcap-init",
       "description": "on/off",
@@ -4120,13 +4168,18 @@
       "name": "x-ignore-backend-features",
       "type": "bool"
     },
+    {
+      "name": "stats",
+      "description": "on/off",
+      "type": "bool"
+    },
     {
       "name": "notify_on_empty",
       "description": "on/off",
       "type": "bool"
     },
     {
-      "name": "iommu_platform",
+      "name": "virtio-pci-bus-master-bug-migration",
       "description": "on/off",
       "type": "bool"
     },
@@ -4136,7 +4189,7 @@
       "type": "bool"
     },
     {
-      "name": "virtio-pci-bus-master-bug-migration",
+      "name": "virgl",
       "description": "on/off",
       "type": "bool"
     },
@@ -4174,19 +4227,29 @@
       "name": "yres",
       "type": "uint32"
     },
+    {
+      "name": "stats",
+      "description": "on/off",
+      "type": "bool"
+    },
     {
       "name": "iommu_platform",
       "description": "on/off",
       "type": "bool"
     },
     {
-      "name": "max_outputs",
+      "name": "xres",
       "type": "uint32"
     },
     {
-      "name": "xres",
+      "name": "max_outputs",
       "type": "uint32"
     },
+    {
+      "name": "virgl",
+      "description": "on/off",
+      "type": "bool"
+    },
     {
       "name": "max_hostmem",
       "type": "size"
@@ -4657,6 +4720,11 @@
       "name": "pc-i440fx-2.7",
       "cpu-max": 255
     },
+    {
+      "hotpluggable-cpus": true,
+      "name": "xenfv",
+      "cpu-max": 128
+    },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-2.3",
@@ -4698,6 +4766,11 @@
       "cpu-max": 288,
       "alias": "q35"
     },
+    {
+      "hotpluggable-cpus": false,
+      "name": "xenpv",
+      "cpu-max": 1
+    },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-2.10",
@@ -4947,7 +5020,6 @@
       "name": "Westmere-IBRS",
       "typename": "Westmere-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -4997,7 +5069,6 @@
         "avx512cd",
         "avx512bw",
         "avx512vl",
-        "spec-ctrl",
         "3dnowprefetch",
         "xsavec",
         "xgetbv1",
@@ -5039,7 +5110,6 @@
         "rdseed",
         "adx",
         "smap",
-        "spec-ctrl",
         "3dnowprefetch",
         "xsavec",
         "xgetbv1",
@@ -5061,7 +5131,6 @@
       "name": "SandyBridge-IBRS",
       "typename": "SandyBridge-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5139,7 +5208,6 @@
       "name": "Nehalem-IBRS",
       "typename": "Nehalem-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5156,7 +5224,6 @@
       "name": "IvyBridge-IBRS",
       "typename": "IvyBridge-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5183,7 +5250,6 @@
       "name": "Haswell-noTSX-IBRS",
       "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5193,8 +5259,7 @@
       "typename": "Haswell-IBRS-x86_64-cpu",
       "unavailable-features": [
         "hle",
-        "rtm",
-        "spec-ctrl"
+        "rtm"
       ],
       "static": false,
       "migration-safe": true
@@ -5237,7 +5302,6 @@
         "misalignsse",
         "3dnowprefetch",
         "osvw",
-        "ibpb",
         "xsavec",
         "xgetbv1"
       ],
@@ -5285,7 +5349,6 @@
         "rdseed",
         "adx",
         "smap",
-        "spec-ctrl",
         "3dnowprefetch"
       ],
       "static": false,
@@ -5300,7 +5363,6 @@
         "rdseed",
         "adx",
         "smap",
-        "spec-ctrl",
         "3dnowprefetch"
       ],
       "static": false,
@@ -5462,6 +5524,14 @@
     },
     {
       "parameters": [
+        {
+          "name": "rendernode",
+          "type": "string"
+        },
+        {
+          "name": "gl",
+          "type": "boolean"
+        },
         {
           "name": "head",
           "type": "number"
@@ -6163,6 +6233,10 @@
     },
     {
       "parameters": [
+        {
+          "name": "x-oob",
+          "type": "boolean"
+        },
         {
           "name": "pretty",
           "type": "boolean"
@@ -14309,9 +14383,9 @@
           "type": "int"
         },
         {
-          "name": "static",
+          "name": "preallocation",
           "default": null,
-          "type": "bool"
+          "type": "356"
         }
       ],
       "meta-type": "object"
@@ -18145,7 +18219,7 @@
         "pge": true,
         "avx512bitalg": false,
         "pdcm": false,
-        "model": 63,
+        "model": 60,
         "movbe": true,
         "nrip-save": false,
         "ssse3": true,
@@ -18156,7 +18230,7 @@
         "fma": true,
         "cx16": true,
         "de": true,
-        "stepping": 2,
+        "stepping": 3,
         "xsave": true,
         "clflush": true,
         "skinit": false,
@@ -18170,13 +18244,13 @@
         "osvw": false,
         "apic": true,
         "pmm": false,
-        "spec-ctrl": false,
+        "spec-ctrl": true,
         "tsc-adjust": true,
         "kvm-steal-time": true,
         "kvmclock": true,
         "lwp": false,
         "xop": false,
-        "ibpb": false,
+        "ibpb": true,
         "avx": true,
         "ospke": false,
         "acpi": false,
@@ -18191,7 +18265,7 @@
         "vaes": false,
         "xsaves": false,
         "lm": true,
-        "umip": false,
+        "umip": true,
         "pse": true,
         "avx2": true,
         "sep": true,
@@ -18215,22 +18289,22 @@
         "fxsr-opt": false,
         "xstore": false,
         "rtm": false,
-        "kvm-hint-dedicated": true,
+        "kvm-hint-dedicated": false,
         "lmce": true,
         "perfctr-nb": false,
         "rdrand": true,
         "rdseed": false,
         "avx512-4vnniw": false,
         "vme": true,
-        "vmx": false,
+        "vmx": true,
         "dtes64": false,
         "mtrr": true,
         "rdtscp": true,
         "pse36": true,
-        "kvm-pv-tlb-flush": false,
+        "kvm-pv-tlb-flush": true,
         "tbm": false,
         "wdt": false,
-        "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
+        "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz",
         "sha-ni": false,
         "abm": true,
         "avx512pf": false,
@@ -18260,6 +18334,7 @@
         "xsavec": false,
         "intel-pt": false,
         "osxsave": false,
+        "hv-frequencies": false,
         "tsc-frequency": 0,
         "xd": true,
         "hv-vendor-id": "",
@@ -18372,7 +18447,7 @@
         "nodeid_msr": false,
         "pdcm": false,
         "movbe": true,
-        "model": 63,
+        "model": 60,
         "nrip_save": false,
         "nrip-save": false,
         "kvm_pv_unhalt": true,
@@ -18385,7 +18460,7 @@
         "cx16": true,
         "de": true,
         "enforce": false,
-        "stepping": 2,
+        "stepping": 3,
         "xsave": true,
         "clflush": true,
         "skinit": false,
@@ -18404,7 +18479,7 @@
         "pmu": false,
         "pmm": false,
         "apic": true,
-        "spec-ctrl": false,
+        "spec-ctrl": true,
         "min-xlevel2": 0,
         "tsc-adjust": true,
         "tsc_adjust": true,
@@ -18413,7 +18488,7 @@
         "kvmclock": true,
         "l3-cache": true,
         "lwp": false,
-        "ibpb": false,
+        "ibpb": true,
         "xop": false,
         "avx": true,
         "ospke": false,
@@ -18431,7 +18506,7 @@
         "xsaves": false,
         "tcg-cpuid": true,
         "lm": true,
-        "umip": false,
+        "umip": true,
         "pse": true,
         "avx2": true,
         "sep": true,
@@ -18465,7 +18540,7 @@
         "hv-synic": false,
         "xstore": false,
         "fxsr_opt": false,
-        "kvm-hint-dedicated": true,
+        "kvm-hint-dedicated": false,
         "rtm": false,
         "lmce": true,
         "hv-time": false,
@@ -18475,18 +18550,18 @@
         "rdrand": true,
         "rdseed": false,
         "avx512-4vnniw": false,
-        "vmx": false,
+        "vmx": true,
         "vme": true,
         "dtes64": false,
         "mtrr": true,
         "rdtscp": true,
         "pse36": true,
-        "kvm-pv-tlb-flush": false,
+        "kvm-pv-tlb-flush": true,
         "tbm": false,
         "wdt": false,
         "pause_filter": false,
         "sha-ni": false,
-        "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
+        "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz",
         "abm": true,
         "avx512pf": false,
         "xstore-en": false
@@ -18590,7 +18665,7 @@
         "pge": true,
         "avx512bitalg": false,
         "pdcm": false,
-        "model": 63,
+        "model": 60,
         "movbe": true,
         "nrip-save": false,
         "ssse3": true,
@@ -18601,7 +18676,7 @@
         "fma": true,
         "cx16": true,
         "de": true,
-        "stepping": 2,
+        "stepping": 3,
         "xsave": true,
         "clflush": true,
         "skinit": false,
@@ -18615,13 +18690,13 @@
         "osvw": false,
         "apic": true,
         "pmm": false,
-        "spec-ctrl": false,
+        "spec-ctrl": true,
         "tsc-adjust": true,
         "kvm-steal-time": true,
         "kvmclock": true,
         "lwp": false,
         "xop": false,
-        "ibpb": false,
+        "ibpb": true,
         "avx": true,
         "ospke": false,
         "acpi": false,
@@ -18636,7 +18711,7 @@
         "vaes": false,
         "xsaves": false,
         "lm": true,
-        "umip": false,
+        "umip": true,
         "pse": true,
         "avx2": true,
         "sep": true,
@@ -18660,22 +18735,22 @@
         "fxsr-opt": false,
         "xstore": false,
         "rtm": false,
-        "kvm-hint-dedicated": true,
+        "kvm-hint-dedicated": false,
         "lmce": true,
         "perfctr-nb": false,
         "rdrand": true,
         "rdseed": false,
         "avx512-4vnniw": false,
         "vme": true,
-        "vmx": false,
+        "vmx": true,
         "dtes64": false,
         "mtrr": true,
         "rdtscp": true,
         "pse36": true,
-        "kvm-pv-tlb-flush": false,
+        "kvm-pv-tlb-flush": true,
         "tbm": false,
         "wdt": false,
-        "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
+        "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz",
         "sha-ni": false,
         "abm": true,
         "avx512pf": false,
@@ -18705,6 +18780,7 @@
         "xsavec": false,
         "intel-pt": false,
         "osxsave": false,
+        "hv-frequencies": false,
         "tsc-frequency": 0,
         "xd": true,
         "hv-vendor-id": "",
@@ -18817,7 +18893,7 @@
         "nodeid_msr": false,
         "pdcm": false,
         "movbe": true,
-        "model": 63,
+        "model": 60,
         "nrip_save": false,
         "nrip-save": false,
         "kvm_pv_unhalt": true,
@@ -18830,7 +18906,7 @@
         "cx16": true,
         "de": true,
         "enforce": false,
-        "stepping": 2,
+        "stepping": 3,
         "xsave": true,
         "clflush": true,
         "skinit": false,
@@ -18849,7 +18925,7 @@
         "pmu": false,
         "pmm": false,
         "apic": true,
-        "spec-ctrl": false,
+        "spec-ctrl": true,
         "min-xlevel2": 0,
         "tsc-adjust": true,
         "tsc_adjust": true,
@@ -18858,7 +18934,7 @@
         "kvmclock": true,
         "l3-cache": true,
         "lwp": false,
-        "ibpb": false,
+        "ibpb": true,
         "xop": false,
         "avx": true,
         "ospke": false,
@@ -18876,7 +18952,7 @@
         "xsaves": false,
         "tcg-cpuid": true,
         "lm": true,
-        "umip": false,
+        "umip": true,
         "pse": true,
         "avx2": true,
         "sep": true,
@@ -18910,7 +18986,7 @@
         "hv-synic": false,
         "xstore": false,
         "fxsr_opt": false,
-        "kvm-hint-dedicated": true,
+        "kvm-hint-dedicated": false,
         "rtm": false,
         "lmce": true,
         "hv-time": false,
@@ -18920,18 +18996,18 @@
         "rdrand": true,
         "rdseed": false,
         "avx512-4vnniw": false,
-        "vmx": false,
+        "vmx": true,
         "vme": true,
         "dtes64": false,
         "mtrr": true,
         "rdtscp": true,
         "pse36": true,
-        "kvm-pv-tlb-flush": false,
+        "kvm-pv-tlb-flush": true,
         "tbm": false,
         "wdt": false,
         "pause_filter": false,
         "sha-ni": false,
-        "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
+        "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz",
         "abm": true,
         "avx512pf": false,
         "xstore-en": false
@@ -19744,6 +19820,7 @@
         "xsavec": false,
         "intel-pt": false,
         "osxsave": false,
+        "hv-frequencies": false,
         "tsc-frequency": 0,
         "xd": true,
         "hv-vendor-id": "",
@@ -20189,6 +20266,7 @@
         "xsavec": false,
         "intel-pt": false,
         "osxsave": false,
+        "hv-frequencies": false,
         "tsc-frequency": 0,
         "xd": true,
         "hv-vendor-id": "",
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 150fbd21f3..de8445ba56 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -122,6 +122,7 @@
   <flag name='gic-version'/>
   <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
+  <flag name='virtio-gpu.virgl'/>
   <flag name='virtio-keyboard'/>
   <flag name='virtio-mouse'/>
   <flag name='virtio-tablet'/>
@@ -132,6 +133,7 @@
   <flag name='vserport-change-event'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
+  <flag name='spice-gl'/>
   <flag name='qxl.vram64_size_mb'/>
   <flag name='chardev-logfile'/>
   <flag name='debug-threads'/>
@@ -161,6 +163,7 @@
   <flag name='drive-iotune-group'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
+  <flag name='spice-rendernode'/>
   <flag name='nvdimm'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
@@ -196,10 +199,10 @@
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='tpm-crb'/>
-  <version>2011090</version>
+  <version>2012000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>390060</microcodeVersion>
-  <package>v2.12.0-rc0</package>
+  <microcodeVersion>391479</microcodeVersion>
+  <package>v2.12.0</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
     <property name='phys-bits' type='number' value='0'/>
@@ -216,6 +219,7 @@
     <property name='xsavec' type='boolean' value='false'/>
     <property name='intel-pt' type='boolean' value='false'/>
     <property name='osxsave' type='boolean' value='false'/>
+    <property name='hv-frequencies' type='boolean' value='false'/>
     <property name='tsc-frequency' type='number' value='0'/>
     <property name='xd' type='boolean' value='true' migratable='yes'/>
     <property name='hv-vendor-id' type='string' value=''/>
@@ -328,7 +332,7 @@
     <property name='nodeid_msr' type='boolean' value='false'/>
     <property name='pdcm' type='boolean' value='false'/>
     <property name='movbe' type='boolean' value='true' migratable='yes'/>
-    <property name='model' type='number' value='63'/>
+    <property name='model' type='number' value='60'/>
     <property name='nrip_save' type='boolean' value='false'/>
     <property name='nrip-save' type='boolean' value='false'/>
     <property name='kvm_pv_unhalt' type='boolean' value='true' migratable='yes'/>
@@ -341,7 +345,7 @@
     <property name='cx16' type='boolean' value='true' migratable='yes'/>
     <property name='de' type='boolean' value='true' migratable='yes'/>
     <property name='enforce' type='boolean' value='false'/>
-    <property name='stepping' type='number' value='2'/>
+    <property name='stepping' type='number' value='3'/>
     <property name='xsave' type='boolean' value='true' migratable='yes'/>
     <property name='clflush' type='boolean' value='true' migratable='yes'/>
     <property name='skinit' type='boolean' value='false'/>
@@ -360,7 +364,7 @@
     <property name='pmu' type='boolean' value='false'/>
     <property name='pmm' type='boolean' value='false'/>
     <property name='apic' type='boolean' value='true' migratable='yes'/>
-    <property name='spec-ctrl' type='boolean' value='false'/>
+    <property name='spec-ctrl' type='boolean' value='true' migratable='yes'/>
     <property name='min-xlevel2' type='number' value='0'/>
     <property name='tsc-adjust' type='boolean' value='true' migratable='yes'/>
     <property name='tsc_adjust' type='boolean' value='true' migratable='yes'/>
@@ -369,7 +373,7 @@
     <property name='kvmclock' type='boolean' value='true' migratable='yes'/>
     <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
     <property name='lwp' type='boolean' value='false'/>
-    <property name='ibpb' type='boolean' value='false'/>
+    <property name='ibpb' type='boolean' value='true' migratable='yes'/>
     <property name='xop' type='boolean' value='false'/>
     <property name='avx' type='boolean' value='true' migratable='yes'/>
     <property name='ospke' type='boolean' value='false'/>
@@ -387,7 +391,7 @@
     <property name='xsaves' type='boolean' value='false'/>
     <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
     <property name='lm' type='boolean' value='true' migratable='yes'/>
-    <property name='umip' type='boolean' value='false'/>
+    <property name='umip' type='boolean' value='true' migratable='yes'/>
     <property name='pse' type='boolean' value='true' migratable='yes'/>
     <property name='avx2' type='boolean' value='true' migratable='yes'/>
     <property name='sep' type='boolean' value='true' migratable='yes'/>
@@ -421,7 +425,7 @@
     <property name='hv-synic' type='boolean' value='false'/>
     <property name='xstore' type='boolean' value='false'/>
     <property name='fxsr_opt' type='boolean' value='false'/>
-    <property name='kvm-hint-dedicated' type='boolean' value='true' migratable='yes'/>
+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
     <property name='rtm' type='boolean' value='false'/>
     <property name='lmce' type='boolean' value='true' migratable='yes'/>
     <property name='hv-time' type='boolean' value='false'/>
@@ -431,18 +435,18 @@
     <property name='rdrand' type='boolean' value='true' migratable='yes'/>
     <property name='rdseed' type='boolean' value='false'/>
     <property name='avx512-4vnniw' type='boolean' value='false'/>
-    <property name='vmx' type='boolean' value='false'/>
+    <property name='vmx' type='boolean' value='true' migratable='yes'/>
     <property name='vme' type='boolean' value='true' migratable='yes'/>
     <property name='dtes64' type='boolean' value='false'/>
     <property name='mtrr' type='boolean' value='true' migratable='yes'/>
     <property name='rdtscp' type='boolean' value='true' migratable='yes'/>
     <property name='pse36' type='boolean' value='true' migratable='yes'/>
-    <property name='kvm-pv-tlb-flush' type='boolean' value='false'/>
+    <property name='kvm-pv-tlb-flush' type='boolean' value='true' migratable='yes'/>
     <property name='tbm' type='boolean' value='false'/>
     <property name='wdt' type='boolean' value='false'/>
     <property name='pause_filter' type='boolean' value='false'/>
     <property name='sha-ni' type='boolean' value='false'/>
-    <property name='model-id' type='string' value='Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz'/>
+    <property name='model-id' type='string' value='Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz'/>
     <property name='abm' type='boolean' value='true' migratable='yes'/>
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
@@ -462,6 +466,7 @@
     <property name='xsavec' type='boolean' value='false'/>
     <property name='intel-pt' type='boolean' value='false'/>
     <property name='osxsave' type='boolean' value='false'/>
+    <property name='hv-frequencies' type='boolean' value='false'/>
     <property name='tsc-frequency' type='number' value='0'/>
     <property name='xd' type='boolean' value='true' migratable='yes'/>
     <property name='hv-vendor-id' type='string' value=''/>
@@ -720,9 +725,7 @@
     <blocker name='3dnow'/>
   </cpu>
   <cpu type='kvm' name='Westmere' usable='yes'/>
-  <cpu type='kvm' name='Westmere-IBRS' usable='no'>
-    <blocker name='spec-ctrl'/>
-  </cpu>
+  <cpu type='kvm' name='Westmere-IBRS' usable='yes'/>
   <cpu type='kvm' name='Skylake-Server' usable='no'>
     <blocker name='hle'/>
     <blocker name='rtm'/>
@@ -759,7 +762,6 @@
     <blocker name='avx512cd'/>
     <blocker name='avx512bw'/>
     <blocker name='avx512vl'/>
-    <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
     <blocker name='xgetbv1'/>
@@ -789,7 +791,6 @@
     <blocker name='rdseed'/>
     <blocker name='adx'/>
     <blocker name='smap'/>
-    <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
     <blocker name='xgetbv1'/>
@@ -797,9 +798,7 @@
     <blocker name='mpx'/>
   </cpu>
   <cpu type='kvm' name='SandyBridge' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge-IBRS' usable='no'>
-    <blocker name='spec-ctrl'/>
-  </cpu>
+  <cpu type='kvm' name='SandyBridge-IBRS' usable='yes'/>
   <cpu type='kvm' name='Penryn' usable='yes'/>
   <cpu type='kvm' name='Opteron_G5' usable='no'>
     <blocker name='sse4a'/>
@@ -823,25 +822,18 @@
   <cpu type='kvm' name='Opteron_G2' usable='yes'/>
   <cpu type='kvm' name='Opteron_G1' usable='yes'/>
   <cpu type='kvm' name='Nehalem' usable='yes'/>
-  <cpu type='kvm' name='Nehalem-IBRS' usable='no'>
-    <blocker name='spec-ctrl'/>
-  </cpu>
+  <cpu type='kvm' name='Nehalem-IBRS' usable='yes'/>
   <cpu type='kvm' name='IvyBridge' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge-IBRS' usable='no'>
-    <blocker name='spec-ctrl'/>
-  </cpu>
+  <cpu type='kvm' name='IvyBridge-IBRS' usable='yes'/>
   <cpu type='kvm' name='Haswell' usable='no'>
     <blocker name='hle'/>
     <blocker name='rtm'/>
   </cpu>
   <cpu type='kvm' name='Haswell-noTSX' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='no'>
-    <blocker name='spec-ctrl'/>
-  </cpu>
+  <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='yes'/>
   <cpu type='kvm' name='Haswell-IBRS' usable='no'>
     <blocker name='hle'/>
     <blocker name='rtm'/>
-    <blocker name='spec-ctrl'/>
   </cpu>
   <cpu type='kvm' name='EPYC' usable='no'>
     <blocker name='rdseed'/>
@@ -872,7 +864,6 @@
     <blocker name='misalignsse'/>
     <blocker name='3dnowprefetch'/>
     <blocker name='osvw'/>
-    <blocker name='ibpb'/>
     <blocker name='xsavec'/>
     <blocker name='xgetbv1'/>
   </cpu>
@@ -895,7 +886,6 @@
     <blocker name='rdseed'/>
     <blocker name='adx'/>
     <blocker name='smap'/>
-    <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
   <cpu type='kvm' name='Broadwell-IBRS' usable='no'>
@@ -904,7 +894,6 @@
     <blocker name='rdseed'/>
     <blocker name='adx'/>
     <blocker name='smap'/>
-    <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
   <cpu type='kvm' name='486' usable='yes'/>
@@ -1210,6 +1199,7 @@
   <machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
   <machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
   <machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
+  <machine name='xenfv' hotplugCpus='yes' maxCpus='128'/>
   <machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
   <machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
   <machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
@@ -1218,6 +1208,7 @@
   <machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
   <machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
   <machine name='pc-q35-2.12' alias='q35' hotplugCpus='yes' maxCpus='288'/>
+  <machine name='xenpv' maxCpus='1'/>
   <machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
   <machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
   <machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list