Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+4 -4
+4 -4
tools/testing/selftests/kvm/x86_64/hyperv_features.c
··· 55 55 if (msr->fault_expected) 56 56 __GUEST_ASSERT(vector == GP_VECTOR, 57 57 "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); 59 59 else 60 60 __GUEST_ASSERT(!vector, 61 61 "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); 63 63 64 64 if (vector || is_write_only_msr(msr->idx)) 65 65 goto done; ··· 102 102 vector = __hyperv_hypercall(hcall->control, input, output, &res); 103 103 if (hcall->ud_expected) { 104 104 __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'", 106 106 hcall->control, vector); 107 107 } else { 108 108 __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'", 110 110 hcall->control, vector); 111 111 GUEST_ASSERT_EQ(res, hcall->expect); 112 112 }