Commit 428c76c7 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

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

Convert s390's memop test to printf-based GUEST_ASSERT, and
opportunistically use GUEST_FAIL() to report invalid sizes.

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


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

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

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

 * Copyright (C) 2019, Red Hat, Inc.

 */

#define USE_GUEST_ASSERT_PRINTF 1



#include <stdio.h>

#include <stdlib.h>
@@ -279,7 +280,7 @@ enum stage { 
	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);				\
@@ -469,7 +470,7 @@ static __uint128_t cut_to_size(int size, __uint128_t val) 
	case 16:

		return val;

	}

	GUEST_ASSERT_1(false, "Invalid size");

	GUEST_FAIL("Invalid size = %u", size);

	return 0;

}
@@ -598,7 +599,7 @@ static bool _cmpxchg(int size, void *target, __uint128_t *old_addr, __uint128_t 
			return ret;

		}

	}

	GUEST_ASSERT_1(false, "Invalid size");

	GUEST_FAIL("Invalid size = %u", size);

	return 0;

}