vbox的更動 19141 路徑 trunk/src/VBox/VMM/SELM.cpp

時間撮記:

2009-4-23 下午01:52:18 (16 年 以前)

作者:

vboxsync

訊息:

Action flags breakup.
Fixed PGM saved state loading of 2.2.2 images.
Reduced hacks in PATM state loading (fixups).

檔案:

• trunk/src/VBox/VMM/SELM.cpp (修改) (15 筆差異)

trunk/src/VBox/VMM/SELM.cpp

@@ -223 +223 @@
      * Default action when entering raw mode for the first time
      */
-    VM_FF_SET(pVM, VM_FF_SELM_SYNC_TSS);
-    VM_FF_SET(pVM, VM_FF_SELM_SYNC_GDT);
-    VM_FF_SET(pVM, VM_FF_SELM_SYNC_LDT);
+    PVMCPU pVCpu = &pVM->aCpus[0];  /* raw mode implies on VCPU */
+    VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
+    VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_GDT);
+    VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_LDT);
 
     /*
@@ -579 +580 @@
      * Default action when entering raw mode for the first time
      */
-    VM_FF_SET(pVM, VM_FF_SELM_SYNC_TSS);
-    VM_FF_SET(pVM, VM_FF_SELM_SYNC_GDT);
-    VM_FF_SET(pVM, VM_FF_SELM_SYNC_LDT);
+    PVMCPU pVCpu = &pVM->aCpus[0];  /* raw mode implies on VCPU */
+    VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
+    VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_GDT);
+    VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_LDT);
 }
 
@@ -651 +653 @@
 #endif
 
-    VM_FF_CLEAR(pVM, VM_FF_SELM_SYNC_TSS);
-    VM_FF_CLEAR(pVM, VM_FF_SELM_SYNC_GDT);
-    VM_FF_CLEAR(pVM, VM_FF_SELM_SYNC_LDT);
+    PVMCPU pVCpu = &pVM->aCpus[0];  /* raw mode implies on VCPU */
+    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
+    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_SELM_SYNC_GDT);
+    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_SELM_SYNC_LDT);
 
     pVM->selm.s.fDisableMonitoring = true;
@@ -774 +777 @@
     if (PGMGetGuestMode(pVCpu) != PGMMODE_REAL)
     {
-        VM_FF_SET(pVM, VM_FF_SELM_SYNC_GDT);
-        VM_FF_SET(pVM, VM_FF_SELM_SYNC_LDT);
-        VM_FF_SET(pVM, VM_FF_SELM_SYNC_TSS);
+        VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_GDT);
+        VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_LDT);
+        VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
         SELMR3UpdateFromCPUM(pVM, pVCpu);
     }
@@ -783 +786 @@
      * Flag everything for resync on next raw mode entry.
      */
-    VM_FF_SET(pVM, VM_FF_SELM_SYNC_GDT);
-    VM_FF_SET(pVM, VM_FF_SELM_SYNC_LDT);
-    VM_FF_SET(pVM, VM_FF_SELM_SYNC_TSS);
+    VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_GDT);
+    VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_LDT);
+    VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
 
     return VINF_SUCCESS;
@@ -804 +807 @@
     if (pVM->selm.s.fDisableMonitoring)
     {
-        VM_FF_CLEAR(pVM, VM_FF_SELM_SYNC_GDT);
-        VM_FF_CLEAR(pVM, VM_FF_SELM_SYNC_LDT);
-        VM_FF_CLEAR(pVM, VM_FF_SELM_SYNC_TSS);
+        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_SELM_SYNC_GDT);
+        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_SELM_SYNC_LDT);
+        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
 
         return VINF_SUCCESS;
@@ -816 +819 @@
      * GDT sync
      */
