Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
This one was generated very early, so there is a significant number
of changes. A few capabilities end up being missing, but I think
that's mostly because I'm using an i7 rather than a Xeon; overall the
changes seem benign, especially considering that none of the .args
ends up being modified.
.../qemu_4.0.0.x86_64.xml | 3 +-
.../caps_4.0.0.x86_64.replies | 3331 +++++++++--------
.../caps_4.0.0.x86_64.xml | 38 +-
3 files changed, 1796 insertions(+), 1576 deletions(-)
diff --git a/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml
b/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml
index 42d8949e61..31ef094e21 100644
--- a/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml
@@ -33,11 +33,12 @@
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
<feature policy='require' name='ss'/>
+ <feature policy='require' name='vmx'/>
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='umip'/>
- <feature policy='require' name='arch-capabilities'/>
+ <feature policy='require' name='stibp'/>
<feature policy='require' name='ssbd'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='pdpe1gb'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
index aa9ee38c80..ca56344ae7 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
@@ -17,11 +17,11 @@
{
"return": {
"qemu": {
- "micro": 50,
- "minor": 1,
- "major": 3
+ "micro": 0,
+ "minor": 0,
+ "major": 4
},
- "package": "v3.1.0-1445-ga61faa3d02"
+ "package": "v4.0.0"
},
"id": "libvirt-2"
}
[...]
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index f4be7017fe..679e1b13d4 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -202,10 +202,10 @@
<flag name='virtio-pci-non-transitional'/>
<flag name='overcommit'/>
<flag name='query-current-machine'/>
- <version>3001050</version>
+ <version>4000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100758</microcodeVersion>
- <package>v3.1.0-1445-ga61faa3d02</package>
+ <package>v4.0.0</package>
<arch>x86_64</arch>
<hostCPU type='kvm' model='base' migratability='yes'>
<property name='phys-bits' type='number' value='0'/>
@@ -226,6 +226,7 @@
<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='x-intel-pt-auto-level' type='boolean'
value='true' migratable='yes'/>
<property name='hv-vendor-id' type='string' value=''/>
<property name='kvm-asyncpf' type='boolean' value='true'
migratable='yes'/>
<property name='kvm_asyncpf' type='boolean' value='true'
migratable='yes'/>
@@ -267,7 +268,7 @@
<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='stibp' type='boolean' value='false'/>
+ <property name='stibp' type='boolean' value='true'
migratable='yes'/>
<property name='cpuid-0xb' type='boolean' value='true'
migratable='yes'/>
<property name='xcrypt-en' type='boolean'
value='false'/>
<property name='kvm_pv_eoi' type='boolean' value='true'
migratable='yes'/>
@@ -351,7 +352,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='94'/>
+ <property name='model' type='number' value='142'/>
<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'/>
@@ -364,9 +365,8 @@
<property name='fma' type='boolean' value='true'
migratable='yes'/>
<property name='cx16' type='boolean' value='true'
migratable='yes'/>
<property name='de' type='boolean' value='true'
migratable='yes'/>
- <property name='pconfig' type='boolean'
value='false'/>
<property name='enforce' type='boolean'
value='false'/>
- <property name='stepping' type='number' value='3'/>
+ <property name='stepping' type='number' value='10'/>
<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'/>
@@ -440,7 +440,7 @@
<property name='avx512er' type='boolean'
value='false'/>
<property name='pmm-en' type='boolean' value='false'/>
<property name='pcid' type='boolean' value='true'
migratable='yes'/>
- <property name='arch-capabilities' type='boolean'
value='true' migratable='no'/>
+ <property name='arch-capabilities' type='boolean'
value='false'/>
<property name='3dnow' type='boolean' value='false'/>
<property name='erms' type='boolean' value='true'
migratable='yes'/>
<property name='lahf-lm' type='boolean' value='true'
migratable='yes'/>
@@ -461,7 +461,7 @@
<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'/>
@@ -472,7 +472,7 @@
<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 E3-1245 v5 @ 3.50GHz'/>
+ <property name='model-id' type='string' value='Intel(R)
Core(TM) i7-8650U CPU @ 1.90GHz'/>
<property name='abm' type='boolean' value='true'
migratable='yes'/>
<property name='avx512pf' type='boolean'
value='false'/>
<property name='xstore-en' type='boolean'
value='false'/>
@@ -496,6 +496,7 @@
<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='x-intel-pt-auto-level' type='boolean'
value='true' migratable='yes'/>
<property name='hv-vendor-id' type='string' value=''/>
<property name='kvm-asyncpf' type='boolean'
value='false'/>
<property name='kvm_asyncpf' type='boolean'
value='false'/>
@@ -634,7 +635,6 @@
<property name='fma' type='boolean' value='false'/>
<property name='cx16' type='boolean' value='true'
migratable='yes'/>
<property name='de' type='boolean' value='true'
migratable='yes'/>
- <property name='pconfig' type='boolean'
value='false'/>
<property name='enforce' type='boolean'
value='false'/>
<property name='stepping' type='number' value='3'/>
<property name='xsave' type='boolean' value='true'
migratable='yes'/>
@@ -849,13 +849,11 @@
<blocker name='avx512f'/>
<blocker name='avx512dq'/>
<blocker name='clwb'/>
- <blocker name='intel-pt'/>
<blocker name='avx512cd'/>
<blocker name='avx512bw'/>
<blocker name='avx512vl'/>
<blocker name='avx512vbmi'/>
<blocker name='pku'/>
- <blocker name=''/>
<blocker name='avx512vbmi2'/>
<blocker name='gfni'/>
<blocker name='vaes'/>
@@ -864,7 +862,6 @@
<blocker name='avx512bitalg'/>
<blocker name='avx512-vpopcntdq'/>
<blocker name='la57'/>
- <blocker name='pconfig'/>
<blocker name='wbnoinvd'/>
<blocker name='avx512f'/>
<blocker name='avx512f'/>
@@ -872,10 +869,8 @@
<blocker name='pku'/>
</cpu>
<cpu type='kvm' name='Icelake-Client' usable='no'>
- <blocker name='intel-pt'/>
<blocker name='avx512vbmi'/>
<blocker name='pku'/>
- <blocker name=''/>
<blocker name='avx512vbmi2'/>
<blocker name='gfni'/>
<blocker name='vaes'/>
@@ -918,12 +913,10 @@
<blocker name='avx512f'/>
<blocker name='avx512dq'/>
<blocker name='clwb'/>
- <blocker name='intel-pt'/>
<blocker name='avx512cd'/>
<blocker name='avx512bw'/>
<blocker name='avx512vl'/>
<blocker name='pku'/>
- <blocker name=''/>
<blocker name='avx512vnni'/>
<blocker name='avx512f'/>
<blocker name='avx512f'/>
@@ -1122,13 +1115,11 @@
<blocker name='avx512f'/>
<blocker name='avx512dq'/>
<blocker name='rdseed'/>
- <blocker name='intel-pt'/>
<blocker name='avx512cd'/>
<blocker name='avx512bw'/>
<blocker name='avx512vl'/>
<blocker name='avx512vbmi'/>
<blocker name='umip'/>
- <blocker name=''/>
<blocker name='avx512vbmi2'/>
<blocker name='gfni'/>
<blocker name='vaes'/>
@@ -1136,7 +1127,6 @@
<blocker name='avx512vnni'/>
<blocker name='avx512bitalg'/>
<blocker name='avx512-vpopcntdq'/>
- <blocker name='pconfig'/>
<blocker name='spec-ctrl'/>
<blocker name='ssbd'/>
<blocker name='3dnowprefetch'/>
@@ -1156,10 +1146,8 @@
<blocker name='invpcid'/>
<blocker name='rtm'/>
<blocker name='rdseed'/>
- <blocker name='intel-pt'/>
<blocker name='avx512vbmi'/>
<blocker name='umip'/>
- <blocker name=''/>
<blocker name='avx512vbmi2'/>
<blocker name='gfni'/>
<blocker name='vaes'/>
@@ -1272,11 +1260,9 @@
<blocker name='avx512f'/>
<blocker name='avx512dq'/>
<blocker name='rdseed'/>
- <blocker name='intel-pt'/>
<blocker name='avx512cd'/>
<blocker name='avx512bw'/>
<blocker name='avx512vl'/>
- <blocker name=''/>
<blocker name='avx512vnni'/>
<blocker name='spec-ctrl'/>
<blocker name='ssbd'/>
@@ -1352,6 +1338,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'/>
@@ -1362,6 +1349,7 @@
<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' 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'/>
@@ -1379,8 +1367,8 @@
<machine name='pc-q35-2.4' hotplugCpus='yes'
maxCpus='255'/>
<machine name='pc-q35-2.5' hotplugCpus='yes'
maxCpus='255'/>
<machine name='pc-q35-2.6' hotplugCpus='yes'
maxCpus='255'/>
- <machine name='pc-i440fx-2.10' hotplugCpus='yes'
maxCpus='255'/>
<machine name='pc-i440fx-1.4' hotplugCpus='yes'
maxCpus='255'/>
+ <machine name='pc-i440fx-2.10' hotplugCpus='yes'
maxCpus='255'/>
<machine name='pc-0.12' hotplugCpus='yes'
maxCpus='255'/>
<machine name='pc-q35-4.0' alias='q35' hotplugCpus='yes'
maxCpus='288'/>
</qemuCaps>
--
2.20.1