On Wed, Jun 15, 2022 at 07:31:13PM +0000, Colton Lewis wrote: > Enumerate GUEST_ASSERT arguments to avoid magic indices to ucall.args. > > Signed-off-by: Colton Lewis <coltonlewis@xxxxxxxxxx> > --- > tools/testing/selftests/kvm/include/ucall_common.h | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/tools/testing/selftests/kvm/include/ucall_common.h b/tools/testing/selftests/kvm/include/ucall_common.h > index 98562f685151..dbe872870b83 100644 > --- a/tools/testing/selftests/kvm/include/ucall_common.h > +++ b/tools/testing/selftests/kvm/include/ucall_common.h > @@ -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, \ > -- > 2.36.1.476.g0c4daa206d-goog > Reviewed-by: Andrew Jones <drjones@xxxxxxxxxx> _______________________________________________ kvmarm mailing list kvmarm@xxxxxxxxxxxxxxxxxxxxx https://lists.cs.columbia.edu/mailman/listinfo/kvmarm