Changeset 19679 in vbox for trunk

Timestamp:

May 14, 2009 8:34:39 AM (16 years ago)

Author:

vboxsync

Message:

Fixed wrong usage of HWACCMR3IsActive.

Location:

trunk

Files:

• include/VBox/hwaccm.h (modified) (1 diff)
• src/VBox/VMM/EM.cpp (modified) (2 diffs)
• src/VBox/VMM/HWACCM.cpp (modified) (6 diffs)
• src/VBox/VMM/HWACCMInternal.h (modified) (3 diffs)
• src/VBox/VMM/PGMMap.cpp (modified) (2 diffs)
• src/VBox/VMM/TRPM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMGuruMeditation.cpp (modified) (3 diffs)

trunk/include/VBox/hwaccm.h

@@ -127 +127 @@
 VMMR3DECL(void) HWACCMR3NotifyScheduled(PVMCPU pVCpu);
 VMMR3DECL(void) HWACCMR3NotifyEmulated(PVMCPU pVCpu);
-VMMR3DECL(bool) HWACCMR3IsActive(PVM pVM);
+VMMR3DECL(bool) HWACCMR3IsActive(PVMCPU pVCpu);
 VMMR3DECL(bool) HWACCMR3IsNestedPagingActive(PVM pVM);
 VMMR3DECL(bool) HWACCMR3IsAllowed(PVM pVM);

trunk/src/VBox/VMM/EM.cpp

@@ -1616 +1616 @@
      * Traps can be directly forwarded in hardware accelerated mode.
      */
-    if (HWACCMR3IsActive(pVM))
+    if (HWACCMIsEnabled(pVM))
     {
 #ifdef LOGGING_ENABLED
@@ -3488 +3488 @@
                 VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS);
             }
-            if (HWACCMR3IsActive(pVM))
+            if (HWACCMR3IsActive(pVCpu))
                 rc2 = VINF_EM_RESCHEDULE_HWACC;
             else

trunk/src/VBox/VMM/HWACCM.cpp

@@ -178 +178 @@
     pVM->hwaccm.s.svm.fEnabled   = false;
 
-    pVM->hwaccm.s.fActive        = false;
     pVM->hwaccm.s.fNestedPaging  = false;
 
@@ -248 +247 @@
 {
     LogFlow(("HWACCMR3InitCPU\n"));
+
+    for (unsigned i=0;i<pVM->cCPUs;i++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[i];
+
+        pVCpu->hwaccm.s.fActive = false;
+    }
 
 #ifdef VBOX_WITH_STATISTICS
@@ -1178 +1184 @@
         pVCpu->hwaccm.s.vmx.cr4_mask = 0;
 
+        pVCpu->hwaccm.s.fActive        = false;
         pVCpu->hwaccm.s.Event.fPending = false;
 
@@ -1249 +1256 @@
     if (pVM->hwaccm.s.svm.fEnabled)
     {
-        pVM->hwaccm.s.fActive = true;
+        pVCpu->hwaccm.s.fActive = true;
         return true;
     }
 
-    pVM->hwaccm.s.fActive = false;
+    pVCpu->hwaccm.s.fActive = false;
 
     /* Note! The context supplied by REM is partial. If we add more checks here, be sure to verify that REM provides this info! */
@@ -1378 +1385 @@
             return false;
 
-        pVM->hwaccm.s.fActive = true;
+        pVCpu->hwaccm.s.fActive = true;
         return true;
     }
@@ -1410 +1417 @@
  *
  * @returns boolean
- * @param   pVM         The VM to operate on.
- */
-VMMR3DECL(bool) HWACCMR3IsActive(PVM pVM)
-{
-    return pVM->hwaccm.s.fActive;
+ * @param   pVCpu        The VMCPU to operate on.
+ */
+VMMR3DECL(bool) HWACCMR3IsActive(PVMCPU pVCpu)
+{
+    return pVCpu->hwaccm.s.fActive;
 }
 

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -190 +190 @@
     bool                        fInitialized;
 
-    /** Set when we're using VMX/SVN at that moment. */
-    bool                        fActive;
-
     /** Set when hardware acceleration is allowed. */
     bool                        fAllowed;
@@ -210 +207 @@
     /** Explicit alignment padding to make 32-bit gcc align u64RegisterMask
      *  naturally. */
-    bool                        padding[1];
+    bool                        padding[2];
 
     /** And mask for copying register contents. */
@@ -463 +460 @@
     bool                        fForceTLBFlush;
 
-    /** Explicit alignment padding to make 32-bit gcc align u64RegisterMask
-     *  naturally. */
-    bool                        padding[1];
+    /** Set when we're using VT-x or AMD-V at that moment. */
+    bool                        fActive;
 
     /** HWACCM_CHANGED_* flags. */

trunk/src/VBox/VMM/PGMMap.cpp

@@ -517 +517 @@
     /* Ignore the additions mapping fix call in VT-x/AMD-V. */
     if (    pVM->pgm.s.fMappingsFixed
-        &&  HWACCMR3IsActive(pVM))
+        &&  HWACCMIsEnabled(pVM))
         return VINF_SUCCESS;
 
@@ -710 +710 @@
 
     /* Ignore in VT-x/AMD-V mode. */
-    if (HWACCMR3IsActive(pVM))
+    if (HWACCMIsEnabled(pVM))
         return VINF_SUCCESS;
 

trunk/src/VBox/VMM/TRPM.cpp

@@ -1459 +1459 @@
         if (RT_SUCCESS(rc))
         {
-            if (HWACCMR3IsActive(pVM))
+            if (HWACCMIsEnabled(pVM))
             {
                 rc = TRPMAssertTrap(pVCpu, u8Interrupt, enmEvent);

trunk/src/VBox/VMM/VMMGuruMeditation.cpp

@@ -266 +266 @@
             RTGCUINTPTR     uCR2       = 0xdeadface;
             int rc2 = TRPMQueryTrapAll(pVCpu, &u8TrapNo, &enmType, &uErrorCode, &uCR2);
-            if (!HWACCMR3IsActive(pVM))
+            if (!HWACCMIsEnabled(pVM))
             {
                 if (RT_SUCCESS(rc2))
@@ -285 +285 @@
              * The hypervisor dump is not relevant when we're in VT-x/AMD-V mode.
              */
-            if (HWACCMR3IsActive(pVM))
+            if (HWACCMIsEnabled(pVM))
             {
                 pHlp->pfnPrintf(pHlp, "\n");
@@ -449 +449 @@
                                 pVCpu->vmm.s.pbEMTStackRC, pVCpu->vmm.s.pbEMTStackBottomRC,
                                 VMM_STACK_SIZE, pVCpu->vmm.s.pbEMTStackR3);
-            } /* !HWACCMR3IsActive */
+            } /* !HWACCMIsEnabled */
             break;
         }