[PATCH v3 3/9] KVM: selftests: Add SNP to shutdown testing

[Pratik R. Sampat]

Parameterize the shutdown test to include the SEV-SNP VM type

Signed-off-by: Pratik R. Sampat <pratikrajesh.sam...@amd.com>
Tested-by: Peter Gonda <pgo...@google.com>
Tested-by: Srikanth Aithal <srait...@amd.com>
---
 tools/testing/selftests/kvm/x86_64/sev_smoke_test.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/kvm/x86_64/sev_smoke_test.c 
b/tools/testing/selftests/kvm/x86_64/sev_smoke_test.c
index 12d466915074..8e798f5a2a53 100644
--- a/tools/testing/selftests/kvm/x86_64/sev_smoke_test.c
+++ b/tools/testing/selftests/kvm/x86_64/sev_smoke_test.c
@@ -193,16 +193,14 @@ static void guest_shutdown_code(void)
        __asm__ __volatile__("ud2");
 }
 
-static void test_sev_es_shutdown(void)
+static void test_sev_shutdown(uint32_t type, uint64_t policy)
 {
        struct kvm_vcpu *vcpu;
        struct kvm_vm *vm;
 
-       uint32_t type = KVM_X86_SEV_ES_VM;
-
        vm = vm_sev_create_with_one_vcpu(type, guest_shutdown_code, &vcpu);
 
-       vm_sev_launch(vm, SEV_POLICY_ES, NULL);
+       vm_sev_launch(vm, policy, NULL);
 
        vcpu_run(vcpu);
        TEST_ASSERT(vcpu->run->exit_reason == KVM_EXIT_SHUTDOWN,
@@ -223,7 +221,7 @@ int main(int argc, char *argv[])
                test_sev(guest_sev_es_code, KVM_X86_SEV_ES_VM, SEV_POLICY_ES | 
SEV_POLICY_NO_DBG);
                test_sev(guest_sev_es_code, KVM_X86_SEV_ES_VM, SEV_POLICY_ES);
 
-               test_sev_es_shutdown();
+               test_sev_shutdown(KVM_X86_SEV_ES_VM, SEV_POLICY_ES);
 
                if (kvm_has_cap(KVM_CAP_XCRS) &&
                    (xgetbv(0) & XFEATURE_MASK_X87_AVX) == 
XFEATURE_MASK_X87_AVX) {
@@ -245,6 +243,8 @@ int main(int argc, char *argv[])
                         SNP_FW_VER_MAJOR(SNP_FW_REQ_VER_MAJOR) |
                         SNP_FW_VER_MINOR(SNP_FW_REQ_VER_MINOR));
 
+               test_sev_shutdown(KVM_X86_SNP_VM, snp_policy);
+
                if (kvm_has_cap(KVM_CAP_XCRS) &&
                    (xgetbv(0) & XFEATURE_MASK_X87_AVX) == 
XFEATURE_MASK_X87_AVX) {
                        test_sync_vmsa(KVM_X86_SNP_VM, snp_policy);
-- 
2.34.1