Commit 67f709f5 authored by Ricardo Koller's avatar Ricardo Koller Committed by Marc Zyngier
Browse files

KVM: selftests: Move GUEST_ASSERT_EQ to utils header 



Move GUEST_ASSERT_EQ to a common header, kvm_util.h, for other
architectures and tests to use. Also modify __GUEST_ASSERT so it can be
reused to implement GUEST_ASSERT_EQ.

Signed-off-by: default avatarRicardo Koller <ricarkol@google.com>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210611011020.3420067-5-ricarkol@google.com
parent 75275d7f

tools/testing/selftests/kvm/include/kvm_util.h

+12 −10
Original line number Diff line number Diff line
@@ -368,26 +368,28 @@ uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc); 
				ucall(UCALL_SYNC, 6, "hello", stage, arg1, arg2, arg3, arg4)

#define GUEST_SYNC(stage)	ucall(UCALL_SYNC, 2, "hello", stage)

#define GUEST_DONE()		ucall(UCALL_DONE, 0)

#define __GUEST_ASSERT(_condition, _nargs, _args...) do {	\

#define __GUEST_ASSERT(_condition, _condstr, _nargs, _args...) do {    \

	if (!(_condition))                                              \

		ucall(UCALL_ABORT, 2 + _nargs,                          \

			"Failed guest assert: "                         \

			#_condition, __LINE__, _args);		\

			_condstr, __LINE__, _args);                     \

} while (0)



#define GUEST_ASSERT(_condition) \

	__GUEST_ASSERT((_condition), 0, 0)

	__GUEST_ASSERT(_condition, #_condition, 0, 0)



#define GUEST_ASSERT_1(_condition, arg1) \

	__GUEST_ASSERT((_condition), 1, (arg1))

	__GUEST_ASSERT(_condition, #_condition, 1, (arg1))



#define GUEST_ASSERT_2(_condition, arg1, arg2) \

	__GUEST_ASSERT((_condition), 2, (arg1), (arg2))

	__GUEST_ASSERT(_condition, #_condition, 2, (arg1), (arg2))



#define GUEST_ASSERT_3(_condition, arg1, arg2, arg3) \

	__GUEST_ASSERT((_condition), 3, (arg1), (arg2), (arg3))

	__GUEST_ASSERT(_condition, #_condition, 3, (arg1), (arg2), (arg3))



#define GUEST_ASSERT_4(_condition, arg1, arg2, arg3, arg4) \

	__GUEST_ASSERT((_condition), 4, (arg1), (arg2), (arg3), (arg4))

	__GUEST_ASSERT(_condition, #_condition, 4, (arg1), (arg2), (arg3), (arg4))



#define GUEST_ASSERT_EQ(a, b) __GUEST_ASSERT((a) == (b), #a " == " #b, 2, a, b)



#endif /* SELFTEST_KVM_UTIL_H */

tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c

+0 −9
Original line number Diff line number Diff line
@@ -18,15 +18,6 @@ 
#define rounded_rdmsr(x)       ROUND(rdmsr(x))

#define rounded_host_rdmsr(x)  ROUND(vcpu_get_msr(vm, 0, x))



#define GUEST_ASSERT_EQ(a, b) do {				\

	__typeof(a) _a = (a);					\

	__typeof(b) _b = (b);					\

	if (_a != _b)						\

                ucall(UCALL_ABORT, 4,				\

                        "Failed guest assert: "			\

                        #a " == " #b, __LINE__, _a, _b);	\

  } while(0)



static void guest_code(void)

{

	u64 val = 0;