Changeset 81002 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Sep 25, 2019 9:12:34 AM (6 years ago)

Author:

vboxsync

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

133599

Message:

VMM: bugref:9566 TRPM enhancements and cleanup. Bumps TRPM saved-state version.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (1 diff)
• HMVMXR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -3383 +3383 @@
     uint8_t     uVector;
     TRPMEVENT   enmTrpmEvent;
-    RTGCUINT    uErrCode;
+    uint32_t    uErrCode;
     RTGCUINTPTR GCPtrFaultAddress;
     uint8_t     cbInstr;
 
-    int rc = TRPMQueryTrapAll(pVCpu, &uVector, &enmTrpmEvent, &uErrCode, &GCPtrFaultAddress, &cbInstr);
+    int rc = TRPMQueryTrapAll(pVCpu, &uVector, &enmTrpmEvent, &uErrCode, &GCPtrFaultAddress, &cbInstr, NULL /* pfIcebp */);
     AssertRC(rc);
 

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -7828 +7828 @@
     uint8_t     uVector;
     TRPMEVENT   enmTrpmEvent;
-    RTGCUINT    uErrCode;
+    uint32_t    uErrCode;
     RTGCUINTPTR GCPtrFaultAddress;
     uint8_t     cbInstr;
-
-    int rc = TRPMQueryTrapAll(pVCpu, &uVector, &enmTrpmEvent, &uErrCode, &GCPtrFaultAddress, &cbInstr);
+    bool        fIcebp;
+
+    int rc = TRPMQueryTrapAll(pVCpu, &uVector, &enmTrpmEvent, &uErrCode, &GCPtrFaultAddress, &cbInstr, &fIcebp);
     AssertRC(rc);
 
     uint32_t u32IntInfo;
     u32IntInfo  = uVector | VMX_IDT_VECTORING_INFO_VALID;
-    u32IntInfo |= HMTrpmEventTypeToVmxEventType(uVector, enmTrpmEvent);
+    u32IntInfo |= HMTrpmEventTypeToVmxEventType(uVector, enmTrpmEvent, fIcebp);
 
     rc = TRPMResetTrap(pVCpu);
@@ -7876 +7877 @@
     else if (VMX_IDT_VECTORING_INFO_TYPE(u32IntInfo) == VMX_IDT_VECTORING_INFO_TYPE_SW_INT)
         TRPMSetInstrLength(pVCpu, pVCpu->hm.s.Event.cbInstr);
+
+    if (VMX_IDT_VECTORING_INFO_TYPE(u32IntInfo) == VMX_IDT_VECTORING_INFO_TYPE_PRIV_SW_XCPT)
+        TRPMSetTrapDueToIcebp(pVCpu);
 
     /* We're now done converting the pending event. */
@@ -13619 +13623 @@
         {
             /* It's a guest page fault and needs to be reflected to the guest. */
-            uint32_t uGstErrorCode = TRPMGetErrorCode(pVCpu);
+            uint32_t const uGstErrorCode = TRPMGetErrorCode(pVCpu);
             TRPMResetTrap(pVCpu);
             pVCpu->hm.s.Event.fPending = false;                 /* In case it's a contributory #PF. */