diff options
| author |   Sean Christopherson <seanjc@google.com> | 2023-07-28 17:36:26 -0700 |
|---|---|---|
| committer | Sean Christopherson <seanjc@google.com> | 2023-08-02 14:43:07 -0700 |
| commit | 5f82bbab84adcb8990f17503393628a210086b2c (patch) | |
| tree | efbf64b3ac8996ec5b32d0f8624477069100f525 /tools/testing/selftests/kvm/s390x | |
| parent | KVM: selftests: Convert s390's memop test to printf style GUEST_ASSERT (diff) | |
| download | wireguard-linux-5f82bbab84adcb8990f17503393628a210086b2c.tar.xz wireguard-linux-5f82bbab84adcb8990f17503393628a210086b2c.zip | |
KVM: selftests: Convert s390's tprot test to printf style GUEST_ASSERT
Convert s390's tprot test to printf-based GUEST_ASSERT.
Link: https://lore.kernel.org/r/20230729003643.1053367-18-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
Diffstat (limited to 'tools/testing/selftests/kvm/s390x')
| -rw-r--r-- | tools/testing/selftests/kvm/s390x/tprot.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/testing/selftests/kvm/s390x/tprot.c b/tools/testing/selftests/kvm/s390x/tprot.c index 40d3ea16c052..c12c6824d963 100644 --- a/tools/testing/selftests/kvm/s390x/tprot.c +++ b/tools/testing/selftests/kvm/s390x/tprot.c @@ -4,6 +4,7 @@ * * Copyright IBM Corp. 2021 */ +#define USE_GUEST_ASSERT_PRINTF 1 #include <sys/mman.h> #include "test_util.h" @@ -156,7 +157,9 @@ static enum stage perform_next_stage(int *i, bool mapped_0) !mapped_0; if (!skip) { result = test_protection(tests[*i].addr, tests[*i].key); - GUEST_ASSERT_2(result == tests[*i].expected, *i, result); + __GUEST_ASSERT(result == tests[*i].expected, + "Wanted %u, got %u, for i = %u", + tests[*i].expected, result, *i); } } return stage; @@ -190,7 +193,7 @@ static void guest_code(void) vcpu_run(__vcpu); \ get_ucall(__vcpu, &uc); \ if (uc.cmd == UCALL_ABORT) \ - REPORT_GUEST_ASSERT_2(uc, "hints: %lu, %lu"); \ + REPORT_GUEST_ASSERT(uc); \ TEST_ASSERT_EQ(uc.cmd, UCALL_SYNC); \ TEST_ASSERT_EQ(uc.args[1], __stage); \ }) |