Changeset 60806 in vbox

Timestamp:

May 3, 2016 4:52:00 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

107011

Message:

VMM/APIC: Set the 'receive' and not 'send' illegal vector error when LVT entry is incorrectly programmed, logging, 130 col.

File:

• trunk/src/VBox/VMM/VMMAll/APICAll.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/APICAll.cpp

@@ -519 +519 @@
             else
             {
-                Log2(("APIC%u: apicSignalNextPendingIntr: Nothing to signal. uVector=%#x uPpr=%#x uTpr=%#x\n", pVCpu->idCpu, uVector,
-                      uPpr, pXApicPage->tpr.u8Tpr));
+                Log2(("APIC%u: apicSignalNextPendingIntr: Nothing to signal. uVector=%#x uPpr=%#x uTpr=%#x\n", pVCpu->idCpu,
+                      uVector, uPpr, pXApicPage->tpr.u8Tpr));
             }
         }
@@ -564 +564 @@
         pXApicPage->lvt_lint1.u.u1Mask   = 1;
         pXApicPage->lvt_error.u.u1Mask   = 1;
-        apicSignalNextPendingIntr(pVCpu);
-    }
+    }
+
+    apicSignalNextPendingIntr(pVCpu);
     return VINF_SUCCESS;
 }
@@ -1429 +1430 @@
     if (RT_UNLIKELY(   XAPIC_LVT_GET_VECTOR(uLvt) <= XAPIC_ILLEGAL_VECTOR_END
                     && XAPIC_LVT_GET_DELIVERY_MODE(uLvt) == XAPICDELIVERYMODE_FIXED))
-        apicSetError(pVCpu, XAPIC_ESR_SEND_ILLEGAL_VECTOR);
+        apicSetError(pVCpu, XAPIC_ESR_RECV_ILLEGAL_VECTOR);
 
     Log2(("APIC%u: apicSetLvtEntry: offLvt=%#RX16 uLvt=%#RX32\n", pVCpu->idCpu, offLvt, uLvt));
@@ -1544 +1545 @@
                        && offReg != XAPIC_OFF_EOI));
             uValue = apicReadRaw32(pXApicPage, offReg);
+            Log2(("APIC%u: apicReadRegister: offReg=%#x uValue=%#x\n", pVCpu->idCpu, offReg, uValue));
             break;
         }