@@ -54,12 +54,12 @@ static void guest_msr(struct msr_data *msr)
5454
5555 if (msr -> fault_expected )
5656 __GUEST_ASSERT (vector == GP_VECTOR ,
57- "Expected #GP on %sMSR(0x%x), got vector '0x%x' " ,
58- msr -> write ? "WR" : "RD" , msr -> idx , vector );
57+ "Expected #GP on %sMSR(0x%x), got %s " ,
58+ msr -> write ? "WR" : "RD" , msr -> idx , ex_str ( vector ) );
5959 else
6060 __GUEST_ASSERT (!vector ,
61- "Expected success on %sMSR(0x%x), got vector '0x%x' " ,
62- msr -> write ? "WR" : "RD" , msr -> idx , vector );
61+ "Expected success on %sMSR(0x%x), got %s " ,
62+ msr -> write ? "WR" : "RD" , msr -> idx , ex_str ( vector ) );
6363
6464 if (vector || is_write_only_msr (msr -> idx ))
6565 goto done ;
@@ -102,12 +102,12 @@ 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 '%lu', got vector '0x%x' " ,
106- hcall -> control , vector );
105+ "Expected #UD for control '%lu', got %s " ,
106+ hcall -> control , ex_str ( vector ) );
107107 } else {
108108 __GUEST_ASSERT (!vector ,
109- "Expected no exception for control '%lu', got vector '0x%x' " ,
110- hcall -> control , vector );
109+ "Expected no exception for control '%lu', got %s " ,
110+ hcall -> control , ex_str ( vector ) );
111111 GUEST_ASSERT_EQ (res , hcall -> expect );
112112 }
113113
0 commit comments