Changeset 45884 in vbox for trunk/src/VBox/VMM

Timestamp:

May 2, 2013 9:30:28 PM (12 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: More aggressive state sync.: don't save IDTR, LDTR, GDTR, TR unless needed.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (5 diffs)

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

@@ -5210 +5210 @@
     }
 
+    return rc;
+}
+
+
+/**
+ * Saves the guest descriptor table registers and task register from the current
+ * VMCS into the guest-CPU context.
+ *
+ * @returns VBox status code.
+ * @param   pVCpu       Pointer to the VMCPU.
+ * @param   pMixedCtx   Pointer to the guest-CPU context. The data maybe
+ *                      out-of-sync. Make sure to update the required fields
+ *                      before using them.
+ *
+ * @remarks No-long-jump zone!!!
+ */
+static int hmR0VmxSaveGuestTableRegs(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+{
+    int rc = VINF_SUCCESS;
+
     /* Guest LDTR. */
     if (!(pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_LDTR))
@@ -5331 +5351 @@
     rc = hmR0VmxSaveGuestSegmentRegs(pVCpu, pMixedCtx);
     AssertLogRelMsgRCReturn(rc, ("hmR0VmxSaveGuestSegmentRegs failed! rc=%Rrc (pVCpu=%p)\n", rc, pVCpu), rc);
+
+    rc = hmR0VmxSaveGuestTableRegs(pVCpu, pMixedCtx);
+    AssertLogRelMsgRCReturn(rc, ("hmR0VmxSaveGuestTableRegs failed! rc=%Rrc (pVCpu=%p)\n", rc, pVCpu), rc);
 
     rc = hmR0VmxSaveGuestDebugRegs(pVCpu, pMixedCtx);
@@ -6118 +6141 @@
             Assert(pVM->hm.s.vmx.pRealModeTSS);
 
-            /* Save the required guest state bits from the VMCS. */
+            /* We require RIP, RSP, RFLAGS, CS, IDTR. Save the required ones from the VMCS. */
             rc  = hmR0VmxSaveGuestSegmentRegs(pVCpu, pMixedCtx);
+            rc |= hmR0VmxSaveGuestTableRegs(pVCpu, pMixedCtx);
             rc |= hmR0VmxSaveGuestRipRspRflags(pVCpu, pMixedCtx);
             AssertRCReturn(rc, rc);
+            Assert(pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_RIP);
 
             /* Check if the interrupt handler is present in the IVT (real-mode IDT). IDT limit is (4N - 1). */
@@ -8457 +8482 @@
 
     int rc = hmR0VmxReadExitQualificationVmcs(pVCpu, pVmxTransient);
-    rc    |= hmR0VmxSaveGuestSegmentRegs(pVCpu, pMixedCtx);
-    rc    |= hmR0VmxSaveGuestRflags(pVCpu, pMixedCtx);
     AssertRCReturn(rc, rc);
 
@@ -8514 +8537 @@
 
     /* We require CR0 and EFER. EFER is always up-to-date. */
-    int rc = hmR0VmxSaveGuestControlRegs(pVCpu, pMixedCtx);
+    int rc = hmR0VmxSaveGuestCR0(pVCpu, pMixedCtx);
     AssertRCReturn(rc, rc);