Changeset 44346 in vbox

Timestamp:

Jan 23, 2013 11:39:39 PM (12 years ago)

Author:

vboxsync

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

83304

Message:

TM: PVM -> PUVM in two APIs used by Main. VMReq: Validate pUVM properly for external acalls as well.

Location:

trunk

Files:

• include/VBox/vmm/tm.h (modified) (1 diff)
• src/VBox/Main/src-client/MachineDebuggerImpl.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/TMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/TM.cpp (modified) (5 diffs)
• src/VBox/VMM/VMMR3/VMReq.cpp (modified) (1 diff)
• src/VBox/VMM/testcase/tstAnimate.cpp (modified) (1 diff)

trunk/include/VBox/vmm/tm.h

@@ -88 +88 @@
 VMMR3DECL(int)          TMR3NotifySuspend(PVM pVM, PVMCPU pVCpu);
 VMMR3DECL(int)          TMR3NotifyResume(PVM pVM, PVMCPU pVCpu);
-VMMR3DECL(int)          TMR3SetWarpDrive(PVM pVM, uint32_t u32Percent);
-#endif
-VMMDECL(uint32_t)       TMGetWarpDrive(PVM pVM);
+VMMR3DECL(int)          TMR3SetWarpDrive(PUVM pUVM, uint32_t u32Percent);
+VMMR3DECL(uint32_t)     TMR3GetWarpDrive(PUVM pUVM);
+#endif
 VMM_INT_DECL(uint32_t)  TMCalcHostTimerFrequency(PVM pVM, PVMCPU pVCpu);
 #ifdef IN_RING3

trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp

@@ -786 +786 @@
         hrc = ptrVM.rc();
         if (SUCCEEDED(hrc))
-            *a_puPct = TMGetWarpDrive(ptrVM.raw());
+            *a_puPct = TMR3GetWarpDrive(ptrVM.rawUVM());
     }
 
@@ -816 +816 @@
             if (SUCCEEDED(hrc))
             {
-                int vrc = TMR3SetWarpDrive(ptrVM.raw(), a_uPct);
+                int vrc = TMR3SetWarpDrive(ptrVM.rawUVM(), a_uPct);
                 if (RT_FAILURE(vrc))
                     hrc = setError(VBOX_E_VM_ERROR, tr("TMR3SetWarpDrive(, %u) failed with rc=%Rrc"), a_uPct, vrc);

trunk/src/VBox/VMM/VMMAll/TMAll.cpp

@@ -72 +72 @@
 # define TMTIMER_ASSERT_CRITSECT(pTimer) do { } while (0)
 #endif
-
-
-/**
- * Gets the current warp drive percent.
- *
- * @returns The warp drive percent.
- * @param   pVM         Pointer to the VM.
- */
-VMMDECL(uint32_t) TMGetWarpDrive(PVM pVM)
-{
-    return pVM->tm.s.u32VirtualWarpDrivePercentage;
-}
 
 

trunk/src/VBox/VMM/VMMR3/TM.cpp

@@ -135 +135 @@
 #include "TMInternal.h"
 #include <VBox/vmm/vm.h>
+#include <VBox/vmm/uvm.h>
 
 #include <VBox/vmm/pdmdev.h>
@@ -171 +172 @@
 static void                 tmR3TimerQueueRun(PVM pVM, PTMTIMERQUEUE pQueue);
 static void                 tmR3TimerQueueRunVirtualSync(PVM pVM);
-static DECLCALLBACK(int)    tmR3SetWarpDrive(PVM pVM, uint32_t u32Percent);
+static DECLCALLBACK(int)    tmR3SetWarpDrive(PUVM pUVM, uint32_t u32Percent);
 #ifndef VBOX_WITHOUT_NS_ACCOUNTING
 static DECLCALLBACK(void)   tmR3CpuLoadTimer(PVM pVM, PTMTIMER pTimer, void *pvUser);
@@ -2719 +2720 @@
  * @param   u32Percent  The new percentage. 100 means normal operation.
  */
-VMMDECL(int) TMR3SetWarpDrive(PVM pVM, uint32_t u32Percent)
-{
-    return VMR3ReqPriorityCallWait(pVM, VMCPUID_ANY, (PFNRT)tmR3SetWarpDrive, 2, pVM, u32Percent);
+VMMDECL(int) TMR3SetWarpDrive(PUVM pUVM, uint32_t u32Percent)
+{
+    return VMR3ReqPriorityCallWaitU(pUVM, VMCPUID_ANY, (PFNRT)tmR3SetWarpDrive, 2, pUVM, u32Percent);
 }
 
@@ -2729 +2730 @@
  *
  * @returns VBox status code.
- * @param   pVM         Pointer to the VM.
+ * @param   pUVM        The user mode VM handle.
  * @param   u32Percent  See TMR3SetWarpDrive().
  * @internal
  */
-static DECLCALLBACK(int) tmR3SetWarpDrive(PVM pVM, uint32_t u32Percent)
-{
+static DECLCALLBACK(int) tmR3SetWarpDrive(PUVM pUVM, uint32_t u32Percent)
+{
+    PVM    pVM = pUVM->pVM;
+    VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
     PVMCPU pVCpu = VMMGetCpu(pVM);
 
@@ -2765 +2768 @@
     TM_UNLOCK_TIMERS(pVM);
     return VINF_SUCCESS;
+}
+
+
+/**
+ * Gets the current warp drive percent.
+ *
+ * @returns The warp drive percent.
+ * @param   pVM         Pointer to the VM.
+ */
+VMMR3DECL(uint32_t) TMR3GetWarpDrive(PUVM pUVM)
+{
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, UINT32_MAX);
+    PVM pVM = pUVM->pVM;
+    VM_ASSERT_VALID_EXT_RETURN(pVM, UINT32_MAX);
+    return pVM->tm.s.u32VirtualWarpDrivePercentage;
 }
 

trunk/src/VBox/VMM/VMMR3/VMReq.cpp

@@ -465 +465 @@
      */
     AssertPtrReturn(pfnFunction, VERR_INVALID_POINTER);
-    AssertPtrReturn(pUVM, VERR_INVALID_POINTER);
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, VERR_INVALID_VM_HANDLE);
     AssertReturn(!(fFlags & ~(VMREQFLAGS_RETURN_MASK | VMREQFLAGS_NO_WAIT | VMREQFLAGS_POKE | VMREQFLAGS_PRIORITY)), VERR_INVALID_PARAMETER);
     if (!(fFlags & VMREQFLAGS_NO_WAIT) || ppReq)

trunk/src/VBox/VMM/testcase/tstAnimate.cpp

@@ -861 +861 @@
                     if (u32WarpDrive != 100)
                     {
-                        rc = TMR3SetWarpDrive(pVM, u32WarpDrive);
+                        rc = TMR3SetWarpDrive(pUVM, u32WarpDrive);
                         if (RT_FAILURE(rc))
                             RTPrintf("warning: TMVirtualSetWarpDrive(,%u) -> %Rrc\n", u32WarpDrive, rc);