-    if (VM_FF_ISSET(pVM, VM_FF_SELM_SYNC_GDT))
+    if (VMCPU_FF_ISSET(pVCpu, VMCPU_FF_SELM_SYNC_GDT))
     {
         /*
          * Always assume the best
          */
-        VM_FF_CLEAR(pVM, VM_FF_SELM_SYNC_GDT);
+        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_SELM_SYNC_GDT);
 
         /* If the GDT was changed, then make sure the LDT is checked too */
         /** @todo only do this if the actual ldtr selector was changed; this is a bit excessive */
-        VM_FF_SET(pVM, VM_FF_SELM_SYNC_LDT);
+        VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_LDT);
         /* Same goes for the TSS selector */
-        VM_FF_SET(pVM, VM_FF_SELM_SYNC_TSS);
+        VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
 
         /*
@@ -1074 +1077 @@
      * TSS sync
      */
-    if (VM_FF_ISSET(pVM, VM_FF_SELM_SYNC_TSS))
+    if (VMCPU_FF_ISSET(pVCpu, VMCPU_FF_SELM_SYNC_TSS))
     {
         SELMR3SyncTSS(pVM, pVCpu);
@@ -1082 +1085 @@
      * LDT sync
      */
-    if (VM_FF_ISSET(pVM, VM_FF_SELM_SYNC_LDT))
+    if (VMCPU_FF_ISSET(pVCpu, VMCPU_FF_SELM_SYNC_LDT))
     {
         /*
          * Always assume the best
          */
-        VM_FF_CLEAR(pVM, VM_FF_SELM_SYNC_LDT);
+        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_SELM_SYNC_LDT);
 
         /*
@@ -1368 +1371 @@
     Assert(enmAccessType == PGMACCESSTYPE_WRITE);
     Log(("selmR3GuestGDTWriteHandler: write to %RGv size %d\n", GCPtr, cbBuf));
-    VM_FF_SET(pVM, VM_FF_SELM_SYNC_GDT);
-
+
+    VMCPU_FF_SET(VMMGetCpu(pVM), VMCPU_FF_SELM_SYNC_GDT);
     return VINF_PGM_HANDLER_DO_DEFAULT;
 }
@@ -1394 +1397 @@
     Assert(enmAccessType == PGMACCESSTYPE_WRITE);
     Log(("selmR3GuestLDTWriteHandler: write to %RGv size %d\n", GCPtr, cbBuf));
-    VM_FF_SET(pVM, VM_FF_SELM_SYNC_LDT);
+    VMCPU_FF_SET(VMMGetCpu(pVM), VMCPU_FF_SELM_SYNC_LDT);
     return VINF_PGM_HANDLER_DO_DEFAULT;
 }
@@ -1425 +1428 @@
      *        changes while we're in REM. */
 
-    VM_FF_SET(pVM, VM_FF_SELM_SYNC_TSS);
+    VMCPU_FF_SET(VMMGetCpu(pVM), VMCPU_FF_SELM_SYNC_TSS);
 
     return VINF_PGM_HANDLER_DO_DEFAULT;
@@ -1449 +1452 @@
     if (pVM->selm.s.fDisableMonitoring)
     {
-        VM_FF_CLEAR(pVM, VM_FF_SELM_SYNC_TSS);
+        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
         return VINF_SUCCESS;
     }
 
     STAM_PROFILE_START(&pVM->selm.s.StatTSSSync, a);
-    Assert(VM_FF_ISSET(pVM, VM_FF_SELM_SYNC_TSS));
+    Assert(VMCPU_FF_ISSET(pVCpu, VMCPU_FF_SELM_SYNC_TSS));
 
     /*
@@ -1632 +1635 @@
     }
 
-    VM_FF_CLEAR(pVM, VM_FF_SELM_SYNC_TSS);
+    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
 
     STAM_PROFILE_STOP(&pVM->selm.s.StatTSSSync, a);
@@ -1789 +1792 @@
     PVMCPU pVCpu = VMMGetCpu(pVM);
 
-    if (VM_FF_ISSET(pVM, VM_FF_SELM_SYNC_TSS))
+    if (VMCPU_FF_ISSET(pVCpu, VMCPU_FF_SELM_SYNC_TSS))
         return true;