Changeset 66276 in vbox for trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp

Timestamp:

Mar 28, 2017 7:14:16 AM (8 years ago)

Author:

vboxsync

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

114200

Message:

VMM: Nested Hw.virt: SVM MSRPM and IOPM allocations.

File:

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

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

@@ -484 +484 @@
                 }
 
+                /*
+                 * Update the exit interruption info field so that if an exception occurs
+                 * while delivering the event causing a #VMEXIT, we only need to update
+                 * the valid bit while the rest is already in place.
+                 */
+                pVmcbCtrl->ExitIntInfo.u = pVmcbCtrl->EventInject.u;
+                pVmcbCtrl->ExitIntInfo.n.u1Valid = 0;
+
                 /** @todo NRIP: Software interrupts can only be pushed properly if we support
                  *        NRIP for the nested-guest to calculate the instruction length
                  *        below. */
-                IEMInjectTrap(pVCpu, uVector, enmType, uErrorCode, pCtx->cr2, 0 /* cbInstr */);
+                VBOXSTRICTRC rcStrict = IEMInjectTrap(pVCpu, uVector, enmType, uErrorCode, pCtx->cr2, 0 /* cbInstr */);
+                if (rcStrict == VINF_SVM_VMEXIT)
+                    return rcStrict;
             }
 
@@ -577 +587 @@
             Assert(pCtx->hwvirt.svm.VmcbCtrl.IntCtrl.n.u8VIrqVector);
         }
-        /* Save V_TPR. */
-
+        /** @todo Save V_TPR, V_IRQ. */
         /** @todo NRIP. */
 
@@ -587 +596 @@
 
         /*
-         * Clear event injection.
+         * Clear event injection in the VMCB.
          */
         pCtx->hwvirt.svm.VmcbCtrl.EventInject.n.u1Valid = 0;
@@ -688 +697 @@
 }
 
+
+#if 0
+VMM_INT_DECL(int) HMSvmNstGstGetInterrupt(PVMCPU pVCpu)
+{
+    PCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
+    Assert(CPUMIsGuestInNestedHwVirtMode(pCtx));
+
+    PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.VmcbCtrl;
+    Assert(RT_BOOL(pVmcbCtrl->IntCtrl.n.u1VIrqValid));
+
+    if (pVmcbCtrl->IntCtrl.n.u1VIntrMasking)
+    {
+    }
+}
+#endif