|
4 | 4 | *
|
5 | 5 | * Tests for KVM paravirtual feature disablement
|
6 | 6 | */
|
| 7 | +#define USE_GUEST_ASSERT_PRINTF 1 |
| 8 | + |
7 | 9 | #include <asm/kvm_para.h>
|
8 | 10 | #include <linux/kvm_para.h>
|
9 | 11 | #include <stdint.h>
|
@@ -46,10 +48,10 @@ static void test_msr(struct msr_data *msr)
|
46 | 48 | PR_MSR(msr);
|
47 | 49 |
|
48 | 50 | vector = rdmsr_safe(msr->idx, &ignored);
|
49 |
| - GUEST_ASSERT_1(vector == GP_VECTOR, vector); |
| 51 | + GUEST_ASSERT_EQ(vector, GP_VECTOR); |
50 | 52 |
|
51 | 53 | vector = wrmsr_safe(msr->idx, 0);
|
52 |
| - GUEST_ASSERT_1(vector == GP_VECTOR, vector); |
| 54 | + GUEST_ASSERT_EQ(vector, GP_VECTOR); |
53 | 55 | }
|
54 | 56 |
|
55 | 57 | struct hcall_data {
|
@@ -77,7 +79,7 @@ static void test_hcall(struct hcall_data *hc)
|
77 | 79 |
|
78 | 80 | PR_HCALL(hc);
|
79 | 81 | r = kvm_hypercall(hc->nr, 0, 0, 0, 0);
|
80 |
| - GUEST_ASSERT(r == -KVM_ENOSYS); |
| 82 | + GUEST_ASSERT_EQ(r, -KVM_ENOSYS); |
81 | 83 | }
|
82 | 84 |
|
83 | 85 | static void guest_main(void)
|
@@ -125,7 +127,7 @@ static void enter_guest(struct kvm_vcpu *vcpu)
|
125 | 127 | pr_hcall(&uc);
|
126 | 128 | break;
|
127 | 129 | case UCALL_ABORT:
|
128 |
| - REPORT_GUEST_ASSERT_1(uc, "vector = %lu"); |
| 130 | + REPORT_GUEST_ASSERT(uc); |
129 | 131 | return;
|
130 | 132 | case UCALL_DONE:
|
131 | 133 | return;
|
|
0 commit comments