Changeset 20720 in vbox

Timestamp:

Jun 19, 2009 12:25:18 PM (16 years ago)

Author:

vboxsync

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

48833

Message:

ConsoleImpl.cpp: VMR3ReqCall w/ cMillis=0 may return VERR_TIMEOUT or VINF_SUCCESS, that's not going to change.

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3316 +3316 @@
      */
     PVMREQ pReq;
-    int vrc = VMR3ReqCall (mpVM, 0, &pReq, 0 /* no wait! */,
+    int vrc = VMR3ReqCall (mpVM, 0 /*idDstCpu*/, &pReq, 0 /* no wait! */,
                            (PFNRT) Console::changeNetworkAttachment, 7,
                            this, pszDevice, uInstance, uLun, eAttachmentType,
                            meAttachmentType, aNetworkAdapter);
-    /// @todo (r=dmik) bird, it would be nice to have a special VMR3Req method
-    //  for that purpose, that doesn't return useless VERR_TIMEOUT
-    if (vrc == VERR_TIMEOUT)
-        vrc = VINF_SUCCESS;
 
     /* leave the lock before waiting for a result (EMT will call us back!) */
     alock.leave();
 
-    if (VBOX_SUCCESS (vrc))
+    if (vrc == VERR_TIMEOUT || VBOX_SUCCESS (vrc))
     {
         vrc = VMR3ReqWait (pReq, RT_INDEFINITE_WAIT);