[PATCH 4/7] qemu: Translate vmx-invvpid-single-context-noglobals CPU feature

This feature is called "vmx-invept-single-context-noglobals" in QEMU and our CPU map even contains the appropriate alias. But we failed to actually translate the name when talking to QEMU. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 + tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml | 1 + tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml | 1 + tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml | 2 +- tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml | 1 + .../x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml | 1 + 10 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6a0f3e2ab7..1d7ac9803d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3570,6 +3570,7 @@ virQEMUCapsCPUFeatureTranslationTable virQEMUCapsCPUFeaturesX86[] = { {"perfctr_core", "perfctr-core"}, {"perfctr_nb", "perfctr-nb"}, {"tsc_adjust", "tsc-adjust"}, + {"vmx-invvpid-single-context-noglobals", "vmx-invept-single-context-noglobals"}, {NULL, NULL} }; diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml index 80c24facdf..77613d6071 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml @@ -10,7 +10,7 @@ <msr index='0x480' edx='0x00c00000' eax='0x00000000'/> <msr index='0x485' edx='0x00000000' eax='0x20000060'/> <msr index='0x48b' edx='0x00000000' eax='0x00136bff'/> - <msr index='0x48c' edx='0x00000501' eax='0x06330041'/> + <msr index='0x48c' edx='0x00000d01' eax='0x06330041'/> <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/> <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/> diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml index b334e9062c..ed30dfe008 100644 --- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml @@ -50,6 +50,7 @@ <feature policy='require' name='vmx-invvpid'/> <feature policy='require' name='vmx-invvpid-single-addr'/> <feature policy='require' name='vmx-invvpid-all-context'/> + <feature policy='require' name='vmx-invvpid-single-context-noglobals'/> <feature policy='require' name='vmx-intr-exit'/> <feature policy='require' name='vmx-nmi-exit'/> <feature policy='require' name='vmx-vnmi'/> diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml index c42a69d102..08609a89a5 100644 --- a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml @@ -11,7 +11,7 @@ <msr index='0x480' edx='0x00c00000' eax='0x00000000'/> <msr index='0x485' edx='0x00000000' eax='0x20000060'/> <msr index='0x48b' edx='0x00000000' eax='0x00137bff'/> - <msr index='0x48c' edx='0x00000501' eax='0x06330041'/> + <msr index='0x48c' edx='0x00000d01' eax='0x06330041'/> <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/> <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/> diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml index 822deb46cf..8d91a319a3 100644 --- a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml @@ -46,6 +46,7 @@ <feature policy='require' name='vmx-invvpid'/> <feature policy='require' name='vmx-invvpid-single-addr'/> <feature policy='require' name='vmx-invvpid-all-context'/> + <feature policy='require' name='vmx-invvpid-single-context-noglobals'/> <feature policy='require' name='vmx-intr-exit'/> <feature policy='require' name='vmx-nmi-exit'/> <feature policy='require' name='vmx-vnmi'/> 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 19dd4f6f0c..424c2492bd 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml @@ -9,7 +9,7 @@ <msr index='0x480' edx='0x00c00000' eax='0x00000000'/> <msr index='0x485' edx='0x00000000' eax='0x20000060'/> <msr index='0x48b' edx='0x00000000' eax='0x001378ff'/> - <msr index='0x48c' edx='0x00000501' eax='0x06330041'/> + <msr index='0x48c' edx='0x00000d01' eax='0x06330041'/> <msr index='0x48d' edx='0x00000000' eax='0x00000069'/> <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/> 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 5f7b2b49c4..662e88bc3b 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml @@ -47,6 +47,7 @@ <feature policy='require' name='vmx-invvpid'/> <feature policy='require' name='vmx-invvpid-single-addr'/> <feature policy='require' name='vmx-invvpid-all-context'/> + <feature policy='require' name='vmx-invvpid-single-context-noglobals'/> <feature policy='require' name='vmx-intr-exit'/> <feature policy='require' name='vmx-nmi-exit'/> <feature policy='require' name='vmx-vnmi'/> 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 b830c52b8c..a8e24f2302 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml @@ -10,7 +10,7 @@ <msr index='0x480' edx='0x00c00000' eax='0x00000000'/> <msr index='0x485' edx='0x00000000' eax='0x20000060'/> <msr index='0x48b' edx='0x00000000' eax='0x00137bff'/> - <msr index='0x48c' edx='0x00000501' eax='0x06330041'/> + <msr index='0x48c' edx='0x00000d01' eax='0x06330041'/> <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/> <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/> <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/> 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 46faf74879..38e15ab63d 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml @@ -53,6 +53,7 @@ <feature policy='require' name='vmx-invvpid'/> <feature policy='require' name='vmx-invvpid-single-addr'/> <feature policy='require' name='vmx-invvpid-all-context'/> + <feature policy='require' name='vmx-invvpid-single-context-noglobals'/> <feature policy='require' name='vmx-intr-exit'/> <feature policy='require' name='vmx-nmi-exit'/> <feature policy='require' name='vmx-vnmi'/> diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml index bd28239199..c5731093a7 100644 --- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml +++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml @@ -53,6 +53,7 @@ <feature policy='require' name='vmx-invvpid'/> <feature policy='require' name='vmx-invvpid-single-addr'/> <feature policy='require' name='vmx-invvpid-all-context'/> + <feature policy='require' name='vmx-invvpid-single-context-noglobals'/> <feature policy='require' name='vmx-intr-exit'/> <feature policy='require' name='vmx-nmi-exit'/> <feature policy='require' name='vmx-vnmi'/> -- 2.46.2