Hi Ricardo,
On 5/13/21 2:28 AM, Ricardo Koller wrote:
> 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: Ricardo Koller <ricarkol@xxxxxxxxxx>
Reviewed-by: Eric Auger <eric.auger@xxxxxxxxxx>
Thanks
Eric
> ---
> .../testing/selftests/kvm/include/kvm_util.h | 22 ++++++++++---------
> .../selftests/kvm/x86_64/tsc_msrs_test.c | 9 --------
> 2 files changed, 12 insertions(+), 19 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h
> index 7880929ea548..fb2b8964f2ca 100644
> --- a/tools/testing/selftests/kvm/include/kvm_util.h
> +++ b/tools/testing/selftests/kvm/include/kvm_util.h
> @@ -366,26 +366,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 { \
> - if (!(_condition)) \
> - ucall(UCALL_ABORT, 2 + _nargs, \
> - "Failed guest assert: " \
> - #_condition, __LINE__, _args); \
> +#define __GUEST_ASSERT(_condition, _condstr, _nargs, _args...) do { \
> + if (!(_condition)) \
> + ucall(UCALL_ABORT, 2 + _nargs, \
> + "Failed guest assert: " \
> + _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 */
> diff --git a/tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c b/tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c
> index e357d8e222d4..5a6a662f2e59 100644
> --- a/tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c
> +++ b/tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c
> @@ -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;
>
