Changeset 23080 in vbox

Timestamp:

Sep 17, 2009 10:08:00 AM (16 years ago)

Author:

vboxsync

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

52430

Message:

VMM,ConsoleImpl.cpp: Added fFlags to VMR3ReqCall.

Location:

trunk

Files:

• include/VBox/vmapi.h (modified) (1 diff)
• src/VBox/Main/ConsoleImpl.cpp (modified) (2 diffs)
• src/VBox/VMM/VMReq.cpp (modified) (1 diff)

trunk/include/VBox/vmapi.h

@@ -365 +365 @@
 VMMR3DECL(int)  VMR3AtRuntimeErrorDeregister(PVM pVM, PFNVMATRUNTIMEERROR pfnAtRuntimeError, void *pvUser);
 VMMR3DECL(int)  VMR3SetRuntimeErrorWorker(PVM pVM);
-VMMR3DECL(int)  VMR3ReqCall(PVM pVM, VMCPUID idDstCpu, PVMREQ *ppReq, unsigned cMillies, PFNRT pfnFunction, unsigned cArgs, ...);
+VMMR3DECL(int)  VMR3ReqCall(PVM pVM, VMCPUID idDstCpu, PVMREQ *ppReq, unsigned cMillies, uint32_t fFlags, PFNRT pfnFunction, unsigned cArgs, ...);
 VMMR3DECL(int)  VMR3ReqCallU(PUVM pUVM, VMCPUID idDstCpu, PVMREQ *ppReq, unsigned cMillies, unsigned fFlags, PFNRT pfnFunction, unsigned cArgs, ...);
 VMMR3DECL(int)  VMR3ReqCallVU(PUVM pUVM, VMCPUID idDstCpu, PVMREQ *ppReq, unsigned cMillies, unsigned fFlags, PFNRT pfnFunction, unsigned cArgs, va_list Args);

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -2924 +2924 @@
      */
     PVMREQ pReq;
-    int vrc = VMR3ReqCall (mpVM, VMCPUID_ANY, &pReq, 0 /* no wait! */,
+    int vrc = VMR3ReqCall (mpVM, VMCPUID_ANY, &pReq, 0 /* no wait! */, VMREQFLAGS_VBOX_STATUS,
                            (PFNRT) Console::changeDrive, 8,
-                           this, pszDevice, uInstance, uLun, eState, peState,
-                           pszPath, fPassthrough);
+                           this, pszDevice, uInstance, uLun, eState, peState, pszPath, fPassthrough);
 
     /* leave the lock before waiting for a result (EMT will call us back!) */
@@ -3446 +3445 @@
      */
     PVMREQ pReq;
-    int vrc = VMR3ReqCall (mpVM, 0 /*idDstCpu*/, &pReq, 0 /* no wait! */,
+    int vrc = VMR3ReqCall (mpVM, 0 /*idDstCpu*/, &pReq, 0 /* no wait! */, VMREQFLAGS_VBOX_STATUS,
                            (PFNRT) Console::changeNetworkAttachment, 5,
                            this, pszDevice, uInstance, uLun, aNetworkAdapter);

trunk/src/VBox/VMM/VMReq.cpp

@@ -69 +69 @@
  *                          be completed. Use RT_INDEFINITE_WAIT to only
  *                          wait till it's completed.
+ * @param   fFlags          A combination of the VMREQFLAGS values.
  * @param   pfnFunction     Pointer to the function to call.
  * @param   cArgs           Number of arguments following in the ellipsis.
  *                          Not possible to pass 64-bit arguments!
  * @param   ...             Function arguments.
- *
- * @todo    Add fFlags...
- */
-VMMR3DECL(int) VMR3ReqCall(PVM pVM, VMCPUID idDstCpu, PVMREQ *ppReq, unsigned cMillies, PFNRT pfnFunction, unsigned cArgs, ...)
+ */
+VMMR3DECL(int) VMR3ReqCall(PVM pVM, VMCPUID idDstCpu, PVMREQ *ppReq, unsigned cMillies, uint32_t fFlags,
+                           PFNRT pfnFunction, unsigned cArgs, ...)
 {
     va_list va;
     va_start(va, cArgs);
-    int rc = VMR3ReqCallVU(pVM->pUVM, idDstCpu, ppReq, cMillies, VMREQFLAGS_VBOX_STATUS, pfnFunction, cArgs, va);
+    int rc = VMR3ReqCallVU(pVM->pUVM, idDstCpu, ppReq, cMillies, fFlags, pfnFunction, cArgs, va);
     va_end(va);
     return rc;