1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 21:34:54 +03:00

tests: qemucaps: Update 4.1.0 capabilities to a more recent version

Update the capabilities from a non-upstream version (9c70209b63 is not
in qemu.git) to qemu upstream commit 33d6099906 (2019/06/18) so that we
get the QMP schema 'features' field support and are able to detect that
the 'file' block backend supports dynamic auto-read-only.

Note that I've rebuilt this on a machine with a more modern kernel and
microcode which exposes e.g. the recent CPU bug mitigations, thus I
opted to keep the CPU changes rather than trying to do a franken-caps
by updating only the output of query-qmp-schema.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Peter Krempa 2019-06-20 07:47:43 +02:00
parent 34c9a5fc06
commit 4586b11bed
3 changed files with 4451 additions and 4525 deletions

View File

@ -30,7 +30,7 @@
<cpu>
<mode name='host-passthrough' supported='yes'/>
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Skylake-Client</model>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
<feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
@ -38,9 +38,13 @@
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='umip'/>
<feature policy='require' name='md-clear'/>
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='invtsc'/>
</mode>
<mode name='custom' supported='yes'>
<model usable='yes'>qemu64</model>
@ -55,13 +59,13 @@
<model usable='yes'>coreduo</model>
<model usable='yes'>core2duo</model>
<model usable='no'>athlon</model>
<model usable='no'>Westmere-IBRS</model>
<model usable='yes'>Westmere-IBRS</model>
<model usable='yes'>Westmere</model>
<model usable='no'>Skylake-Server-IBRS</model>
<model usable='no'>Skylake-Server</model>
<model usable='no'>Skylake-Client-IBRS</model>
<model usable='yes'>Skylake-Client-IBRS</model>
<model usable='yes'>Skylake-Client</model>
<model usable='no'>SandyBridge-IBRS</model>
<model usable='yes'>SandyBridge-IBRS</model>
<model usable='yes'>SandyBridge</model>
<model usable='yes'>Penryn</model>
<model usable='no'>Opteron_G5</model>
@ -69,23 +73,23 @@
<model usable='no'>Opteron_G3</model>
<model usable='yes'>Opteron_G2</model>
<model usable='yes'>Opteron_G1</model>
<model usable='no'>Nehalem-IBRS</model>
<model usable='yes'>Nehalem-IBRS</model>
<model usable='yes'>Nehalem</model>
<model usable='no'>IvyBridge-IBRS</model>
<model usable='yes'>IvyBridge-IBRS</model>
<model usable='yes'>IvyBridge</model>
<model usable='no'>Icelake-Server</model>
<model usable='no'>Icelake-Client</model>
<model usable='no'>Haswell-noTSX-IBRS</model>
<model usable='yes'>Haswell-noTSX-IBRS</model>
<model usable='yes'>Haswell-noTSX</model>
<model usable='no'>Haswell-IBRS</model>
<model usable='yes'>Haswell-IBRS</model>
<model usable='yes'>Haswell</model>
<model usable='no'>EPYC-IBPB</model>
<model usable='no'>EPYC</model>
<model usable='yes'>Conroe</model>
<model usable='no'>Cascadelake-Server</model>
<model usable='no'>Broadwell-noTSX-IBRS</model>
<model usable='yes'>Broadwell-noTSX-IBRS</model>
<model usable='yes'>Broadwell-noTSX</model>
<model usable='no'>Broadwell-IBRS</model>
<model usable='yes'>Broadwell-IBRS</model>
<model usable='yes'>Broadwell</model>
<model usable='yes'>486</model>
</mode>

File diff suppressed because it is too large Load Diff

View File

