Commit 0c3d7c00 authored by Eduardo Habkost's avatar Eduardo Habkost
Browse files

target-i386: Enable CPUID[0x8000000A] if SVM is enabled 



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.

Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent c39c0edf

target-i386/cpu.c

+4 −0
Original line number Diff line number Diff line
@@ -3047,6 +3047,10 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) 
        x86_cpu_adjust_feat_level(cpu, FEAT_C000_0001_EDX);

        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, 0x8000000A);

        }

    }



    /* Set cpuid_*level* based on cpuid_min_*level, if not explicitly set */

tests/test-x86-cpuid-compat.c

+10 −5
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ int main(int argc, char **argv) 
                   "-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: */
@@ -112,6 +114,9 @@ int main(int argc, char **argv) 
    /* 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: */
@@ -131,17 +136,17 @@ int main(int argc, char **argv) 


    /* 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",

                   "-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",

                   "-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",

                   "-cpu 486,xlevel=0x8000001A,+3dnow,+sse4a,+invtsc,+npt,+svm",

                   "xlevel", 0x8000001A);

    add_cpuid_test("x86/cpuid/auto-xlevel/phenom/fixed/0",

                   "-cpu 486,xlevel=0,+3dnow,+sse4a,+invtsc,+npt",

                   "-cpu 486,xlevel=0,+3dnow,+sse4a,+invtsc,+npt,+svm",

                   "xlevel", 0);



    /* if xlevel2 is already large enough, it shouldn't change: */
@@ -156,7 +161,7 @@ int main(int argc, char **argv) 
                   "-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",

                   "-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",