[libvirt PATCH 09/12] cpu_map: Add missing vmx features from MSR 0x48E

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com&gt; --- src/cpu_map/x86_features.xml | 64 +++++++++++++++++++ .../x86_64-cpuid-Atom-P5362-enabled.xml | 1 + .../x86_64-cpuid-Atom-P5362-json.xml | 21 ++++++ .../x86_64-cpuid-Cooperlake-enabled.xml | 1 + .../x86_64-cpuid-Cooperlake-json.xml | 21 ++++++ .../x86_64-cpuid-Core-i7-8550U-enabled.xml | 1 + .../x86_64-cpuid-Core-i7-8550U-json.xml | 21 ++++++ ...86_64-cpuid-Xeon-Platinum-9242-enabled.xml | 1 + .../x86_64-cpuid-Xeon-Platinum-9242-json.xml | 21 ++++++ ...-cpuid-baseline-Cooperlake+Cascadelake.xml | 21 ++++++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 21 ++++++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 21 ++++++ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 21 ++++++ tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 21 ++++++ .../cpu-host-model.x86_64-4.2.0.args | 2 +- .../cpu-host-model.x86_64-5.0.0.args | 2 +- 16 files changed, 259 insertions(+), 2 deletions(-) diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml index 6e427c3998..2583f1c825 100644 --- a/src/cpu_map/x86_features.xml +++ b/src/cpu_map/x86_features.xml @@ -948,4 +948,68 @@ <feature name='vmx-posted-intr'> <msr index='0x48d' edx='0x00000000' eax='0x00000080'/> </feature> + + <feature name='vmx-vintr-pending'> + <msr index='0x48e' edx='0x00000000' eax='0x00000004'/> + </feature> + <feature name='vmx-tsc-offset'> + <msr index='0x48e' edx='0x00000000' eax='0x00000008'/> + </feature> + <feature name='vmx-hlt-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x00000080'/> + </feature> + <feature name='vmx-invlpg-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x00000200'/> + </feature> + <feature name='vmx-mwait-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x00000400'/> + </feature> + <feature name='vmx-rdpmc-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x00000800'/> + </feature> + <feature name='vmx-rdtsc-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x00001000'/> + </feature> + <feature name='vmx-cr3-load-noexit'> + <msr index='0x48e' edx='0x00000000' eax='0x00008000'/> + </feature> + <feature name='vmx-cr3-store-noexit'> + <msr index='0x48e' edx='0x00000000' eax='0x00010000'/> + </feature> + <feature name='vmx-cr8-load-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x00080000'/> + </feature> + <feature name='vmx-cr8-store-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x00100000'/> + </feature> + <feature name='vmx-flexpriority'> + <msr index='0x48e' edx='0x00000000' eax='0x00200000'/> + </feature> + <feature name='vmx-vnmi-pending'> + <msr index='0x48e' edx='0x00000000' eax='0x00400000'/> + </feature> + <feature name='vmx-movdr-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x00800000'/> + </feature> + <feature name='vmx-io-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x01000000'/> + </feature> + <feature name='vmx-io-bitmap'> + <msr index='0x48e' edx='0x00000000' eax='0x02000000'/> + </feature> + <feature name='vmx-mtf'> + <msr index='0x48e' edx='0x00000000' eax='0x08000000'/> + </feature> + <feature name='vmx-msr-bitmap'> + <msr index='0x48e' edx='0x00000000' eax='0x10000000'/> + </feature> + <feature name='vmx-monitor-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x20000000'/> + </feature> + <feature name='vmx-pause-exit'> + <msr index='0x48e' edx='0x00000000' eax='0x40000000'/> + </feature> + <feature name='vmx-secondary-ctls'> + <msr index='0x48e' edx='0x00000000' eax='0x80000000'/> + </feature> </cpus> diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml index 52c23315b3..b8dc58f048 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml @@ -12,4 +12,5 @@ <msr index='0x48b' edx='0x00000000' eax='0x00136bff'/> <msr index='0x48c' edx='0x00000501' eax='0x06330041'/> <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/> + <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml index 4583c000b7..9c115e2bfc 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml @@ -55,6 +55,27 @@ <feature policy='require' name='vmx-vnmi'/> <feature policy='require' name='vmx-preemption-timer'/> <feature policy='require' name='vmx-posted-intr'/> + <feature policy='require' name='vmx-vintr-pending'/> + <feature policy='require' name='vmx-tsc-offset'/> + <feature policy='require' name='vmx-hlt-exit'/> + <feature policy='require' name='vmx-invlpg-exit'/> + <feature policy='require' name='vmx-mwait-exit'/> + <feature policy='require' name='vmx-rdpmc-exit'/> + <feature policy='require' name='vmx-rdtsc-exit'/> + <feature policy='require' name='vmx-cr3-load-noexit'/> + <feature policy='require' name='vmx-cr3-store-noexit'/> + <feature policy='require' name='vmx-cr8-load-exit'/> + <feature policy='require' name='vmx-cr8-store-exit'/> + <feature policy='require' name='vmx-flexpriority'/> + <feature policy='require' name='vmx-vnmi-pending'/> + <feature policy='require' name='vmx-movdr-exit'/> + <feature policy='require' name='vmx-io-exit'/> + <feature policy='require' name='vmx-io-bitmap'/> + <feature policy='require' name='vmx-mtf'/> + <feature policy='require' name='vmx-msr-bitmap'/> + <feature policy='require' name='vmx-monitor-exit'/> + <feature policy='require' name='vmx-pause-exit'/> + <feature policy='require' name='vmx-secondary-ctls'/> <feature policy='disable' name='mpx'/> <feature policy='disable' name='core-capability'/> <feature policy='disable' name='pdpe1gb'/> diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml index 0720cfa332..c1dc3191ae 100644 --- a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml @@ -13,4 +13,5 @@ <msr index='0x48b' edx='0x00000000' eax='0x00137bff'/> <msr index='0x48c' edx='0x00000501' eax='0x06330041'/> <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/> + <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml index d6f4317d69..da24c5f06e 100644 --- a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml @@ -51,4 +51,25 @@ <feature policy='require' name='vmx-vnmi'/> <feature policy='require' name='vmx-preemption-timer'/> <feature policy='require' name='vmx-posted-intr'/> + <feature policy='require' name='vmx-vintr-pending'/> + <feature policy='require' name='vmx-tsc-offset'/> + <feature policy='require' name='vmx-hlt-exit'/> + <feature policy='require' name='vmx-invlpg-exit'/> + <feature policy='require' name='vmx-mwait-exit'/> + <feature policy='require' name='vmx-rdpmc-exit'/> + <feature policy='require' name='vmx-rdtsc-exit'/> + <feature policy='require' name='vmx-cr3-load-noexit'/> + <feature policy='require' name='vmx-cr3-store-noexit'/> + <feature policy='require' name='vmx-cr8-load-exit'/> + <feature policy='require' name='vmx-cr8-store-exit'/> + <feature policy='require' name='vmx-flexpriority'/> + <feature policy='require' name='vmx-vnmi-pending'/> + <feature policy='require' name='vmx-movdr-exit'/> + <feature policy='require' name='vmx-io-exit'/> + <feature policy='require' name='vmx-io-bitmap'/> + <feature policy='require' name='vmx-mtf'/> + <feature policy='require' name='vmx-msr-bitmap'/> + <feature policy='require' name='vmx-monitor-exit'/> + <feature policy='require' name='vmx-pause-exit'/> + <feature policy='require' name='vmx-secondary-ctls'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml index 8cdc42a401..e37e437d37 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml @@ -11,4 +11,5 @@ <msr index='0x48b' edx='0x00000000' eax='0x001378ff'/> <msr index='0x48c' edx='0x00000501' eax='0x06330041'/> <msr index='0x48d' edx='0x00000000' eax='0x00000069'/> + <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml index 9c2014affc..247dbaa4cd 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml @@ -50,6 +50,27 @@ <feature policy='require' name='vmx-nmi-exit'/> <feature policy='require' name='vmx-vnmi'/> <feature policy='require' name='vmx-preemption-timer'/> + <feature policy='require' name='vmx-vintr-pending'/> + <feature policy='require' name='vmx-tsc-offset'/> + <feature policy='require' name='vmx-hlt-exit'/> + <feature policy='require' name='vmx-invlpg-exit'/> + <feature policy='require' name='vmx-mwait-exit'/> + <feature policy='require' name='vmx-rdpmc-exit'/> + <feature policy='require' name='vmx-rdtsc-exit'/> + <feature policy='require' name='vmx-cr3-load-noexit'/> + <feature policy='require' name='vmx-cr3-store-noexit'/> + <feature policy='require' name='vmx-cr8-load-exit'/> + <feature policy='require' name='vmx-cr8-store-exit'/> + <feature policy='require' name='vmx-flexpriority'/> + <feature policy='require' name='vmx-vnmi-pending'/> + <feature policy='require' name='vmx-movdr-exit'/> + <feature policy='require' name='vmx-io-exit'/> + <feature policy='require' name='vmx-io-bitmap'/> + <feature policy='require' name='vmx-mtf'/> + <feature policy='require' name='vmx-msr-bitmap'/> + <feature policy='require' name='vmx-monitor-exit'/> + <feature policy='require' name='vmx-pause-exit'/> + <feature policy='require' name='vmx-secondary-ctls'/> <feature policy='disable' name='hle'/> <feature policy='disable' name='rtm'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml index dabcd6c793..52763c7ddb 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml @@ -12,4 +12,5 @@ <msr index='0x48b' edx='0x00000000' eax='0x00137bff'/> <msr index='0x48c' edx='0x00000501' eax='0x06330041'/> <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/> + <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml index 5128582940..f38ff7de22 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml @@ -57,4 +57,25 @@ <feature policy='require' name='vmx-vnmi'/> <feature policy='require' name='vmx-preemption-timer'/> <feature policy='require' name='vmx-posted-intr'/> + <feature policy='require' name='vmx-vintr-pending'/> + <feature policy='require' name='vmx-tsc-offset'/> + <feature policy='require' name='vmx-hlt-exit'/> + <feature policy='require' name='vmx-invlpg-exit'/> + <feature policy='require' name='vmx-mwait-exit'/> + <feature policy='require' name='vmx-rdpmc-exit'/> + <feature policy='require' name='vmx-rdtsc-exit'/> + <feature policy='require' name='vmx-cr3-load-noexit'/> + <feature policy='require' name='vmx-cr3-store-noexit'/> + <feature policy='require' name='vmx-cr8-load-exit'/> + <feature policy='require' name='vmx-cr8-store-exit'/> + <feature policy='require' name='vmx-flexpriority'/> + <feature policy='require' name='vmx-vnmi-pending'/> + <feature policy='require' name='vmx-movdr-exit'/> + <feature policy='require' name='vmx-io-exit'/> + <feature policy='require' name='vmx-io-bitmap'/> + <feature policy='require' name='vmx-mtf'/> + <feature policy='require' name='vmx-msr-bitmap'/> + <feature policy='require' name='vmx-monitor-exit'/> + <feature policy='require' name='vmx-pause-exit'/> + <feature policy='require' name='vmx-secondary-ctls'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml index 36db05d0a1..66327d5abb 100644 --- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml +++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml @@ -57,4 +57,25 @@ <feature policy='require' name='vmx-vnmi'/> <feature policy='require' name='vmx-preemption-timer'/> <feature policy='require' name='vmx-posted-intr'/> + <feature policy='require' name='vmx-vintr-pending'/> + <feature policy='require' name='vmx-tsc-offset'/> + <feature policy='require' name='vmx-hlt-exit'/> + <feature policy='require' name='vmx-invlpg-exit'/> + <feature policy='require' name='vmx-mwait-exit'/> + <feature policy='require' name='vmx-rdpmc-exit'/> + <feature policy='require' name='vmx-rdtsc-exit'/> + <feature policy='require' name='vmx-cr3-load-noexit'/> + <feature policy='require' name='vmx-cr3-store-noexit'/> + <feature policy='require' name='vmx-cr8-load-exit'/> + <feature policy='require' name='vmx-cr8-store-exit'/> + <feature policy='require' name='vmx-flexpriority'/> + <feature policy='require' name='vmx-vnmi-pending'/> + <feature policy='require' name='vmx-movdr-exit'/> + <feature policy='require' name='vmx-io-exit'/> + <feature policy='require' name='vmx-io-bitmap'/> + <feature policy='require' name='vmx-mtf'/> + <feature policy='require' name='vmx-msr-bitmap'/> + <feature policy='require' name='vmx-monitor-exit'/> + <feature policy='require' name='vmx-pause-exit'/> + <feature policy='require' name='vmx-secondary-ctls'/> </cpu> diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml index 5d1e1ef6c3..713ecbcb08 100644 --- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml @@ -94,6 +94,27 @@ <feature policy='require' name='vmx-nmi-exit'/> <feature policy='require' name='vmx-vnmi'/> <feature policy='require' name='vmx-preemption-timer'/> + <feature policy='require' name='vmx-vintr-pending'/> + <feature policy='require' name='vmx-tsc-offset'/> + <feature policy='require' name='vmx-hlt-exit'/> + <feature policy='require' name='vmx-invlpg-exit'/> + <feature policy='require' name='vmx-mwait-exit'/> + <feature policy='require' name='vmx-rdpmc-exit'/> + <feature policy='require' name='vmx-rdtsc-exit'/> + <feature policy='require' name='vmx-cr3-load-noexit'/> + <feature policy='require' name='vmx-cr3-store-noexit'/> + <feature policy='require' name='vmx-cr8-load-exit'/> + <feature policy='require' name='vmx-cr8-store-exit'/> + <feature policy='require' name='vmx-flexpriority'/> + <feature policy='require' name='vmx-vnmi-pending'/> + <feature policy='require' name='vmx-movdr-exit'/> + <feature policy='require' name='vmx-io-exit'/> + <feature policy='require' name='vmx-io-bitmap'/> + <feature policy='require' name='vmx-mtf'/> + <feature policy='require' name='vmx-msr-bitmap'/> + <feature policy='require' name='vmx-monitor-exit'/> + <feature policy='require' name='vmx-pause-exit'/> + <feature policy='require' name='vmx-secondary-ctls'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml index 00687b8a5e..0aef295df2 100644 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml @@ -93,6 +93,27 @@ <feature policy='require' name='vmx-nmi-exit'/> <feature policy='require' name='vmx-vnmi'/> <feature policy='require' name='vmx-preemption-timer'/> + <feature policy='require' name='vmx-vintr-pending'/> + <feature policy='require' name='vmx-tsc-offset'/> + <feature policy='require' name='vmx-hlt-exit'/> + <feature policy='require' name='vmx-invlpg-exit'/> + <feature policy='require' name='vmx-mwait-exit'/> + <feature policy='require' name='vmx-rdpmc-exit'/> + <feature policy='require' name='vmx-rdtsc-exit'/> + <feature policy='require' name='vmx-cr3-load-noexit'/> + <feature policy='require' name='vmx-cr3-store-noexit'/> + <feature policy='require' name='vmx-cr8-load-exit'/> + <feature policy='require' name='vmx-cr8-store-exit'/> + <feature policy='require' name='vmx-flexpriority'/> + <feature policy='require' name='vmx-vnmi-pending'/> + <feature policy='require' name='vmx-movdr-exit'/> + <feature policy='require' name='vmx-io-exit'/> + <feature policy='require' name='vmx-io-bitmap'/> + <feature policy='require' name='vmx-mtf'/> + <feature policy='require' name='vmx-msr-bitmap'/> + <feature policy='require' name='vmx-monitor-exit'/> + <feature policy='require' name='vmx-pause-exit'/> + <feature policy='require' name='vmx-secondary-ctls'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml index 83beaad6ac..e3dd4a82d0 100644 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml @@ -94,6 +94,27 @@ <feature policy='require' name='vmx-nmi-exit'/> <feature policy='require' name='vmx-vnmi'/> <feature policy='require' name='vmx-preemption-timer'/> + <feature policy='require' name='vmx-vintr-pending'/> + <feature policy='require' name='vmx-tsc-offset'/> + <feature policy='require' name='vmx-hlt-exit'/> + <feature policy='require' name='vmx-invlpg-exit'/> + <feature policy='require' name='vmx-mwait-exit'/> + <feature policy='require' name='vmx-rdpmc-exit'/> + <feature policy='require' name='vmx-rdtsc-exit'/> + <feature policy='require' name='vmx-cr3-load-noexit'/> + <feature policy='require' name='vmx-cr3-store-noexit'/> + <feature policy='require' name='vmx-cr8-load-exit'/> + <feature policy='require' name='vmx-cr8-store-exit'/> + <feature policy='require' name='vmx-flexpriority'/> + <feature policy='require' name='vmx-vnmi-pending'/> + <feature policy='require' name='vmx-movdr-exit'/> + <feature policy='require' name='vmx-io-exit'/> + <feature policy='require' name='vmx-io-bitmap'/> + <feature policy='require' name='vmx-mtf'/> + <feature policy='require' name='vmx-msr-bitmap'/> + <feature policy='require' name='vmx-monitor-exit'/> + <feature policy='require' name='vmx-pause-exit'/> + <feature policy='require' name='vmx-secondary-ctls'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml index 1fe5c0196f..54edcf4632 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -93,6 +93,27 @@ <feature policy='require' name='vmx-nmi-exit'/> <feature policy='require' name='vmx-vnmi'/> <feature policy='require' name='vmx-preemption-timer'/> + <feature policy='require' name='vmx-vintr-pending'/> + <feature policy='require' name='vmx-tsc-offset'/> + <feature policy='require' name='vmx-hlt-exit'/> + <feature policy='require' name='vmx-invlpg-exit'/> + <feature policy='require' name='vmx-mwait-exit'/> + <feature policy='require' name='vmx-rdpmc-exit'/> + <feature policy='require' name='vmx-rdtsc-exit'/> + <feature policy='require' name='vmx-cr3-load-noexit'/> + <feature policy='require' name='vmx-cr3-store-noexit'/> + <feature policy='require' name='vmx-cr8-load-exit'/> + <feature policy='require' name='vmx-cr8-store-exit'/> + <feature policy='require' name='vmx-flexpriority'/> + <feature policy='require' name='vmx-vnmi-pending'/> + <feature policy='require' name='vmx-movdr-exit'/> + <feature policy='require' name='vmx-io-exit'/> + <feature policy='require' name='vmx-io-bitmap'/> + <feature policy='require' name='vmx-mtf'/> + <feature policy='require' name='vmx-msr-bitmap'/> + <feature policy='require' name='vmx-monitor-exit'/> + <feature policy='require' name='vmx-pause-exit'/> + <feature policy='require' name='vmx-secondary-ctls'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args index 2611cf3265..d7d30c733c 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ -machine pc-q35-4.2,usb=off,dump-guest-core=off \ -accel kvm \ --cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on \ +-cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on \ -m size=219136k \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args index 02baa07418..707749596f 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ -machine pc-q35-5.0,usb=off,dump-guest-core=off \ -accel kvm \ --cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on \ +-cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on \ -m size=219136k \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -- 2.39.2