@ -210,7 +210,7 @@
<version>4000050</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100759</microcodeVersion>
<package>v4.0.0-1173-g9c70209b63</package>
<package>v4.0.0-1481-g33d6099906</package>
<arch>x86_64</arch>
<hostCPU type='kvm' model='base' migratability='yes'>
<property name='cmov' type='boolean' value='true' migratable='yes'/>
@ -253,7 +253,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='xcrypt-en' type='boolean' value='false'/>
<property name='pn' type='boolean' value='false'/>
<property name='rsba' type='boolean' value='false'/>
@ -297,9 +297,9 @@
<property name='syscall' type='boolean' value='true' migratable='yes'/>
<property name='avx512dq' type='boolean' value='false'/>
<property name='svm' type='boolean' value='false'/>
<property name='invtsc' type='boolean' value='false'/>
<property name='invtsc' type='boolean' value='true' migratable='no'/>
<property name='sse2' type='boolean' value='true' migratable='yes'/>
<property name='ssbd' type='boolean' value='false'/>
<property name='ssbd' type='boolean' value='true' migratable='yes'/>
<property name='est' type='boolean' value='false'/>
<property name='avx512ifma' type='boolean' value='false'/>
<property name='tm2' type='boolean' value='false'/>
@ -338,7 +338,7 @@
<property name='osvw' type='boolean' value='false'/>
<property name='apic' type='boolean' value='true' migratable='yes'/>
<property name='pmm' type='boolean' value='false'/>
<property name='spec-ctrl' type='boolean' value='false'/>
<property name='spec-ctrl' type='boolean' value='true' migratable='yes'/>
<property name='tsc-adjust' type='boolean' value='true' migratable='yes'/>
<property name='kvm-steal-time' type='boolean' value='true' migratable='yes'/>
<property name='kvmclock' type='boolean' value='true' migratable='yes'/>
@ -367,7 +367,7 @@
<property name='sep' type='boolean' value='true' migratable='yes'/>
<property name='virt-ssbd' type='boolean' value='false'/>
<property name='nodeid-msr' type='boolean' value='false'/>
<property name='md-clear' type='boolean' value='false'/>
<property name='md-clear' type='boolean' value='true' migratable='yes'/>
<property name='misalignsse' type='boolean' value='false'/>
<property name='min-xlevel' type='number' value='2147483656'/>
<property name='bmi1' type='boolean' value='true' migratable='yes'/>
@ -632,9 +632,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'/>
@ -644,7 +642,6 @@
<blocker name='avx512bw'/>
<blocker name='avx512vl'/>
<blocker name='pku'/>
<blocker name='spec-ctrl'/>
<blocker name='avx512f'/>
<blocker name='avx512f'/>
<blocker name='avx512f'/>
@ -663,13 +660,9 @@
<blocker name='avx512f'/>
<blocker name='pku'/>
</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'>
@ -695,9 +688,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'/>
@ -711,9 +702,7 @@
<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='Icelake-Server' usable='no'>
<blocker name='avx512f'/>
@ -732,8 +721,6 @@
<blocker name='avx512bitalg'/>
<blocker name='avx512-vpopcntdq'/>
<blocker name='la57'/>
<blocker name='spec-ctrl'/>
<blocker name='ssbd'/>
<blocker name='wbnoinvd'/>
<blocker name='avx512f'/>
<blocker name='avx512f'/>
@ -750,18 +737,12 @@
<blocker name='avx512vnni'/>
<blocker name='avx512bitalg'/>
<blocker name='avx512-vpopcntdq'/>
<blocker name='spec-ctrl'/>
<blocker name='ssbd'/>
<blocker name='wbnoinvd'/>
<blocker name='pku'/>
</cpu>
<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'/>
@ -807,20 +788,14 @@
<blocker name='avx512vl'/>
<blocker name='pku'/>
<blocker name='avx512vnni'/>
<blocker name='spec-ctrl'/>
<blocker name='ssbd'/>
<blocker name='avx512f'/>
<blocker name='avx512f'/>
<blocker name='avx512f'/>
<blocker name='pku'/>
</cpu>
<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'/>
@ -1219,49 +1194,47 @@
</cpu>
<cpu type='tcg' name='486' usable='yes'/>
<machine name='pc-i440fx-4.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<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'/>
<machine name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-q35-2.12' 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-q35-4.0.1' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/>
<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-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' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-q35-4.1' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
</qemuCaps>