The original capabilities didn't include a patched kernel for spectre
and meltdown, SPICE gl support and had xen support enabled which we
already have dropped.

Signed-off-by: Erik Skultety <eskul...@redhat.com>
---
 tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml  |  37 +-
 .../caps_2.12.0.x86_64.replies                     | 539 +++++++++------------
 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  | 183 ++-----
 .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 219 ++++-----
 tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml   |  57 +--
 5 files changed, 429 insertions(+), 606 deletions(-)

diff --git a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml 
b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml
index 7a1be4c093..334e4bebaf 100644
--- a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml
@@ -23,18 +23,15 @@
   <cpu>
     <mode name='host-passthrough' supported='yes'/>
     <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>Haswell-noTSX</model>
+      <model fallback='forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>
-      <feature policy='require' name='vme'/>
       <feature policy='require' name='ss'/>
-      <feature policy='require' name='f16c'/>
-      <feature policy='require' name='rdrand'/>
+      <feature policy='require' name='vmx'/>
       <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='arat'/>
       <feature policy='require' name='tsc_adjust'/>
-      <feature policy='require' name='xsaveopt'/>
+      <feature policy='require' name='clflushopt'/>
+      <feature policy='require' name='xsaves'/>
       <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='abm'/>
       <feature policy='require' name='invtsc'/>
     </mode>
     <mode name='custom' supported='yes'>
@@ -51,13 +48,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'>Skylake-Client</model>
+      <model usable='yes'>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,20 +62,20 @@
       <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='no'>Haswell</model>
+      <model usable='yes'>IvyBridge-IBRS</model>
+      <model usable='yes'>Haswell</model>
       <model usable='yes'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-IBRS</model>
+      <model usable='yes'>Haswell-noTSX-IBRS</model>
+      <model usable='yes'>Haswell-IBRS</model>
       <model usable='no'>EPYC</model>
       <model usable='no'>EPYC-IBPB</model>
       <model usable='yes'>Conroe</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-IBRS</model>
+      <model usable='yes'>Broadwell</model>
+      <model usable='yes'>Broadwell-noTSX</model>
+      <model usable='yes'>Broadwell-noTSX-IBRS</model>
+      <model usable='yes'>Broadwell-IBRS</model>
       <model usable='yes'>486</model>
     </mode>
   </cpu>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies 
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
index 6f37e4301e..334afaa61b 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
@@ -17,11 +17,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"
 }
