Commit 8fb2638a authored by Colton Lewis's avatar Colton Lewis Committed by Sean Christopherson
Browse files

KVM: selftests: enumerate GUEST_ASSERT arguments 



Enumerate GUEST_ASSERT arguments to avoid magic indices to ucall.args.

Signed-off-by: default avatarColton Lewis <coltonlewis@google.com>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Link: https://lore.kernel.org/r/20220615193116.806312-2-coltonlewis@google.com


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

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

+8 −0
Original line number Diff line number Diff line
@@ -32,6 +32,14 @@ uint64_t get_ucall(struct kvm_vcpu *vcpu, 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)



enum guest_assert_builtin_args {

	GUEST_ERROR_STRING,

	GUEST_FILE,

	GUEST_LINE,

	GUEST_ASSERT_BUILTIN_NARGS

};



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

	if (!(_condition))                                              \

		ucall(UCALL_ABORT, 2 + _nargs,                          \