KVM: selftests: Drop manual CR4.OSXSAVE enabling from CR4/CPUID sync test

Now that CR4.OSXSAVE is enabled by default, drop the manual enabling from
CR4/CPUID sync test and instead assert that CR4.OSXSAVE is enabled.

Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Link: https://lore.kernel.org/r/20241003234337.273364-8-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c b/tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c
index da818afb7031ebfb93c529039571953580abf86d..28cc66454601987466f4d9db99547d325a6e83c1 100644 (file)
--- a/tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c
+++ b/tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c
@@ -27,12 +27,9 @@ static void guest_code(void)
                [KVM_CPUID_EAX] = X86_FEATURE_OSXSAVE.function,
                [KVM_CPUID_ECX] = X86_FEATURE_OSXSAVE.index,
        };
-       uint64_t cr4;
 
-       /* turn on CR4.OSXSAVE */
-       cr4 = get_cr4();
-       cr4 |= X86_CR4_OSXSAVE;
-       set_cr4(cr4);
+       /* CR4.OSXSAVE should be enabled by default (for selftests vCPUs). */
+       GUEST_ASSERT(get_cr4() & X86_CR4_OSXSAVE);
 
        /* verify CR4.OSXSAVE == CPUID.OSXSAVE */
        GUEST_ASSERT(this_cpu_has(X86_FEATURE_OSXSAVE));