diff options
| author | Sean Christopherson <seanjc@google.com> | 2023-07-29 02:36:25 +0200 |
|---|---|---|
| committer | Sean Christopherson <seanjc@google.com> | 2023-08-02 23:43:06 +0200 |
| commit | 428c76c769fa652e2186de464c74e34daede489f (patch) | |
| tree | 5b24fe280a9f1a181bd6ff39dfba70bc88af1641 /tools/testing/selftests/kvm/s390x | |
| parent | KVM: selftests: Convert the memslot performance test to printf guest asserts (diff) | |
| download | linux-428c76c769fa652e2186de464c74e34daede489f.tar.xz linux-428c76c769fa652e2186de464c74e34daede489f.zip | |
KVM: selftests: Convert s390's memop test to printf style GUEST_ASSERT
Convert s390's memop test to printf-based GUEST_ASSERT, and
opportunistically use GUEST_FAIL() to report invalid sizes.
Link: https://lore.kernel.org/r/20230729003643.1053367-17-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/memop.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/testing/selftests/kvm/s390x/memop.c b/tools/testing/selftests/kvm/s390x/memop.c index de73dc030905..a49173907cec 100644 --- a/tools/testing/selftests/kvm/s390x/memop.c +++ b/tools/testing/selftests/kvm/s390x/memop.c @@ -4,6 +4,7 @@ * * Copyright (C) 2019, Red Hat, Inc. */ +#define USE_GUEST_ASSERT_PRINTF 1 #include <stdio.h> #include <stdlib.h> @@ -279,7 +280,7 @@ enum stage { 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); \ @@ -469,7 +470,7 @@ static __uint128_t cut_to_size(int size, __uint128_t val) case 16: return val; } - GUEST_ASSERT_1(false, "Invalid size"); + GUEST_FAIL("Invalid size = %u", size); return 0; } @@ -598,7 +599,7 @@ static bool _cmpxchg(int size, void *target, __uint128_t *old_addr, __uint128_t return ret; } } - GUEST_ASSERT_1(false, "Invalid size"); + GUEST_FAIL("Invalid size = %u", size); return 0; } |