Changeset 13872 in vbox for trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp

Timestamp:

Nov 5, 2008 3:00:48 PM (16 years ago)

Author:

vboxsync

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

38870

Message:

Pass the VMCPU id on to all hwaccm functions.

File:

• trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp (modified) (9 diffs)

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

@@ -65 +65 @@
 
     /** Ring 0 handlers for VT-x and AMD-V. */
-    DECLR0CALLBACKMEMBER(int, pfnEnterSession,(PVM pVM, PHWACCM_CPUINFO pCpu));
-    DECLR0CALLBACKMEMBER(int, pfnLeaveSession,(PVM pVM, CPUMCTX *pCtx));
-    DECLR0CALLBACKMEMBER(int, pfnSaveHostState,(PVM pVM));
-    DECLR0CALLBACKMEMBER(int, pfnLoadGuestState,(PVM pVM, CPUMCTX *pCtx));
-    DECLR0CALLBACKMEMBER(int, pfnRunGuestCode,(PVM pVM, CPUMCTX *pCtx));
+    DECLR0CALLBACKMEMBER(int, pfnEnterSession,(PVM pVM, RTCPUID idVCpu, PHWACCM_CPUINFO pCpu));
+    DECLR0CALLBACKMEMBER(int, pfnLeaveSession,(PVM pVM, RTCPUID idVCpu, PCPUMCTX pCtx));
+    DECLR0CALLBACKMEMBER(int, pfnSaveHostState,(PVM pVM, RTCPUID idVCpu));
+    DECLR0CALLBACKMEMBER(int, pfnLoadGuestState,(PVM pVM, RTCPUID idVCpu, PCPUMCTX pCtx));
+    DECLR0CALLBACKMEMBER(int, pfnRunGuestCode,(PVM pVM, RTCPUID idVCpu, PCPUMCTX pCtx));
     DECLR0CALLBACKMEMBER(int, pfnEnableCpu, (PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys));
     DECLR0CALLBACKMEMBER(int, pfnDisableCpu, (PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys));
@@ -865 +865 @@
  * @returns VBox status code.
  * @param   pVM         The VM to operate on.
- */
-VMMR0DECL(int) HWACCMR0Enter(PVM pVM)
+ * @param   idVCpu      VMCPUD id.
+ */
+VMMR0DECL(int) HWACCMR0Enter(PVM pVM, RTCPUID idVCpu)
 {
     PCPUMCTX        pCtx;
@@ -894 +895 @@
         pVM->hwaccm.s.u64RegisterMask = UINT64_C(0xFFFFFFFF);
 
-    rc  = HWACCMR0Globals.pfnEnterSession(pVM, pCpu);
+    rc  = HWACCMR0Globals.pfnEnterSession(pVM, idVCpu, pCpu);
     AssertRC(rc);
     /* We must save the host context here (VT-x) as we might be rescheduled on a different cpu after a long jump back to ring 3. */
-    rc |= HWACCMR0Globals.pfnSaveHostState(pVM);
+    rc |= HWACCMR0Globals.pfnSaveHostState(pVM, idVCpu);
     AssertRC(rc);
-    rc |= HWACCMR0Globals.pfnLoadGuestState(pVM, pCtx);
+    rc |= HWACCMR0Globals.pfnLoadGuestState(pVM, idVCpu, pCtx);
     AssertRC(rc);
 
@@ -919 +920 @@
  * @returns VBox status code.
  * @param   pVM         The VM to operate on.
- */
-VMMR0DECL(int) HWACCMR0Leave(PVM pVM)
+ * @param   idVCpu      VMCPUD id.
+ */
+VMMR0DECL(int) HWACCMR0Leave(PVM pVM, RTCPUID idVCpu)
 {
     PCPUMCTX        pCtx;
@@ -944 +946 @@
     }
 
-    rc = HWACCMR0Globals.pfnLeaveSession(pVM, pCtx);
+    rc = HWACCMR0Globals.pfnLeaveSession(pVM, idVCpu, pCtx);
 
 #ifdef VBOX_STRICT
@@ -961 +963 @@
  * @returns VBox status code.
  * @param   pVM         The VM to operate on.
- */
-VMMR0DECL(int) HWACCMR0RunGuestCode(PVM pVM)
+ * @param   idVCpu      VMCPUD id.
+ */
+VMMR0DECL(int) HWACCMR0RunGuestCode(PVM pVM, RTCPUID idVCpu)
 {
     CPUMCTX *pCtx;
@@ -978 +981 @@
     pCtx = CPUMQueryGuestCtxPtr(pVM);
 
-    return HWACCMR0Globals.pfnRunGuestCode(pVM, pCtx);
+    return HWACCMR0Globals.pfnRunGuestCode(pVM, idVCpu, pCtx);
 }
 
@@ -1277 +1280 @@
 
 /* Dummy callback handlers. */
-VMMR0DECL(int) HWACCMR0DummyEnter(PVM pVM, PHWACCM_CPUINFO pCpu)
+VMMR0DECL(int) HWACCMR0DummyEnter(PVM pVM, RTCPUID idVCpu, PHWACCM_CPUINFO pCpu)
 {
     return VINF_SUCCESS;
 }
 
-VMMR0DECL(int) HWACCMR0DummyLeave(PVM pVM, PCPUMCTX pCtx)
+VMMR0DECL(int) HWACCMR0DummyLeave(PVM pVM, RTCPUID idVCpu, PCPUMCTX pCtx)
 {
     return VINF_SUCCESS;
@@ -1312 +1315 @@
 }
 
-VMMR0DECL(int) HWACCMR0DummyRunGuestCode(PVM pVM, CPUMCTX *pCtx)
+VMMR0DECL(int) HWACCMR0DummyRunGuestCode(PVM pVM, RTCPUID idVCpu, PCPUMCTX pCtx)
 {
     return VINF_SUCCESS;
 }
 
-VMMR0DECL(int) HWACCMR0DummySaveHostState(PVM pVM)
+VMMR0DECL(int) HWACCMR0DummySaveHostState(PVM pVM, RTCPUID idVCpu)
 {
     return VINF_SUCCESS;
 }
 
-VMMR0DECL(int) HWACCMR0DummyLoadGuestState(PVM pVM, CPUMCTX *pCtx)
+VMMR0DECL(int) HWACCMR0DummyLoadGuestState(PVM pVM, RTCPUID idVCpu, PCPUMCTX pCtx)
 {
     return VINF_SUCCESS;