@@ -549,7 +549,7 @@
 
 {
   "return": {
-    "fd": 19,
+    "fd": 17,
     "fdset-id": 0
   },
   "id": "libvirt-5"
@@ -3307,13 +3307,26 @@
 
 {
   "return": [
+    {
+      "name": "min_io_size",
+      "type": "uint16"
+    },
+    {
+      "name": "removable",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "channel",
+      "type": "uint32"
+    },
     {
       "name": "serial",
       "type": "str"
     },
     {
-      "name": "port_index",
-      "type": "uint16"
+      "name": "lun",
+      "type": "uint32"
     },
     {
       "name": "dpofua",
@@ -3321,99 +3334,90 @@
       "type": "bool"
     },
     {
-      "name": "bootindex",
-      "type": "int32"
+      "name": "ver",
+      "type": "str"
+    },
+    {
+      "name": "scsi-id",
+      "type": "uint32"
     },
     {
       "name": "logical_block_size",
       "description": "A power of two between 512 and 32768",
       "type": "uint16"
     },
-    {
-      "name": "discard_granularity",
-      "type": "uint32"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "max_unmap_size",
-      "type": "uint64"
-    },
     {
       "name": "drive",
       "description": "Node name or ID of a block device to use as a backend",
       "type": "str"
     },
+    {
+      "name": "scsi_version",
+      "type": "int32"
+    },
+    {
+      "name": "werror",
+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
+      "type": "BlockdevOnError"
+    },
+    {
+      "name": "discard_granularity",
+      "type": "uint32"
+    },
     {
       "name": "port_wwn",
       "type": "uint64"
     },
     {
-      "name": "write-cache",
-      "description": "on/off/auto",
-      "type": "OnOffAuto"
+      "name": "max_unmap_size",
+      "type": "uint64"
+    },
+    {
+      "name": "rerror",
+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
+      "type": "BlockdevOnError"
+    },
+    {
+      "name": "max_io_size",
+      "type": "uint64"
+    },
+    {
+      "name": "wwn",
+      "type": "uint64"
     },
     {
       "name": "share-rw",
       "type": "bool"
     },
-    {
-      "name": "opt_io_size",
-      "type": "uint32"
-    },
-    {
-      "name": "min_io_size",
-      "type": "uint16"
-    },
     {
       "name": "product",
       "type": "str"
     },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
     {
       "name": "vendor",
       "type": "str"
     },
-    {
-      "name": "wwn",
-      "type": "uint64"
-    },
-    {
-      "name": "werror",
-      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-      "type": "BlockdevOnError"
-    },
-    {
-      "name": "removable",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "rerror",
-      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-      "type": "BlockdevOnError"
-    },
-    {
-      "name": "ver",
-      "type": "str"
-    },
     {
       "name": "physical_block_size",
       "description": "A power of two between 512 and 32768",
       "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"
@@ -4323,6 +4327,11 @@
       "name": "vectors",
       "type": "uint32"
     },
+    {
+      "name": "iommu_platform",
+      "description": "on/off",
+      "type": "bool"
+    },
     {
       "name": "x-pcie-extcap-init",
       "description": "on/off",
@@ -4340,26 +4349,31 @@
       "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",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "ats",
-      "description": "on/off",
-      "type": "bool"
-    },
     {
       "name": "virtio-pci-bus-master-bug-migration",
       "description": "on/off",
       "type": "bool"
     },
+    {
+      "name": "ats",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "virgl",
+      "description": "on/off",
+      "type": "bool"
+    },
     {
       "name": "romfile",
       "type": "str"
@@ -4402,19 +4416,29 @@
       "name": "yres",
       "type": "uint32"
     },
+    {
+      "name": "stats",
+      "description": "on/off",
+      "type": "bool"
+    },
     {
       "name": "iommu_platform",
       "description": "on/off",
       "type": "bool"
     },
-    {
-      "name": "max_outputs",
-      "type": "uint32"
-    },
     {
       "name": "xres",
       "type": "uint32"
     },
+    {
+      "name": "max_outputs",
+      "type": "uint32"
+    },
+    {
+      "name": "virgl",
+      "description": "on/off",
+      "type": "bool"
+    },
     {
       "name": "max_hostmem",
       "type": "size"
@@ -5362,7 +5386,6 @@
       "name": "Westmere-IBRS",
       "typename": "Westmere-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5371,24 +5394,12 @@
       "name": "Skylake-Server",
       "typename": "Skylake-Server-x86_64-cpu",
       "unavailable-features": [
-        "hle",
-        "rtm",
-        "mpx",
         "avx512f",
         "avx512dq",
-        "rdseed",
-        "adx",
-        "smap",
-        "clflushopt",
         "clwb",
         "avx512cd",
         "avx512bw",
         "avx512vl",
-        "3dnowprefetch",
-        "xsavec",
-        "xgetbv1",
-        "mpx",
-        "mpx",
         "avx512f",
         "avx512f",
         "avx512f"
@@ -5400,24 +5411,12 @@
       "name": "Skylake-Server-IBRS",
       "typename": "Skylake-Server-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "hle",
-        "rtm",
-        "mpx",
         "avx512f",
         "avx512dq",
-        "rdseed",
-        "adx",
-        "smap",
         "clwb",
         "avx512cd",
         "avx512bw",
         "avx512vl",
-        "spec-ctrl",
-        "3dnowprefetch",
-        "xsavec",
-        "xgetbv1",
-        "mpx",
-        "mpx",
         "avx512f",
         "avx512f",
         "avx512f"
@@ -5429,17 +5428,6 @@
       "name": "Skylake-Client",
       "typename": "Skylake-Client-x86_64-cpu",
       "unavailable-features": [
-        "hle",
-        "rtm",
-        "mpx",
-        "rdseed",
-        "adx",
-        "smap",
-        "3dnowprefetch",
-        "xsavec",
-        "xgetbv1",
-        "mpx",
-        "mpx"
       ],
       "static": false,
       "migration-safe": true
@@ -5448,18 +5436,6 @@
       "name": "Skylake-Client-IBRS",
       "typename": "Skylake-Client-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "hle",
-        "rtm",
-        "mpx",
-        "rdseed",
-        "adx",
-        "smap",
-        "spec-ctrl",
-        "3dnowprefetch",
-        "xsavec",
-        "xgetbv1",
-        "mpx",
-        "mpx"
       ],
       "static": false,
       "migration-safe": true
@@ -5476,7 +5452,6 @@
       "name": "SandyBridge-IBRS",
       "typename": "SandyBridge-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5495,7 +5470,6 @@
       "unavailable-features": [
         "sse4a",
         "misalignsse",
-        "3dnowprefetch",
         "xop",
         "fma4",
         "tbm"
@@ -5509,7 +5483,6 @@
       "unavailable-features": [
         "sse4a",
         "misalignsse",
-        "3dnowprefetch",
         "xop",
         "fma4"
       ],
@@ -5554,7 +5527,6 @@
       "name": "Nehalem-IBRS",
       "typename": "Nehalem-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5571,7 +5543,6 @@
       "name": "IvyBridge-IBRS",
       "typename": "IvyBridge-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5580,8 +5551,6 @@
       "name": "Haswell",
       "typename": "Haswell-x86_64-cpu",
       "unavailable-features": [
-        "hle",
-        "rtm"
       ],
       "static": false,
       "migration-safe": true
@@ -5598,7 +5567,6 @@
       "name": "Haswell-noTSX-IBRS",
       "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5607,9 +5575,6 @@
       "name": "Haswell-IBRS",
       "typename": "Haswell-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "hle",
-        "rtm",
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5618,20 +5583,13 @@
       "name": "EPYC",
       "typename": "EPYC-x86_64-cpu",
       "unavailable-features": [
-        "rdseed",
-        "adx",
-        "smap",
-        "clflushopt",
         "sha-ni",
         "mmxext",
         "fxsr-opt",
         "cr8legacy",
         "sse4a",
         "misalignsse",
-        "3dnowprefetch",
-        "osvw",
-        "xsavec",
-        "xgetbv1"
+        "osvw"
       ],
       "static": false,
       "migration-safe": true
@@ -5640,21 +5598,14 @@
       "name": "EPYC-IBPB",
       "typename": "EPYC-IBPB-x86_64-cpu",
       "unavailable-features": [
-        "rdseed",
-        "adx",
-        "smap",
-        "clflushopt",
         "sha-ni",
         "mmxext",
         "fxsr-opt",
         "cr8legacy",
         "sse4a",
         "misalignsse",
-        "3dnowprefetch",
         "osvw",
-        "ibpb",
-        "xsavec",
-        "xgetbv1"
+        "ibpb"
       ],
       "static": false,
       "migration-safe": true
@@ -5671,12 +5622,6 @@
       "name": "Broadwell",
       "typename": "Broadwell-x86_64-cpu",
       "unavailable-features": [
-        "hle",
-        "rtm",
-        "rdseed",
-        "adx",
-        "smap",
-        "3dnowprefetch"
       ],
       "static": false,
       "migration-safe": true
@@ -5685,10 +5630,6 @@
       "name": "Broadwell-noTSX",
       "typename": "Broadwell-noTSX-x86_64-cpu",
       "unavailable-features": [
-        "rdseed",
-        "adx",
-        "smap",
-        "3dnowprefetch"
       ],
       "static": false,
       "migration-safe": true
@@ -5697,11 +5638,6 @@
       "name": "Broadwell-noTSX-IBRS",
       "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "rdseed",
-        "adx",
-        "smap",
-        "spec-ctrl",
-        "3dnowprefetch"
       ],
       "static": false,
       "migration-safe": true
@@ -5710,13 +5646,6 @@
       "name": "Broadwell-IBRS",
       "typename": "Broadwell-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "hle",
-        "rtm",
-        "rdseed",
-        "adx",
-        "smap",
-        "spec-ctrl",
-        "3dnowprefetch"
       ],
       "static": false,
       "migration-safe": true
@@ -5892,6 +5821,14 @@
     },
     {
       "parameters": [
+        {
+          "name": "rendernode",
+          "type": "string"
+        },
+        {
+          "name": "gl",
+          "type": "boolean"
+        },
         {
           "name": "head",
           "type": "number"
@@ -6593,6 +6530,10 @@
     },
     {
       "parameters": [
+        {
+          "name": "x-oob",
+          "type": "boolean"
+        },
         {
           "name": "pretty",
           "type": "boolean"
@@ -14749,9 +14690,9 @@
           "type": "int"
         },
         {
-          "name": "static",
+          "name": "preallocation",
           "default": null,
-          "type": "bool"
+          "type": "356"
         }
       ],
       "meta-type": "object"
@@ -18515,12 +18456,12 @@
         "arat": true,
         "gfni": false,
         "pause-filter": false,
-        "xsavec": false,
+        "xsavec": true,
         "intel-pt": false,
         "osxsave": false,
         "kvm-asyncpf": true,
         "perfctr-core": false,
-        "mpx": false,
+        "mpx": true,
         "pbe": false,
         "avx512cd": false,
         "decodeassists": false,
@@ -18532,7 +18473,7 @@
         "mca": true,
         "xcrypt": false,
         "min-level": 13,
-        "xgetbv1": false,
+        "xgetbv1": true,
         "cid": false,
         "ds": false,
         "fxsr": true,
@@ -18542,7 +18483,7 @@
         "avx512-vpopcntdq": false,
         "phe": false,
         "extapic": false,
-        "3dnowprefetch": false,
+        "3dnowprefetch": true,
         "avx512vbmi2": false,
         "cr8legacy": false,
         "xcrypt-en": false,
@@ -18554,17 +18495,17 @@
         "cmp-legacy": false,
         "avx512-4fmaps": false,
         "vmcb-clean": false,
-        "hle": false,
+        "hle": true,
         "3dnowext": false,
         "npt": false,
         "clwb": false,
         "lbrv": false,
-        "adx": false,
+        "adx": true,
         "ss": true,
         "pni": true,
         "svm-lock": false,
         "smep": true,
-        "smap": false,
+        "smap": true,
         "pfthreshold": false,
         "x2apic": true,
         "avx512vbmi": false,
@@ -18596,7 +18537,7 @@
         "pge": true,
         "avx512bitalg": false,
         "pdcm": false,
-        "model": 63,
+        "model": 94,
         "movbe": true,
         "nrip-save": false,
         "ssse3": true,
@@ -18607,7 +18548,7 @@
         "fma": true,
         "cx16": true,
         "de": true,
-        "stepping": 2,
+        "stepping": 3,
         "xsave": true,
         "clflush": true,
         "skinit": false,
@@ -18621,7 +18562,7 @@
         "osvw": false,
         "apic": true,
         "pmm": false,
-        "spec-ctrl": false,
+        "spec-ctrl": true,
         "tsc-adjust": true,
         "kvm-steal-time": true,
         "kvmclock": true,
@@ -18640,9 +18581,9 @@
         "mmxext": false,
         "popcnt": true,
         "vaes": false,
-        "xsaves": false,
+        "xsaves": true,
         "lm": true,
-        "umip": false,
+        "umip": true,
         "pse": true,
         "avx2": true,
         "sep": true,
@@ -18654,7 +18595,7 @@
         "kvm-pv-unhalt": true,
         "tsc-scale": false,
         "topoext": false,
-        "clflushopt": false,
+        "clflushopt": true,
         "monitor": false,
         "avx512er": false,
         "pmm-en": false,
@@ -18665,23 +18606,23 @@
         "vpclmulqdq": false,
         "fxsr-opt": false,
         "xstore": false,
-        "rtm": false,
-        "kvm-hint-dedicated": true,
+        "rtm": true,
+        "kvm-hint-dedicated": false,
         "lmce": true,
         "perfctr-nb": false,
         "rdrand": true,
-        "rdseed": false,
+        "rdseed": true,
         "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) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
         "sha-ni": false,
         "abm": true,
         "avx512pf": false,
@@ -18707,12 +18648,12 @@
         "arat": true,
         "gfni": false,
         "pause-filter": false,
-        "xsavec": false,
+        "xsavec": true,
         "intel-pt": false,
         "osxsave": false,
         "kvm-asyncpf": true,
         "perfctr-core": false,
-        "mpx": false,
+        "mpx": true,
         "pbe": false,
         "avx512cd": false,
         "decodeassists": false,
@@ -18724,7 +18665,7 @@
         "mca": true,
         "xcrypt": false,
         "min-level": 13,
-        "xgetbv1": false,
+        "xgetbv1": true,
         "cid": false,
         "ds": false,
         "fxsr": true,
@@ -18734,7 +18675,7 @@
         "avx512-vpopcntdq": false,
         "phe": false,
         "extapic": false,
-        "3dnowprefetch": false,
+        "3dnowprefetch": true,
         "avx512vbmi2": false,
         "cr8legacy": false,
         "xcrypt-en": false,
@@ -18746,17 +18687,17 @@
         "cmp-legacy": false,
         "avx512-4fmaps": false,
         "vmcb-clean": false,
-        "hle": false,
+        "hle": true,
         "3dnowext": false,
         "npt": false,
         "clwb": false,
         "lbrv": false,
-        "adx": false,
+        "adx": true,
         "ss": true,
         "pni": true,
         "svm-lock": false,
         "smep": true,
-        "smap": false,
+        "smap": true,
         "pfthreshold": false,
         "x2apic": true,
         "avx512vbmi": false,
@@ -18788,7 +18729,7 @@
         "pge": true,
         "avx512bitalg": false,
         "pdcm": false,
-        "model": 63,
+        "model": 94,
         "movbe": true,
         "nrip-save": false,
         "ssse3": true,
@@ -18799,7 +18740,7 @@
         "fma": true,
         "cx16": true,
         "de": true,
-        "stepping": 2,
+        "stepping": 3,
         "xsave": true,
         "clflush": true,
         "skinit": false,
@@ -18813,7 +18754,7 @@
         "osvw": false,
         "apic": true,
         "pmm": false,
-        "spec-ctrl": false,
+        "spec-ctrl": true,
         "tsc-adjust": true,
         "kvm-steal-time": true,
         "kvmclock": true,
@@ -18832,9 +18773,9 @@
         "mmxext": false,
         "popcnt": true,
         "vaes": false,
-        "xsaves": false,
+        "xsaves": true,
         "lm": true,
-        "umip": false,
+        "umip": true,
         "pse": true,
         "avx2": true,
         "sep": true,
@@ -18846,7 +18787,7 @@
         "kvm-pv-unhalt": true,
         "tsc-scale": false,
         "topoext": false,
-        "clflushopt": false,
+        "clflushopt": true,
         "monitor": false,
         "avx512er": false,
         "pmm-en": false,
@@ -18857,23 +18798,23 @@
         "vpclmulqdq": false,
         "fxsr-opt": false,
         "xstore": false,
-        "rtm": false,
-        "kvm-hint-dedicated": true,
+        "rtm": true,
+        "kvm-hint-dedicated": false,
         "lmce": true,
         "perfctr-nb": false,
         "rdrand": true,
-        "rdseed": false,
+        "rdseed": true,
         "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) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
         "sha-ni": false,
         "abm": true,
         "avx512pf": false,
@@ -18900,9 +18841,10 @@
         "arat": true,
         "gfni": false,
         "pause-filter": false,
-        "xsavec": false,
+        "xsavec": true,
         "intel-pt": false,
         "osxsave": false,
+        "hv-frequencies": false,
         "tsc-frequency": 0,
         "xd": true,
         "hv-vendor-id": "",
@@ -18910,7 +18852,7 @@
         "kvm_asyncpf": true,
         "perfctr_core": false,
         "perfctr-core": false,
-        "mpx": false,
+        "mpx": true,
         "pbe": false,
         "decodeassists": false,
         "avx512cd": false,
@@ -18927,7 +18869,7 @@
         "xcrypt": false,
         "thread-id": -1,
         "min-level": 13,
-        "xgetbv1": false,
+        "xgetbv1": true,
         "cid": false,
         "hv-relaxed": false,
         "hv-crash": false,
@@ -18939,7 +18881,7 @@
         "avx512-vpopcntdq": false,
         "phe": false,
         "extapic": false,
-        "3dnowprefetch": false,
+        "3dnowprefetch": true,
         "avx512vbmi2": false,
         "cr8legacy": false,
         "cpuid-0xb": true,
@@ -18958,19 +18900,19 @@
         "vmcb_clean": false,
         "vmcb-clean": false,
         "3dnowext": false,
-        "hle": false,
+        "hle": true,
         "npt": false,
         "memory": "/machine/unattached/system[0]",
         "clwb": false,
         "lbrv": false,
-        "adx": false,
+        "adx": true,
         "ss": true,
         "pni": true,
         "svm_lock": false,
         "svm-lock": false,
         "pfthreshold": false,
         "smep": true,
-        "smap": false,
+        "smap": true,
         "x2apic": true,
         "avx512vbmi": false,
         "avx512vnni": false,
@@ -19015,7 +18957,7 @@
         "nodeid_msr": false,
         "pdcm": false,
         "movbe": true,
-        "model": 63,
+        "model": 94,
         "nrip_save": false,
         "nrip-save": false,
         "kvm_pv_unhalt": true,
@@ -19028,7 +18970,7 @@
         "cx16": true,
         "de": true,
         "enforce": false,
-        "stepping": 2,
+        "stepping": 3,
         "xsave": true,
         "clflush": true,
         "skinit": false,
@@ -19047,7 +18989,7 @@
         "pmu": false,
         "pmm": false,
         "apic": true,
-        "spec-ctrl": false,
+        "spec-ctrl": true,
         "min-xlevel2": 0,
         "tsc-adjust": true,
         "tsc_adjust": true,
@@ -19071,10 +19013,10 @@
         "mmxext": false,
         "vaes": false,
         "popcnt": true,
-        "xsaves": false,
+        "xsaves": true,
         "tcg-cpuid": true,
         "lm": true,
-        "umip": false,
+        "umip": true,
         "pse": true,
         "avx2": true,
         "sep": true,
@@ -19093,7 +19035,7 @@
         "topoext": false,
         "hv-vpindex": false,
         "xlevel2": 0,
-        "clflushopt": false,
+        "clflushopt": true,
         "kvm-no-smi-migration": false,
         "monitor": false,
         "avx512er": false,
@@ -19108,28 +19050,28 @@
         "hv-synic": false,
         "xstore": false,
         "fxsr_opt": false,
-        "kvm-hint-dedicated": true,
-        "rtm": false,
+        "kvm-hint-dedicated": false,
+        "rtm": true,
         "lmce": true,
         "hv-time": false,
         "perfctr-nb": false,
         "perfctr_nb": false,
         "ffxsr": false,
         "rdrand": true,
-        "rdseed": false,
+        "rdseed": true,
         "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) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
         "abm": true,
         "avx512pf": false,
         "xstore-en": false
@@ -19166,12 +19108,12 @@
         "arat": true,
         "gfni": false,
         "pause-filter": false,
-        "xsavec": false,
+        "xsavec": true,
         "intel-pt": false,
         "osxsave": false,
         "kvm-asyncpf": true,
         "perfctr-core": false,
-        "mpx": false,
+        "mpx": true,
         "pbe": false,
         "avx512cd": false,
         "decodeassists": false,
@@ -19183,7 +19125,7 @@
         "mca": true,
         "xcrypt": false,
         "min-level": 13,
-        "xgetbv1": false,
+        "xgetbv1": true,
         "cid": false,
         "ds": false,
         "fxsr": true,
@@ -19193,7 +19135,7 @@
         "avx512-vpopcntdq": false,
         "phe": false,
         "extapic": false,
-        "3dnowprefetch": false,
+        "3dnowprefetch": true,
         "avx512vbmi2": false,
         "cr8legacy": false,
         "xcrypt-en": false,
@@ -19205,17 +19147,17 @@
         "cmp-legacy": false,
         "avx512-4fmaps": false,
         "vmcb-clean": false,
-        "hle": false,
+        "hle": true,
         "3dnowext": false,
         "npt": false,
         "clwb": false,
         "lbrv": false,
-        "adx": false,
+        "adx": true,
         "ss": true,
         "pni": true,
         "svm-lock": false,
         "smep": true,
-        "smap": false,
+        "smap": true,
         "pfthreshold": false,
         "x2apic": true,
         "avx512vbmi": false,
@@ -19247,7 +19189,7 @@
         "pge": true,
         "avx512bitalg": false,
         "pdcm": false,
-        "model": 63,
+        "model": 94,
         "movbe": true,
         "nrip-save": false,
         "ssse3": true,
@@ -19258,7 +19200,7 @@
         "fma": true,
         "cx16": true,
         "de": true,
-        "stepping": 2,
+        "stepping": 3,
         "xsave": true,
         "clflush": true,
         "skinit": false,
@@ -19272,7 +19214,7 @@
         "osvw": false,
         "apic": true,
         "pmm": false,
-        "spec-ctrl": false,
+        "spec-ctrl": true,
         "tsc-adjust": true,
         "kvm-steal-time": true,
         "kvmclock": true,
@@ -19291,9 +19233,9 @@
         "mmxext": false,
         "popcnt": true,
         "vaes": false,
-        "xsaves": false,
+        "xsaves": true,
         "lm": true,
-        "umip": false,
+        "umip": true,
         "pse": true,
         "avx2": true,
         "sep": true,
@@ -19305,7 +19247,7 @@
         "kvm-pv-unhalt": true,
         "tsc-scale": false,
         "topoext": false,
-        "clflushopt": false,
+        "clflushopt": true,
         "monitor": false,
         "avx512er": false,
         "pmm-en": false,
@@ -19316,23 +19258,23 @@
         "vpclmulqdq": false,
         "fxsr-opt": false,
         "xstore": false,
-        "rtm": false,
-        "kvm-hint-dedicated": true,
+        "rtm": true,
+        "kvm-hint-dedicated": false,
         "lmce": true,
         "perfctr-nb": false,
         "rdrand": true,
-        "rdseed": false,
+        "rdseed": true,
         "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) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
         "sha-ni": false,
         "abm": true,
         "avx512pf": false,
@@ -19358,12 +19300,12 @@
         "arat": true,
         "gfni": false,
         "pause-filter": false,
-        "xsavec": false,
+        "xsavec": true,
         "intel-pt": false,
         "osxsave": false,
         "kvm-asyncpf": true,
         "perfctr-core": false,
-        "mpx": false,
+        "mpx": true,
         "pbe": false,
         "avx512cd": false,
         "decodeassists": false,
@@ -19375,7 +19317,7 @@
         "mca": true,
         "xcrypt": false,
         "min-level": 13,
-        "xgetbv1": false,
+        "xgetbv1": true,
         "cid": false,
         "ds": false,
         "fxsr": true,
@@ -19385,7 +19327,7 @@
         "avx512-vpopcntdq": false,
         "phe": false,
         "extapic": false,
-        "3dnowprefetch": false,
+        "3dnowprefetch": true,
         "avx512vbmi2": false,
         "cr8legacy": false,
         "xcrypt-en": false,
@@ -19397,17 +19339,17 @@
         "cmp-legacy": false,
         "avx512-4fmaps": false,
         "vmcb-clean": false,
-        "hle": false,
+        "hle": true,
         "3dnowext": false,
         "npt": false,
         "clwb": false,
         "lbrv": false,
-        "adx": false,
+        "adx": true,
         "ss": true,
         "pni": true,
         "svm-lock": false,
         "smep": true,
-        "smap": false,
+        "smap": true,
         "pfthreshold": false,
         "x2apic": true,
         "avx512vbmi": false,
@@ -19439,7 +19381,7 @@
         "pge": true,
         "avx512bitalg": false,
         "pdcm": false,
-        "model": 63,
+        "model": 94,
         "movbe": true,
         "nrip-save": false,
         "ssse3": true,
@@ -19450,7 +19392,7 @@
         "fma": true,
         "cx16": true,
         "de": true,
-        "stepping": 2,
+        "stepping": 3,
         "xsave": true,
         "clflush": true,
         "skinit": false,
@@ -19464,7 +19406,7 @@
         "osvw": false,
         "apic": true,
         "pmm": false,
-        "spec-ctrl": false,
+        "spec-ctrl": true,
         "tsc-adjust": true,
         "kvm-steal-time": true,
         "kvmclock": true,
@@ -19483,9 +19425,9 @@
         "mmxext": false,
         "popcnt": true,
         "vaes": false,
-        "xsaves": false,
+        "xsaves": true,
         "lm": true,
-        "umip": false,
+        "umip": true,
         "pse": true,
         "avx2": true,
         "sep": true,
@@ -19497,7 +19439,7 @@
         "kvm-pv-unhalt": true,
         "tsc-scale": false,
         "topoext": false,
-        "clflushopt": false,
+        "clflushopt": true,
         "monitor": false,
         "avx512er": false,
         "pmm-en": false,
@@ -19508,23 +19450,23 @@
         "vpclmulqdq": false,
         "fxsr-opt": false,
         "xstore": false,
-        "rtm": false,
-        "kvm-hint-dedicated": true,
+        "rtm": true,
+        "kvm-hint-dedicated": false,
         "lmce": true,
         "perfctr-nb": false,
         "rdrand": true,
-        "rdseed": false,
+        "rdseed": true,
         "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) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
         "sha-ni": false,
         "abm": true,
         "avx512pf": false,
@@ -19551,9 +19493,10 @@
         "arat": true,
         "gfni": false,
         "pause-filter": false,
-        "xsavec": false,
+        "xsavec": true,
         "intel-pt": false,
         "osxsave": false,
+        "hv-frequencies": false,
         "tsc-frequency": 0,
         "xd": true,
         "hv-vendor-id": "",
@@ -19561,7 +19504,7 @@
         "kvm_asyncpf": true,
         "perfctr_core": false,
         "perfctr-core": false,
-        "mpx": false,
+        "mpx": true,
         "pbe": false,
         "decodeassists": false,
         "avx512cd": false,
@@ -19578,7 +19521,7 @@
         "xcrypt": false,
         "thread-id": -1,
         "min-level": 13,
-        "xgetbv1": false,
+        "xgetbv1": true,
         "cid": false,
         "hv-relaxed": false,
         "hv-crash": false,
@@ -19590,7 +19533,7 @@
         "avx512-vpopcntdq": false,
         "phe": false,
         "extapic": false,
-        "3dnowprefetch": false,
+        "3dnowprefetch": true,
         "avx512vbmi2": false,
         "cr8legacy": false,
         "cpuid-0xb": true,
@@ -19609,19 +19552,19 @@
         "vmcb_clean": false,
         "vmcb-clean": false,
         "3dnowext": false,
-        "hle": false,
+        "hle": true,
         "npt": false,
         "memory": "/machine/unattached/system[0]",
         "clwb": false,
         "lbrv": false,
-        "adx": false,
+        "adx": true,
         "ss": true,
         "pni": true,
         "svm_lock": false,
         "svm-lock": false,
         "pfthreshold": false,
         "smep": true,
-        "smap": false,
+        "smap": true,
         "x2apic": true,
         "avx512vbmi": false,
         "avx512vnni": false,
@@ -19666,7 +19609,7 @@
         "nodeid_msr": false,
         "pdcm": false,
         "movbe": true,
-        "model": 63,
+        "model": 94,
         "nrip_save": false,
         "nrip-save": false,
         "kvm_pv_unhalt": true,
@@ -19679,7 +19622,7 @@
         "cx16": true,
         "de": true,
         "enforce": false,
-        "stepping": 2,
+        "stepping": 3,
         "xsave": true,
         "clflush": true,
         "skinit": false,
@@ -19698,7 +19641,7 @@
         "pmu": false,
         "pmm": false,
         "apic": true,
-        "spec-ctrl": false,
+        "spec-ctrl": true,
         "min-xlevel2": 0,
         "tsc-adjust": true,
         "tsc_adjust": true,
@@ -19722,10 +19665,10 @@
         "mmxext": false,
         "vaes": false,
         "popcnt": true,
-        "xsaves": false,
+        "xsaves": true,
         "tcg-cpuid": true,
         "lm": true,
-        "umip": false,
+        "umip": true,
         "pse": true,
         "avx2": true,
         "sep": true,
@@ -19744,7 +19687,7 @@
         "topoext": false,
         "hv-vpindex": false,
         "xlevel2": 0,
-        "clflushopt": false,
+        "clflushopt": true,
         "kvm-no-smi-migration": false,
         "monitor": false,
         "avx512er": false,
@@ -19759,28 +19702,28 @@
         "hv-synic": false,
         "xstore": false,
         "fxsr_opt": false,
-        "kvm-hint-dedicated": true,
-        "rtm": false,
+        "kvm-hint-dedicated": false,
+        "rtm": true,
         "lmce": true,
         "hv-time": false,
         "perfctr-nb": false,
         "perfctr_nb": false,
         "ffxsr": false,
         "rdrand": true,
-        "rdseed": false,
+        "rdseed": true,
         "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) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
         "abm": true,
         "avx512pf": false,
         "xstore-en": false
@@ -19796,13 +19739,11 @@
 }
 
 {
-  "return": {
-    "reduced-phys-bits": 1,
-    "cbitpos": 47,
-    "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA",
-    "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA"
-  },
-  "id": "libvirt-54"
+  "id": "libvirt-54",
+  "error": {
+    "class": "GenericError",
+    "desc": "SEV feature is not available"
+  }
 }
 
 {
@@ -20821,6 +20762,7 @@
         "xsavec": false,
         "intel-pt": false,
         "osxsave": false,
+        "hv-frequencies": false,
         "tsc-frequency": 0,
         "xd": true,
         "hv-vendor-id": "",
@@ -21472,6 +21414,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 9c1f6c327c..d9dd5d10ad 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -123,6 +123,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'/>
@@ -133,6 +134,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'/>
@@ -162,6 +164,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'/>
@@ -211,10 +214,10 @@
   <flag name='mch'/>
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='sev-guest'/>
-  <version>2011090</version>
+  <version>2012000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>416196</microcodeVersion>
-  <package>v2.12.0-rc0</package>
+  <microcodeVersion>415063</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'/>
@@ -228,9 +231,10 @@
     <property name='arat' type='boolean' value='true' migratable='yes'/>
     <property name='gfni' type='boolean' value='false'/>
     <property name='pause-filter' type='boolean' value='false'/>
-    <property name='xsavec' type='boolean' value='false'/>
+    <property name='xsavec' type='boolean' value='true' migratable='yes'/>
     <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=''/>
@@ -238,7 +242,7 @@
     <property name='kvm_asyncpf' type='boolean' value='true' migratable='yes'/>
     <property name='perfctr_core' type='boolean' value='false'/>
     <property name='perfctr-core' type='boolean' value='false'/>
-    <property name='mpx' type='boolean' value='false'/>
+    <property name='mpx' type='boolean' value='true' migratable='yes'/>
     <property name='pbe' type='boolean' value='false'/>
     <property name='decodeassists' type='boolean' value='false'/>
     <property name='avx512cd' type='boolean' value='false'/>
@@ -255,7 +259,7 @@
     <property name='xcrypt' type='boolean' value='false'/>
     <property name='thread-id' type='number' value='-1'/>
     <property name='min-level' type='number' value='13'/>
-    <property name='xgetbv1' type='boolean' value='false'/>
+    <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
     <property name='cid' type='boolean' value='false'/>
     <property name='hv-relaxed' type='boolean' value='false'/>
     <property name='hv-crash' type='boolean' value='false'/>
@@ -267,7 +271,7 @@
     <property name='avx512-vpopcntdq' type='boolean' value='false'/>
     <property name='phe' type='boolean' value='false'/>
     <property name='extapic' type='boolean' value='false'/>
-    <property name='3dnowprefetch' type='boolean' value='false'/>
+    <property name='3dnowprefetch' type='boolean' value='true' 
migratable='yes'/>
     <property name='avx512vbmi2' type='boolean' value='false'/>
     <property name='cr8legacy' type='boolean' value='false'/>
     <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
@@ -286,19 +290,19 @@
     <property name='vmcb_clean' type='boolean' value='false'/>
     <property name='vmcb-clean' type='boolean' value='false'/>
     <property name='3dnowext' type='boolean' value='false'/>
-    <property name='hle' type='boolean' value='false'/>
+    <property name='hle' type='boolean' value='true' migratable='yes'/>
     <property name='npt' type='boolean' value='false'/>
     <property name='memory' type='string' 
value='/machine/unattached/system[0]'/>
     <property name='clwb' type='boolean' value='false'/>
     <property name='lbrv' type='boolean' value='false'/>
-    <property name='adx' type='boolean' value='false'/>
+    <property name='adx' type='boolean' value='true' migratable='yes'/>
     <property name='ss' type='boolean' value='true' migratable='yes'/>
     <property name='pni' type='boolean' value='true' migratable='yes'/>
     <property name='svm_lock' type='boolean' value='false'/>
     <property name='svm-lock' type='boolean' value='false'/>
     <property name='pfthreshold' type='boolean' value='false'/>
     <property name='smep' type='boolean' value='true' migratable='yes'/>
-    <property name='smap' type='boolean' value='false'/>
+    <property name='smap' type='boolean' value='true' migratable='yes'/>
     <property name='x2apic' type='boolean' value='true' migratable='yes'/>
     <property name='avx512vbmi' type='boolean' value='false'/>
     <property name='avx512vnni' type='boolean' value='false'/>
@@ -343,7 +347,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='94'/>
     <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'/>
@@ -356,7 +360,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'/>
@@ -375,7 +379,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'/>
@@ -399,10 +403,10 @@
     <property name='mmxext' type='boolean' value='false'/>
     <property name='vaes' type='boolean' value='false'/>
     <property name='popcnt' type='boolean' value='true' migratable='yes'/>
-    <property name='xsaves' type='boolean' value='false'/>
+    <property name='xsaves' type='boolean' value='true' migratable='yes'/>
     <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='topoext' type='boolean' value='false'/>
     <property name='hv-vpindex' type='boolean' value='false'/>
     <property name='xlevel2' type='number' value='0'/>
-    <property name='clflushopt' type='boolean' value='false'/>
+    <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
     <property name='kvm-no-smi-migration' type='boolean' value='false'/>
     <property name='monitor' type='boolean' value='false'/>
     <property name='avx512er' type='boolean' value='false'/>
@@ -436,28 +440,28 @@
     <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='rtm' type='boolean' value='false'/>
+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
+    <property name='rtm' type='boolean' value='true' migratable='yes'/>
     <property name='lmce' type='boolean' value='true' migratable='yes'/>
     <property name='hv-time' type='boolean' value='false'/>
     <property name='perfctr-nb' type='boolean' value='false'/>
     <property name='perfctr_nb' type='boolean' value='false'/>
     <property name='ffxsr' type='boolean' value='false'/>
     <property name='rdrand' type='boolean' value='true' migratable='yes'/>
-    <property name='rdseed' type='boolean' value='false'/>
+    <property name='rdseed' type='boolean' value='true' migratable='yes'/>
     <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) Xeon(R) CPU 
E3-1245 v5 @ 3.50GHz'/>
     <property name='abm' type='boolean' value='true' migratable='yes'/>
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
@@ -477,6 +481,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=''/>
@@ -735,91 +740,37 @@
     <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'/>
-    <blocker name='mpx'/>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='clflushopt'/>
     <blocker name='clwb'/>
     <blocker name='avx512cd'/>
     <blocker name='avx512bw'/>
     <blocker name='avx512vl'/>
-    <blocker name='3dnowprefetch'/>
-    <blocker name='xsavec'/>
-    <blocker name='xgetbv1'/>
-    <blocker name='mpx'/>
-    <blocker name='mpx'/>
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
   </cpu>
   <cpu type='kvm' name='Skylake-Server-IBRS' usable='no'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-    <blocker name='mpx'/>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
     <blocker name='clwb'/>
     <blocker name='avx512cd'/>
     <blocker name='avx512bw'/>
     <blocker name='avx512vl'/>
-    <blocker name='spec-ctrl'/>
-    <blocker name='3dnowprefetch'/>
-    <blocker name='xsavec'/>
-    <blocker name='xgetbv1'/>
-    <blocker name='mpx'/>
-    <blocker name='mpx'/>
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Client' usable='no'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-    <blocker name='mpx'/>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='3dnowprefetch'/>
-    <blocker name='xsavec'/>
-    <blocker name='xgetbv1'/>
-    <blocker name='mpx'/>
-    <blocker name='mpx'/>
-  </cpu>
-  <cpu type='kvm' name='Skylake-Client-IBRS' usable='no'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-    <blocker name='mpx'/>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='spec-ctrl'/>
-    <blocker name='3dnowprefetch'/>
-    <blocker name='xsavec'/>
-    <blocker name='xgetbv1'/>
-    <blocker name='mpx'/>
-    <blocker name='mpx'/>
-  </cpu>
+  <cpu type='kvm' name='Skylake-Client' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Client-IBRS' usable='yes'/>
   <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'/>
     <blocker name='misalignsse'/>
-    <blocker name='3dnowprefetch'/>
     <blocker name='xop'/>
     <blocker name='fma4'/>
     <blocker name='tbm'/>
@@ -827,7 +778,6 @@
   <cpu type='kvm' name='Opteron_G4' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
-    <blocker name='3dnowprefetch'/>
     <blocker name='xop'/>
     <blocker name='fma4'/>
   </cpu>
@@ -838,90 +788,37 @@
   <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='Haswell' usable='no'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-  </cpu>
+  <cpu type='kvm' name='IvyBridge-IBRS' usable='yes'/>
+  <cpu type='kvm' name='Haswell' usable='yes'/>
   <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-IBRS' usable='no'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-    <blocker name='spec-ctrl'/>
-  </cpu>
+  <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='yes'/>
+  <cpu type='kvm' name='Haswell-IBRS' usable='yes'/>
   <cpu type='kvm' name='EPYC' usable='no'>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='clflushopt'/>
     <blocker name='sha-ni'/>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
     <blocker name='cr8legacy'/>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
-    <blocker name='3dnowprefetch'/>
     <blocker name='osvw'/>
-    <blocker name='xsavec'/>
-    <blocker name='xgetbv1'/>
   </cpu>
   <cpu type='kvm' name='EPYC-IBPB' usable='no'>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='clflushopt'/>
     <blocker name='sha-ni'/>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
     <blocker name='cr8legacy'/>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
-    <blocker name='3dnowprefetch'/>
     <blocker name='osvw'/>
     <blocker name='ibpb'/>
-    <blocker name='xsavec'/>
-    <blocker name='xgetbv1'/>
   </cpu>
   <cpu type='kvm' name='Conroe' usable='yes'/>
-  <cpu type='kvm' name='Broadwell' usable='no'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='3dnowprefetch'/>
-  </cpu>
-  <cpu type='kvm' name='Broadwell-noTSX' usable='no'>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='3dnowprefetch'/>
-  </cpu>
-  <cpu type='kvm' name='Broadwell-noTSX-IBRS' usable='no'>
-    <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'>
-    <blocker name='hle'/>
-    <blocker name='rtm'/>
-    <blocker name='rdseed'/>
-    <blocker name='adx'/>
-    <blocker name='smap'/>
-    <blocker name='spec-ctrl'/>
-    <blocker name='3dnowprefetch'/>
-  </cpu>
+  <cpu type='kvm' name='Broadwell' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-noTSX' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-noTSX-IBRS' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-IBRS' usable='yes'/>
   <cpu type='kvm' name='486' usable='yes'/>
   <cpu type='tcg' name='max' usable='yes'/>
   <cpu type='tcg' name='host' usable='no'>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies 
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
index 257f0ecbe2..b2f8377248 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
@@ -17,11 +17,11 @@
 {
   "return": {
     "qemu": {
-      "micro": 50,
+      "micro": 90,
       "minor": 12,
       "major": 2
     },
-    "package": "v2.12.0-2284-gab3257c281"
+    "package": "v3.0.0-rc0-31-g633e824037"
   },
   "id": "libvirt-2"
 }
@@ -818,10 +818,6 @@
       "name": "virtio-keyboard-pci",
       "parent": "virtio-input-hid-pci"
     },
-    {
-      "name": "xen-sysbus",
-      "parent": "bus"
-    },
     {
       "name": "i440FX",
       "parent": "pci-device"
@@ -854,10 +850,6 @@
       "name": "chardev-pty",
       "parent": "chardev"
     },
-    {
-      "name": "xen-apic",
-      "parent": "apic-common"
-    },
     {
       "name": "SUNW,fdtwo",
       "parent": "base-sysbus-fdc"
@@ -918,6 +910,10 @@
       "name": "qemu64-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "PIIX3-xen",
+      "parent": "pci-piix3"
+    },
     {
       "name": "virtio-input-host-pci",
       "parent": "virtio-input-pci"
@@ -934,18 +930,18 @@
       "name": "e1000",
       "parent": "e1000-base"
     },
-    {
-      "name": "PIIX3-xen",
-      "parent": "pci-piix3"
-    },
-    {
-      "name": "pc-i440fx-1.4-machine",
-      "parent": "generic-pc-machine"
-    },
     {
       "name": "ICH9-LPC",
       "parent": "pci-device"
     },
+    {
+      "name": "pc-i440fx-1.4-machine",
+      "parent": "generic-pc-machine"
+    },
+    {
+      "name": "ich9-usb-uhci6",
+      "parent": "pci-uhci-usb"
+    },
     {
       "name": "sysbus-ahci",
       "parent": "sys-bus-device"
@@ -954,10 +950,6 @@
       "name": "ich9-usb-uhci4",
       "parent": "pci-uhci-usb"
     },
-    {
-      "name": "ich9-usb-uhci6",
-      "parent": "pci-uhci-usb"
-    },
     {
       "name": "pc-q35-2.6-machine",
       "parent": "generic-pc-machine"
@@ -966,6 +958,10 @@
       "name": "usb-mtp",
       "parent": "usb-device"
     },
+    {
+      "name": "ccid-card-emulated",
+      "parent": "ccid-card"
+    },
     {
       "name": "ich9-usb-uhci5",
       "parent": "pci-uhci-usb"
@@ -1118,10 +1114,6 @@
       "name": "pc-testdev",
       "parent": "isa-device"
     },
-    {
-      "name": "xen-backend",
-      "parent": "xen-sysdev"
-    },
     {
       "name": "Haswell-noTSX-IBRS-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -1206,6 +1198,10 @@
       "name": "isa-cirrus-vga",
       "parent": "isa-device"
     },
+    {
+      "name": "qio-channel-rdma",
+      "parent": "qio-channel"
+    },
     {
       "name": "vhost-vsock-device",
       "parent": "virtio-device"
@@ -1322,14 +1318,14 @@
       "name": "chardev-msmouse",
       "parent": "chardev"
     },
-    {
-      "name": "chardev-pipe",
-      "parent": "chardev-fd"
-    },
     {
       "name": "pc-q35-2.9-machine",
       "parent": "generic-pc-machine"
     },
+    {
+      "name": "chardev-pipe",
+      "parent": "chardev-fd"
+    },
     {
       "name": "pc-i440fx-1.7-machine",
       "parent": "generic-pc-machine"
@@ -1514,34 +1510,38 @@
       "name": "vt82c686b-usb-uhci",
       "parent": "pci-uhci-usb"
     },
+    {
+      "name": "chardev-braille",
+      "parent": "chardev"
+    },
     {
       "name": "chardev-file",
       "parent": "chardev-fd"
     },
-    {
-      "name": "pc-q35-2.10-machine",
-      "parent": "generic-pc-machine"
-    },
     {
       "name": "intel-iommu",
       "parent": "x86-iommu"
     },
     {
-      "name": "PCIE",
-      "parent": "PCI"
+      "name": "pc-q35-2.10-machine",
+      "parent": "generic-pc-machine"
     },
     {
       "name": "tpm-tis",
       "parent": "isa-device"
     },
     {
-      "name": "xen-sysdev",
-      "parent": "sys-bus-device"
+      "name": "PCIE",
+      "parent": "PCI"
     },
     {
       "name": "pcie-pci-bridge",
       "parent": "base-pci-bridge"
     },
+    {
+      "name": "ccid-card-passthru",
+      "parent": "ccid-card"
+    },
     {
       "name": "qio-dns-resolver",
       "parent": "object"
@@ -1582,10 +1582,6 @@
       "name": "ccid-bus",
       "parent": "bus"
     },
-    {
-      "name": "xenpv-machine",
-      "parent": "machine"
-    },
     {
       "name": "EPYC-IBPB-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -1922,10 +1918,6 @@
       "name": "pc-i440fx-2.2-machine",
       "parent": "generic-pc-machine"
     },
-    {
-      "name": "xen-pci-passthrough",
-      "parent": "pci-device"
-    },
     {
       "name": "cryptodev-backend",
       "parent": "object"
@@ -2058,18 +2050,10 @@
       "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"
@@ -2079,8 +2063,8 @@
       "parent": "pcie-port"
     },
     {
-      "name": "xenfv-machine",
-      "parent": "generic-pc-machine"
+      "name": "piix3-ide",
+      "parent": "pci-ide"
     },
     {
       "name": "pci-testdev",
@@ -2134,10 +2118,6 @@
       "name": "pc-i440fx-2.6-machine",
       "parent": "generic-pc-machine"
     },
-    {
-      "name": "xen-platform",
-      "parent": "pci-device"
-    },
     {
       "name": "chardev-serial",
       "parent": "chardev-fd"
@@ -2230,10 +2210,6 @@
       "name": "isa-applesmc",
       "parent": "isa-device"
     },
-    {
-      "name": "xen-accel",
-      "parent": "accel"
-    },
     {
       "name": "secret",
       "parent": "object"
@@ -2386,6 +2362,10 @@
       "name": "generic-sdhci",
       "parent": "sys-bus-device"
     },
+    {
+      "name": "pvrdma",
+      "parent": "pci-device"
+    },
     {
       "name": "isa-pit",
       "parent": "pit-common"
@@ -5199,11 +5179,6 @@
       "name": "pc-i440fx-2.7",
       "cpu-max": 255
     },
-    {
-      "hotpluggable-cpus": true,
-      "name": "xenfv",
-      "cpu-max": 128
-    },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-2.3",
@@ -5250,11 +5225,6 @@
       "cpu-max": 288,
       "alias": "q35"
     },
-    {
-      "hotpluggable-cpus": false,
-      "name": "xenpv",
-      "cpu-max": 1
-    },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-2.10",
@@ -5506,7 +5476,6 @@
       "name": "Westmere-IBRS",
       "typename": "Westmere-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5529,7 +5498,6 @@
         "avx512cd",
         "avx512bw",
         "avx512vl",
-        "spec-ctrl",
         "avx512f",
         "avx512f",
         "avx512f"
@@ -5558,7 +5526,6 @@
       "name": "Skylake-Client-IBRS",
       "typename": "Skylake-Client-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5575,7 +5542,6 @@
       "name": "SandyBridge-IBRS",
       "typename": "SandyBridge-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5651,7 +5617,6 @@
       "name": "Nehalem-IBRS",
       "typename": "Nehalem-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5686,7 +5651,6 @@
       "name": "IvyBridge-IBRS",
       "typename": "IvyBridge-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5703,7 +5667,6 @@
       "name": "Haswell-noTSX-IBRS",
       "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5720,7 +5683,6 @@
       "name": "Haswell-IBRS",
       "typename": "Haswell-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5776,7 +5738,6 @@
       "name": "Broadwell-noTSX-IBRS",
       "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5793,7 +5754,6 @@
       "name": "Broadwell-IBRS",
       "typename": "Broadwell-IBRS-x86_64-cpu",
       "unavailable-features": [
-        "spec-ctrl"
       ],
       "static": false,
       "migration-safe": true
@@ -5977,6 +5937,14 @@
     },
     {
       "parameters": [
+        {
+          "name": "rendernode",
+          "type": "string"
+        },
+        {
+          "name": "gl",
+          "type": "boolean"
+        },
         {
           "name": "head",
           "type": "number"
@@ -6903,6 +6871,36 @@
           "help": "file name",
           "type": "string"
         },
+        {
+          "name": "serial",
+          "help": "disk serial number",
+          "type": "string"
+        },
+        {
+          "name": "addr",
+          "help": "pci address (virtio only)",
+          "type": "string"
+        },
+        {
+          "name": "trans",
+          "help": "chs translation (auto, lba, none)",
+          "type": "string"
+        },
+        {
+          "name": "secs",
+          "help": "number of sectors (ide disk geometry)",
+          "type": "number"
+        },
+        {
+          "name": "heads",
+          "help": "number of heads (ide disk geometry)",
+          "type": "number"
+        },
+        {
+          "name": "cyls",
+          "help": "number of cylinders (ide disk geometry)",
+          "type": "number"
+        },
         {
           "name": "if",
           "help": "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)",
@@ -18406,6 +18404,11 @@
           "name": "inactive-l2",
           "default": null,
           "type": "bool"
+        },
+        {
+          "name": "bitmap-directory",
+          "default": null,
+          "type": "bool"
         }
       ],
       "meta-type": "object"
@@ -19557,7 +19560,7 @@
         "osvw": false,
         "apic": true,
         "pmm": false,
-        "spec-ctrl": false,
+        "spec-ctrl": true,
         "tsc-adjust": true,
         "kvm-steal-time": true,
         "kvmclock": true,
@@ -19578,7 +19581,7 @@
         "vaes": false,
         "xsaves": true,
         "lm": true,
-        "umip": false,
+        "umip": true,
         "pse": true,
         "avx2": true,
         "sep": true,
@@ -19610,12 +19613,12 @@
         "rdseed": true,
         "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 E3-1245 v5 @ 3.50GHz",
@@ -19752,7 +19755,7 @@
         "osvw": false,
         "apic": true,
         "pmm": false,
-        "spec-ctrl": false,
+        "spec-ctrl": true,
         "tsc-adjust": true,
         "kvm-steal-time": true,
         "kvmclock": true,
@@ -19773,7 +19776,7 @@
         "vaes": false,
         "xsaves": true,
         "lm": true,
-        "umip": false,
+        "umip": true,
         "pse": true,
         "avx2": true,
         "sep": true,
@@ -19805,12 +19808,12 @@
         "rdseed": true,
         "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 E3-1245 v5 @ 3.50GHz",
@@ -19992,7 +19995,7 @@
         "pmu": false,
         "pmm": false,
         "apic": true,
-        "spec-ctrl": false,
+        "spec-ctrl": true,
         "min-xlevel2": 0,
         "tsc-adjust": true,
         "tsc_adjust": true,
@@ -20019,7 +20022,7 @@
         "xsaves": true,
         "tcg-cpuid": true,
         "lm": true,
-        "umip": false,
+        "umip": true,
         "pse": true,
         "avx2": true,
         "sep": true,
@@ -20065,13 +20068,13 @@
         "rdrand": true,
         "rdseed": true,
         "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,
@@ -20221,7 +20224,7 @@
         "osvw": false,
         "apic": true,
         "pmm": false,
-        "spec-ctrl": false,
+        "spec-ctrl": true,
         "tsc-adjust": true,
         "kvm-steal-time": true,
         "kvmclock": true,
@@ -20242,7 +20245,7 @@
         "vaes": false,
         "xsaves": true,
         "lm": true,
-        "umip": false,
+        "umip": true,
         "pse": true,
         "avx2": true,
         "sep": true,
@@ -20274,12 +20277,12 @@
         "rdseed": true,
         "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 E3-1245 v5 @ 3.50GHz",
@@ -20416,7 +20419,7 @@
         "osvw": false,
         "apic": true,
         "pmm": false,
-        "spec-ctrl": false,
+        "spec-ctrl": true,
         "tsc-adjust": true,
         "kvm-steal-time": true,
         "kvmclock": true,
@@ -20437,7 +20440,7 @@
         "vaes": false,
         "xsaves": true,
         "lm": true,
-        "umip": false,
+        "umip": true,
         "pse": true,
         "avx2": true,
         "sep": true,
@@ -20469,12 +20472,12 @@
         "rdseed": true,
         "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 E3-1245 v5 @ 3.50GHz",
@@ -20656,7 +20659,7 @@
         "pmu": false,
         "pmm": false,
         "apic": true,
-        "spec-ctrl": false,
+        "spec-ctrl": true,
         "min-xlevel2": 0,
         "tsc-adjust": true,
         "tsc_adjust": true,
@@ -20683,7 +20686,7 @@
         "xsaves": true,
         "tcg-cpuid": true,
         "lm": true,
-        "umip": false,
+        "umip": true,
         "pse": true,
         "avx2": true,
         "sep": true,
@@ -20729,13 +20732,13 @@
         "rdrand": true,
         "rdseed": true,
         "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,
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml 
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index d7c25c65dd..cd036d9323 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -8,6 +8,8 @@
   <flag name='spice'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
+  <flag name='ccid-emulated'/>
+  <flag name='ccid-passthru'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='sga'/>
@@ -131,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'/>
@@ -160,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'/>
@@ -210,10 +214,10 @@
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='sev-guest'/>
   <flag name='usb-storage.werror'/>
-  <version>2012050</version>
+  <version>2012090</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>437827</microcodeVersion>
-  <package>v2.12.0-2284-gab3257c281</package>
+  <microcodeVersion>438109</microcodeVersion>
+  <package>v3.0.0-rc0-31-g633e824037</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
     <property name='phys-bits' type='number' value='0'/>
@@ -379,7 +383,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'/>
@@ -406,7 +410,7 @@
     <property name='xsaves' type='boolean' value='true' migratable='yes'/>
     <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'/>
@@ -452,13 +456,13 @@
     <property name='rdrand' type='boolean' value='true' migratable='yes'/>
     <property name='rdseed' type='boolean' value='true' migratable='yes'/>
     <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'/>
@@ -747,9 +751,7 @@
     <blocker name='3dnowext'/>
     <blocker name='3dnow'/>
   </cpu>
-  <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='Westmere' usable='yes'/>
   <cpu type='kvm' name='Skylake-Server-IBRS' usable='no'>
     <blocker name='avx512f'/>
@@ -758,7 +760,6 @@
     <blocker name='avx512cd'/>
     <blocker name='avx512bw'/>
     <blocker name='avx512vl'/>
-    <blocker name='spec-ctrl'/>
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
@@ -774,13 +775,9 @@
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Client-IBRS' usable='no'>
-    <blocker name='spec-ctrl'/>
-  </cpu>
+  <cpu type='kvm' name='Skylake-Client-IBRS' usable='yes'/>
   <cpu type='kvm' name='Skylake-Client' 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='SandyBridge' usable='yes'/>
   <cpu type='kvm' name='Penryn' usable='yes'/>
   <cpu type='kvm' name='Opteron_G5' usable='no'>
@@ -802,9 +799,7 @@
   </cpu>
   <cpu type='kvm' name='Opteron_G2' usable='yes'/>
   <cpu type='kvm' name='Opteron_G1' 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='Nehalem' usable='yes'/>
   <cpu type='kvm' name='KnightsMill' usable='no'>
     <blocker name='avx512f'/>
@@ -818,17 +813,11 @@
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
   </cpu>
-  <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='IvyBridge' 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-noTSX' usable='yes'/>
-  <cpu type='kvm' name='Haswell-IBRS' usable='no'>
-    <blocker name='spec-ctrl'/>
-  </cpu>
+  <cpu type='kvm' name='Haswell-IBRS' usable='yes'/>
   <cpu type='kvm' name='Haswell' usable='yes'/>
   <cpu type='kvm' name='EPYC-IBPB' usable='no'>
     <blocker name='sha-ni'/>
@@ -850,13 +839,9 @@
     <blocker name='osvw'/>
   </cpu>
   <cpu type='kvm' name='Conroe' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-noTSX-IBRS' usable='no'>
-    <blocker name='spec-ctrl'/>
-  </cpu>
+  <cpu type='kvm' name='Broadwell-noTSX-IBRS' usable='yes'/>
   <cpu type='kvm' name='Broadwell-noTSX' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-IBRS' usable='no'>
-    <blocker name='spec-ctrl'/>
-  </cpu>
+  <cpu type='kvm' name='Broadwell-IBRS' usable='yes'/>
   <cpu type='kvm' name='Broadwell' usable='yes'/>
   <cpu type='kvm' name='486' usable='yes'/>
   <cpu type='tcg' name='max' usable='yes'/>
@@ -1180,7 +1165,6 @@
   <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'/>
@@ -1190,7 +1174,6 @@
   <machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
   <machine name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
   <machine name='pc-q35-3.0' 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.4

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

Reply via email to