SVM needs CPUID[0x8000000A] to be available. So if SVM is enabled
in a CPU model or explicitly in the command-line, adjust CPUID
xlevel to expose the CPUID[0x8000000A] leaf.
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
---
target-i386/cpu.c | 6 ++++++
tests/test-x86-cpuid-compat.c | 11 +++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 1ebd7cc..1953dda 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -3051,6 +3051,12 @@ static void x86_cpu_realizefn(DeviceState *dev, Error
**errp)
x86_cpu_adjust_feat_level(cpu, FEAT_SVM);
x86_cpu_adjust_feat_level(cpu, FEAT_XSAVE);
+ /* SVM requires CPUID[0x8000000A] */
+ if (env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_SVM) {
+ x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel,
env->cpuid_max_xlevel,
+ 0x8000000A);
+ }
+
/* Set cpuid_*level* based on cpuid_min_*level, if not explicitly set */
if (!env->cpuid_level) {
env->cpuid_level = env->cpuid_min_level;
diff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c
index 7051825..c287ead 100644
--- a/tests/test-x86-cpuid-compat.c
+++ b/tests/test-x86-cpuid-compat.c
@@ -77,6 +77,7 @@ int main(int argc, char **argv)
add_cpuid_test("x86/cpuid/486/xlevel", "-cpu 486", "xlevel", 0);
add_cpuid_test("x86/cpuid/core2duo/xlevel", "-cpu core2duo", "xlevel",
0x80000008);
add_cpuid_test("x86/cpuid/phenom/xlevel", "-cpu phenom", "xlevel",
0x8000001A);
+ add_cpuid_test("x86/cpuid/athlon/xlevel", "-cpu athlon", "xlevel",
0x80000008);
/* If level is not large enough, it should increase automatically: */
/* CPUID[6].EAX: */
@@ -97,6 +98,8 @@ int main(int argc, char **argv)
add_cpuid_test("x86/cpuid/auto-xlevel/486/npt", "-cpu 486,+npt", "xlevel",
0x8000000A);
/* CPUID[C000_0001].EDX: */
add_cpuid_test("x86/cpuid/auto-xlevel2/phenom/xstore", "-cpu
phenom,+xstore", "xlevel2", 0xC0000001);
+ /* SVM needs CPUID[0x8000000A] */
+ add_cpuid_test("x86/cpuid/auto-xlevel/athlon/svm", "-cpu athlon,+svm",
"xlevel", 0x8000000A);
/* If level is already large enough, it shouldn't change: */
@@ -106,10 +109,10 @@ int main(int argc, char **argv)
add_cpuid_test("x86/cpuid/auto-level/486/fixed/2", "-cpu
486,level=2,+arat,+fsgsbase,+avx512vbmi,+xsaveopt", "level", 2);
/* if xlevel is already large enough, it shouldn't change: */
- add_cpuid_test("x86/cpuid/auto-xlevel/phenom/3dnow", "-cpu
phenom,+3dnow,+sse4a,+invtsc,+npt", "xlevel", 0x8000001A);
+ add_cpuid_test("x86/cpuid/auto-xlevel/phenom/3dnow", "-cpu
phenom,+3dnow,+sse4a,+invtsc,+npt,+svm", "xlevel", 0x8000001A);
/* If xlevel is explicitly set, it shouldn't change: */
- add_cpuid_test("x86/cpuid/auto-xlevel/486/fixed/80000002", "-cpu
486,xlevel=0x80000002,+3dnow,+sse4a,+invtsc,+npt", "xlevel", 0x80000002);
- add_cpuid_test("x86/cpuid/auto-xlevel/486/fixed/8000001A", "-cpu
486,xlevel=0x8000001A,+3dnow,+sse4a,+invtsc,+npt", "xlevel", 0x8000001A);
+ add_cpuid_test("x86/cpuid/auto-xlevel/486/fixed/80000002", "-cpu
486,xlevel=0x80000002,+3dnow,+sse4a,+invtsc,+npt,+svm", "xlevel", 0x80000002);
+ add_cpuid_test("x86/cpuid/auto-xlevel/486/fixed/8000001A", "-cpu
486,xlevel=0x8000001A,+3dnow,+sse4a,+invtsc,+npt,+svm", "xlevel", 0x8000001A);
/* if xlevel2 is already large enough, it shouldn't change: */
add_cpuid_test("x86/cpuid/auto-xlevel2/486/fixed", "-cpu
486,xlevel2=0xC0000002,+xstore", "xlevel2", 0xC0000002);
@@ -117,7 +120,7 @@ int main(int argc, char **argv)
/* Compatibility test for older machine-types that don't auto-increase
level/xlevel/xlevel2: */
add_cpuid_test("x86/cpuid/auto-level/pc-2.7", "-machine pc-i440fx-2.7 -cpu
486,+arat,+avx512vbmi,+xsaveopt", "level", 1);
- add_cpuid_test("x86/cpuid/auto-xlevel/pc-2.7", "-machine pc-i440fx-2.7
-cpu 486,+3dnow,+sse4a,+invtsc,+npt", "xlevel", 0);
+ add_cpuid_test("x86/cpuid/auto-xlevel/pc-2.7", "-machine pc-i440fx-2.7
-cpu 486,+3dnow,+sse4a,+invtsc,+npt,+svm", "xlevel", 0);
add_cpuid_test("x86/cpuid/auto-xlevel2/pc-2.7", "-machine pc-i440fx-2.7
-cpu 486,+xstore", "xlevel2", 0);
return g_test_run();
--
2.7.4
