| Message ID | 20220615193116.806312-4-coltonlewis@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix filename reporting in guest asserts | expand |
On Wed, Jun 15, 2022 at 07:31:15PM +0000, Colton Lewis wrote: > Write REPORT_GUEST_ASSERT macros to pair with GUEST_ASSERT to abstract > and make consistent all guest assertion reporting. Every report > includes an explanatory string, a filename, and a line number. > > Signed-off-by: Colton Lewis <coltonlewis@google.com> > --- > .../selftests/kvm/include/ucall_common.h | 42 +++++++++++++++++++ > 1 file changed, 42 insertions(+) > > diff --git a/tools/testing/selftests/kvm/include/ucall_common.h b/tools/testing/selftests/kvm/include/ucall_common.h > index 568c562f14cd..e8af3b4fef6d 100644 > --- a/tools/testing/selftests/kvm/include/ucall_common.h > +++ b/tools/testing/selftests/kvm/include/ucall_common.h > @@ -6,6 +6,7 @@ > */ > #ifndef SELFTEST_KVM_UCALL_COMMON_H > #define SELFTEST_KVM_UCALL_COMMON_H > +#include "test_util.h" > > /* Common ucalls */ > enum { > @@ -64,4 +65,45 @@ enum guest_assert_builtin_args { > > #define GUEST_ASSERT_EQ(a, b) __GUEST_ASSERT((a) == (b), #a " == " #b, 2, a, b) > > +#define __REPORT_GUEST_ASSERT(_ucall, fmt, _args...) \ > + TEST_FAIL("%s at %s:%ld\n" fmt, \ > + (const char *)(_ucall).args[GUEST_ERROR_STRING], \ > + (const char *)(_ucall).args[GUEST_FILE], \ > + (_ucall).args[GUEST_LINE], \ > + ##_args) > + > +#define GUEST_ASSERT_ARG(ucall, i) ((ucall).args[GUEST_ASSERT_BUILTIN_NARGS + i]) > + > +#define REPORT_GUEST_ASSERT(ucall) \ > + __REPORT_GUEST_ASSERT((ucall), "") > + > +#define REPORT_GUEST_ASSERT_1(ucall, fmt) \ > + __REPORT_GUEST_ASSERT((ucall), \ > + fmt, \ > + GUEST_ASSERT_ARG((ucall), 0)) > + > +#define REPORT_GUEST_ASSERT_2(ucall, fmt) \ > + __REPORT_GUEST_ASSERT((ucall), \ > + fmt, \ > + GUEST_ASSERT_ARG((ucall), 0), \ > + GUEST_ASSERT_ARG((ucall), 1)) > + > +#define REPORT_GUEST_ASSERT_3(ucall, fmt) \ > + __REPORT_GUEST_ASSERT((ucall), \ > + fmt, \ > + GUEST_ASSERT_ARG((ucall), 0), \ > + GUEST_ASSERT_ARG((ucall), 1), \ > + GUEST_ASSERT_ARG((ucall), 2)) > + > +#define REPORT_GUEST_ASSERT_4(ucall, fmt) \ > + __REPORT_GUEST_ASSERT((ucall), \ > + fmt, \ > + GUEST_ASSERT_ARG((ucall), 0), \ > + GUEST_ASSERT_ARG((ucall), 1), \ > + GUEST_ASSERT_ARG((ucall), 2), \ > + GUEST_ASSERT_ARG((ucall), 3)) > + > +#define REPORT_GUEST_ASSERT_N(ucall, fmt, args...) \ > + __REPORT_GUEST_ASSERT((ucall), fmt, ##args) > + > #endif /* SELFTEST_KVM_UCALL_COMMON_H */ > -- > 2.36.1.476.g0c4daa206d-goog > nit: All the ()'s around ucall when it's between ( and , are unnecessary. Otherwise, Reviewed-by: Andrew Jones <drjones@redhat.com> Thanks, drew
diff --git a/tools/testing/selftests/kvm/include/ucall_common.h b/tools/testing/selftests/kvm/include/ucall_common.h index 568c562f14cd..e8af3b4fef6d 100644 --- a/tools/testing/selftests/kvm/include/ucall_common.h +++ b/tools/testing/selftests/kvm/include/ucall_common.h @@ -6,6 +6,7 @@ */ #ifndef SELFTEST_KVM_UCALL_COMMON_H #define SELFTEST_KVM_UCALL_COMMON_H +#include "test_util.h" /* Common ucalls */ enum { @@ -64,4 +65,45 @@ enum guest_assert_builtin_args { #define GUEST_ASSERT_EQ(a, b) __GUEST_ASSERT((a) == (b), #a " == " #b, 2, a, b) +#define __REPORT_GUEST_ASSERT(_ucall, fmt, _args...) \ + TEST_FAIL("%s at %s:%ld\n" fmt, \ + (const char *)(_ucall).args[GUEST_ERROR_STRING], \ + (const char *)(_ucall).args[GUEST_FILE], \ + (_ucall).args[GUEST_LINE], \ + ##_args) + +#define GUEST_ASSERT_ARG(ucall, i) ((ucall).args[GUEST_ASSERT_BUILTIN_NARGS + i]) + +#define REPORT_GUEST_ASSERT(ucall) \ + __REPORT_GUEST_ASSERT((ucall), "") + +#define REPORT_GUEST_ASSERT_1(ucall, fmt) \ + __REPORT_GUEST_ASSERT((ucall), \ + fmt, \ + GUEST_ASSERT_ARG((ucall), 0)) + +#define REPORT_GUEST_ASSERT_2(ucall, fmt) \ + __REPORT_GUEST_ASSERT((ucall), \ + fmt, \ + GUEST_ASSERT_ARG((ucall), 0), \ + GUEST_ASSERT_ARG((ucall), 1)) + +#define REPORT_GUEST_ASSERT_3(ucall, fmt) \ + __REPORT_GUEST_ASSERT((ucall), \ + fmt, \ + GUEST_ASSERT_ARG((ucall), 0), \ + GUEST_ASSERT_ARG((ucall), 1), \ + GUEST_ASSERT_ARG((ucall), 2)) + +#define REPORT_GUEST_ASSERT_4(ucall, fmt) \ + __REPORT_GUEST_ASSERT((ucall), \ + fmt, \ + GUEST_ASSERT_ARG((ucall), 0), \ + GUEST_ASSERT_ARG((ucall), 1), \ + GUEST_ASSERT_ARG((ucall), 2), \ + GUEST_ASSERT_ARG((ucall), 3)) + +#define REPORT_GUEST_ASSERT_N(ucall, fmt, args...) \ + __REPORT_GUEST_ASSERT((ucall), fmt, ##args) + #endif /* SELFTEST_KVM_UCALL_COMMON_H */
Write REPORT_GUEST_ASSERT macros to pair with GUEST_ASSERT to abstract and make consistent all guest assertion reporting. Every report includes an explanatory string, a filename, and a line number. Signed-off-by: Colton Lewis <coltonlewis@google.com> --- .../selftests/kvm/include/ucall_common.h | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+)