Commit 5f82bbab authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: selftests: Convert s390's tprot test to printf style GUEST_ASSERT 

Convert s390's tprot test to printf-based GUEST_ASSERT.

Link: https://lore.kernel.org/r/20230729003643.1053367-18-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 428c76c7

tools/testing/selftests/kvm/s390x/tprot.c

+5 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 *

 * Copyright IBM Corp. 2021

 */

#define USE_GUEST_ASSERT_PRINTF 1



#include <sys/mman.h>

#include "test_util.h"
@@ -156,7 +157,9 @@ static enum stage perform_next_stage(int *i, bool mapped_0) 
		       !mapped_0;

		if (!skip) {

			result = test_protection(tests[*i].addr, tests[*i].key);

			GUEST_ASSERT_2(result == tests[*i].expected, *i, result);

			__GUEST_ASSERT(result == tests[*i].expected,

				       "Wanted %u, got %u, for i = %u",

				       tests[*i].expected, result, *i);

		}

	}

	return stage;
@@ -190,7 +193,7 @@ static void guest_code(void) 
	vcpu_run(__vcpu);					\

	get_ucall(__vcpu, &uc);					\

	if (uc.cmd == UCALL_ABORT)				\

		REPORT_GUEST_ASSERT_2(uc, "hints: %lu, %lu");	\

		REPORT_GUEST_ASSERT(uc);			\

	TEST_ASSERT_EQ(uc.cmd, UCALL_SYNC);			\

	TEST_ASSERT_EQ(uc.args[1], __stage);			\

})