Changeset 45558 in vbox for trunk/src

Timestamp:

Apr 15, 2013 8:09:57 PM (12 years ago)

Author:

vboxsync

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

85046

Message:

VMM/VMMR0: bits.

File:

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

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

@@ -4965 +4965 @@
  * guest-CPU context.
  */
-static int hmR0VmxSaveGuestGprs(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxSaveGuestRipRspRflags(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     int rc = hmR0VmxSaveGuestRip(pVCpu, pMixedCtx);
@@ -5434 +5434 @@
     VMMRZCallRing3Disable(pVCpu);
 
-    int rc = hmR0VmxSaveGuestGprs(pVCpu, pMixedCtx);
-    AssertLogRelMsgRCReturn(rc, ("hmR0VmxSaveGuestGprs failed! rc=%Rrc (pVCpu=%p)\n", rc, pVCpu), rc);
+    int rc = hmR0VmxSaveGuestRipRspRflags(pVCpu, pMixedCtx);
+    AssertLogRelMsgRCReturn(rc, ("hmR0VmxSaveGuestRipRspRflags failed! rc=%Rrc (pVCpu=%p)\n", rc, pVCpu), rc);
 
     rc = hmR0VmxSaveGuestControlRegs(pVCpu, pMixedCtx);
@@ -6197 +6197 @@
             /* Save the required guest state bits from the VMCS. */
             rc  = hmR0VmxSaveGuestSegmentRegs(pVCpu, pMixedCtx);
-            rc |= hmR0VmxSaveGuestGprs(pVCpu, pMixedCtx);
+            rc |= hmR0VmxSaveGuestRipRspRflags(pVCpu, pMixedCtx);
             AssertRCReturn(rc, rc);
 
@@ -7772 +7772 @@
             rc = hmR0VmxSaveGuestState(pVCpu, pMixedCtx);
 #else
-            rc  = hmR0VmxSaveGuestGprs(pVCpu, pMixedCtx);
+            rc  = hmR0VmxSaveGuestRipRspRflags(pVCpu, pMixedCtx);
             rc |= hmR0VmxSaveGuestControlRegs(pVCpu, pMixedCtx);
             rc |= hmR0VmxSaveGuestSegmentRegs(pVCpu, pMixedCtx);
@@ -8134 +8134 @@
 #else
     /* Aggressive state sync. for now. */
-    rc  = hmR0VmxSaveGuestGprs(pVCpu, pMixedCtx);
+    rc  = hmR0VmxSaveGuestRipRspRflags(pVCpu, pMixedCtx);
     rc |= hmR0VmxSaveGuestControlRegs(pVCpu, pMixedCtx);
     rc |= hmR0VmxSaveGuestSegmentRegs(pVCpu, pMixedCtx);
@@ -8289 +8289 @@
 #else
     /* Aggressive state sync. for now. */
-    rc |= hmR0VmxSaveGuestGprs(pVCpu, pMixedCtx);
+    rc |= hmR0VmxSaveGuestRipRspRflags(pVCpu, pMixedCtx);
     rc |= hmR0VmxSaveGuestControlRegs(pVCpu, pMixedCtx);
     rc |= hmR0VmxSaveGuestSegmentRegs(pVCpu, pMixedCtx);
@@ -8341 +8341 @@
 #else
     /* Aggressive state sync. for now. */
-    rc |= hmR0VmxSaveGuestGprs(pVCpu, pMixedCtx);
+    rc |= hmR0VmxSaveGuestRipRspRflags(pVCpu, pMixedCtx);
     rc |= hmR0VmxSaveGuestControlRegs(pVCpu, pMixedCtx);
     rc |= hmR0VmxSaveGuestSegmentRegs(pVCpu, pMixedCtx);