diff options
author | Peter Krempa <pkrempa@redhat.com> | 2019-06-20 07:47:43 +0200 |
---|---|---|
committer | Peter Krempa <pkrempa@redhat.com> | 2019-06-20 09:13:37 +0200 |
commit | 4586b11bed9bc59ea749e28f522bf5e0b462c4c7 (patch) | |
tree | 85807fd5ddbc8ef280bf4cd3cd854acedd2088dd /tests/domaincapsschemadata | |
parent | 34c9a5fc06271fd898072a69c801927211e10534 (diff) | |
download | libvirt-4586b11bed9bc59ea749e28f522bf5e0b462c4c7.tar.gz |
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>
Diffstat (limited to 'tests/domaincapsschemadata')
-rw-r--r-- | tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml index 389e641bbb..d638795359 100644 --- a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml @@ -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> |