Changeset 19300 in vbox for trunk/src/VBox/Main

Timestamp:

May 1, 2009 6:06:59 PM (16 years ago)

Author:

vboxsync

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

46755

Message:

VMReq,*: Replaced VMREQDEST with VMCPUID because it's a pain to have to cast CPU IDs all the time.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (4 diffs)
• DisplayImpl.cpp (modified) (6 diffs)
• MachineDebuggerImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -2794 +2794 @@
      */
     PVMREQ pReq;
-    int vrc = VMR3ReqCall (mpVM, VMREQDEST_ANY, &pReq, 0 /* no wait! */,
+    int vrc = VMR3ReqCall (mpVM, VMCPUID_ANY, &pReq, 0 /* no wait! */,
                            (PFNRT) Console::changeDrive, 8,
                            this, pszDevice, uInstance, uLun, eState, peState,
@@ -5496 +5496 @@
 /** @todo just do everything here and only wrap the PDMR3Usb call. That'll offload some notification stuff from the EMT thread. */
     PVMREQ pReq = NULL;
-    int vrc = VMR3ReqCall (mpVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT,
+    int vrc = VMR3ReqCall (mpVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
                            (PFNRT) usbAttachCallback, 6, this, aHostDevice, uuid.ptr(), fRemote, Address.raw(), aMaskedIfs);
     if (VBOX_SUCCESS (vrc))
@@ -5621 +5621 @@
     PVMREQ pReq;
 /** @todo just do everything here and only wrap the PDMR3Usb call. That'll offload some notification stuff from the EMT thread. */
-    int vrc = VMR3ReqCall (mpVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT,
+    int vrc = VMR3ReqCall (mpVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
                            (PFNRT) usbDetachCallback, 4,
                            this, &aIt, (*aIt)->id().raw());
@@ -6980 +6980 @@
                  *  to access Console.
                  */
-                int vrc = VMR3ReqCall (that->mpVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT,
+                int vrc = VMR3ReqCall (that->mpVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
                                        (PFNRT)reconfigureHardDisks, 5, that->mpVM, lInstance,
                                        enmController, atts [i], &rc);

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -1385 +1385 @@
         /* send request to the EMT thread */
         PVMREQ pReq = NULL;
-        int vrc = VMR3ReqCall (pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT,
+        int vrc = VMR3ReqCall (pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
                                (PFNRT) changeFramebuffer, 4,
                                this, static_cast <IFramebuffer *> (frameBuf),
@@ -1472 +1472 @@
         /* send request to the EMT thread */
         PVMREQ pReq = NULL;
-        int vrc = VMR3ReqCall (pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT,
+        int vrc = VMR3ReqCall (pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
             (PFNRT) changeFramebuffer, 4, this, frameBuf, false /* aInternal */,
             VBOX_VIDEO_PRIMARY_SCREEN);
@@ -1515 +1515 @@
         /* send request to the EMT thread */
         PVMREQ pReq = NULL;
-        int vrc = VMR3ReqCall (pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT,
+        int vrc = VMR3ReqCall (pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
             (PFNRT) changeFramebuffer, 4, this, aFramebuffer, false /* aInternal */,
             aScreenId);
@@ -1673 +1673 @@
         PVMREQ pReq;
         size_t cbData = RT_ALIGN_Z(width, 4) * 4 * height;
-        rcVBox = VMR3ReqCall(pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT,
+        rcVBox = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
             (PFNRT)mpDrv->pUpPort->pfnSnapshot, 6, mpDrv->pUpPort,
             address, cbData, (uintptr_t)NULL, (uintptr_t)NULL, (uintptr_t)NULL);
@@ -1733 +1733 @@
      */
     PVMREQ pReq;
-    int rcVBox = VMR3ReqCall(pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT,
+    int rcVBox = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
         (PFNRT)mpDrv->pUpPort->pfnDisplayBlt, 6, mpDrv->pUpPort,
         address, x, y, width, height);
@@ -1796 +1796 @@
     /* pdm.h says that this has to be called from the EMT thread */
     PVMREQ pReq;
-    int rcVBox = VMR3ReqCallVoid(pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT,
+    int rcVBox = VMR3ReqCallVoid(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
         (PFNRT)mpDrv->pUpPort->pfnUpdateDisplayAll, 1, mpDrv->pUpPort);
     if (RT_SUCCESS(rcVBox))

trunk/src/VBox/Main/MachineDebuggerImpl.cpp

@@ -200 +200 @@
     PVMREQ pReq;
     EMRAWMODE rawModeFlag = aEnable ? EMRAW_RING3_DISABLE : EMRAW_RING3_ENABLE;
-    int rcVBox = VMR3ReqCall (pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT,
+    int rcVBox = VMR3ReqCall (pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
                               (PFNRT)EMR3RawSetMode, 2, pVM.raw(), rawModeFlag);
     if (RT_SUCCESS (rcVBox))
@@ -268 +268 @@
     PVMREQ pReq;
     EMRAWMODE rawModeFlag = aEnable ? EMRAW_RING0_DISABLE : EMRAW_RING0_ENABLE;
-    int rcVBox = VMR3ReqCall (pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT,
+    int rcVBox = VMR3ReqCall (pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
                               (PFNRT)EMR3RawSetMode, 2, pVM.raw(), rawModeFlag);
     if (RT_SUCCESS (rcVBox))