Skip to content

Commit f813e6d

Browse files
committed
KVM: selftests: Fix broken assert messages in Hyper-V features test
Swap the ordering of parameters to guest asserts related to {RD,WR}MSR success/failure in the Hyper-V features test. As is, the output will be mangled and broken due to passing an integer as a string and vice versa. Opportunistically fix a benign %u vs. %lu issue as well. Link: https://lore.kernel.org/r/20231129224916.532431-4-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 4d53dcc commit f813e6d

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

tools/testing/selftests/kvm/x86_64/hyperv_features.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ static void guest_msr(struct msr_data *msr)
5555
if (msr->fault_expected)
5656
__GUEST_ASSERT(vector == GP_VECTOR,
5757
"Expected #GP on %sMSR(0x%x), got vector '0x%x'",
58-
msr->idx, msr->write ? "WR" : "RD", vector);
58+
msr->write ? "WR" : "RD", msr->idx, vector);
5959
else
6060
__GUEST_ASSERT(!vector,
6161
"Expected success on %sMSR(0x%x), got vector '0x%x'",
62-
msr->idx, msr->write ? "WR" : "RD", vector);
62+
msr->write ? "WR" : "RD", msr->idx, vector);
6363

6464
if (vector || is_write_only_msr(msr->idx))
6565
goto done;
@@ -102,11 +102,11 @@ static void guest_hcall(vm_vaddr_t pgs_gpa, struct hcall_data *hcall)
102102
vector = __hyperv_hypercall(hcall->control, input, output, &res);
103103
if (hcall->ud_expected) {
104104
__GUEST_ASSERT(vector == UD_VECTOR,
105-
"Expected #UD for control '%u', got vector '0x%x'",
105+
"Expected #UD for control '%lu', got vector '0x%x'",
106106
hcall->control, vector);
107107
} else {
108108
__GUEST_ASSERT(!vector,
109-
"Expected no exception for control '%u', got vector '0x%x'",
109+
"Expected no exception for control '%lu', got vector '0x%x'",
110110
hcall->control, vector);
111111
GUEST_ASSERT_EQ(res, hcall->expect);
112112
}

0 commit comments

Comments
 (0)