| Message ID | 20210430232408.2707420-4-ricarkol@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: selftests: arm64 exception handling and debug test | expand |
On Fri, Apr 30, 2021 at 04:24:05PM -0700, Ricardo Koller wrote: > Move GUEST_ASSERT_EQ to a common header, kvm_util.h, for other > architectures and tests to use. > > Signed-off-by: Ricardo Koller <ricarkol@google.com> > --- > tools/testing/selftests/kvm/include/kvm_util.h | 9 +++++++++ > tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c | 9 --------- > 2 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h > index 7880929ea548..bd26dd93ab56 100644 > --- a/tools/testing/selftests/kvm/include/kvm_util.h > +++ b/tools/testing/selftests/kvm/include/kvm_util.h > @@ -388,4 +388,13 @@ uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc); > #define GUEST_ASSERT_4(_condition, arg1, arg2, arg3, arg4) \ > __GUEST_ASSERT((_condition), 4, (arg1), (arg2), (arg3), (arg4)) > > +#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) > + > #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; > -- > 2.31.1.527.g47e6f16901-goog > How about modify __GUEST_ASSERT so we can reuse it instead, like below? (I also took the opportunity to remove the unnecessary () within the comma separated statements.) Thanks, drew -#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)) - -#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) + __GUEST_ASSERT(_condition, #_condition, 4, arg1, arg2, arg3, arg4) + +#define GUEST_ASSERT_EQ(a, b) __GUEST_ASSERT((a) == (b), #a " == " #b, 2, a, b)
diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h index 7880929ea548..bd26dd93ab56 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -388,4 +388,13 @@ uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc); #define GUEST_ASSERT_4(_condition, arg1, arg2, arg3, arg4) \ __GUEST_ASSERT((_condition), 4, (arg1), (arg2), (arg3), (arg4)) +#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) + #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;
Move GUEST_ASSERT_EQ to a common header, kvm_util.h, for other architectures and tests to use. Signed-off-by: Ricardo Koller <ricarkol@google.com> --- tools/testing/selftests/kvm/include/kvm_util.h | 9 +++++++++ tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-)