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

Timestamp:

Mar 10, 2014 2:44:56 PM (11 years ago)

Author:

vboxsync

Message:

Main/Console: fixed error code if changing a medium / network attachment doesn't work for invalid VM state

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (1 diff)
• src-client/ConsoleImpl.cpp (modified) (10 diffs)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -570 +570 @@
     HRESULT removeSharedFolder(const Utf8Str &strName);
 
-    int  suspendBeforeConfigChange(PUVM pUVM, AutoWriteLock *pAlock, bool *pfResume);
-    void resumeAfterConfigChange(PUVM pUVM);
+    HRESULT suspendBeforeConfigChange(PUVM pUVM, AutoWriteLock *pAlock, bool *pfResume);
+    void    resumeAfterConfigChange(PUVM pUVM);
 
     static DECLCALLBACK(int) configConstructor(PUVM pUVM, PVM pVM, void *pvConsole);

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

@@ -3544 +3544 @@
  *                          afterwards.
  */
-int Console::suspendBeforeConfigChange(PUVM pUVM, AutoWriteLock *pAlock, bool *pfResume)
+HRESULT Console::suspendBeforeConfigChange(PUVM pUVM, AutoWriteLock *pAlock, bool *pfResume)
 {
     *pfResume = false;
@@ -3569 +3569 @@
             break;
         default:
-            return VERR_INVALID_STATE;
-    }
-
-    return VINF_SUCCESS;
+            return setErrorInternal(VBOX_E_INVALID_VM_STATE,
+                                    COM_IIDOF(IConsole),
+                                    getStaticComponentName(),
+                                    Utf8StrFmt("Invalid state '%s' for changing medium",
+                                        VMR3GetStateName(enmVMState)),
+                                    false /*aWarning*/,
+                                    true /*aLogIt*/);
+    }
+
+    return S_OK;
 }
 
@@ -3672 +3678 @@
      */
     bool fResume = false;
-    int vrc = suspendBeforeConfigChange(pUVM, &alock, &fResume);
-    if (RT_FAILURE(vrc))
-        return vrc;
+    rc = suspendBeforeConfigChange(pUVM, &alock, &fResume);
+    if (FAILED(rc))
+        return rc;
 
     /*
@@ -3682 +3688 @@
      */
     PVMREQ pReq;
-    vrc = VMR3ReqCallU(pUVM, VMCPUID_ANY, &pReq, 0 /* no wait! */, VMREQFLAGS_VBOX_STATUS,
-                       (PFNRT)changeRemovableMedium, 8,
-                       this, pUVM, pszDevice, uInstance, enmBus, fUseHostIOCache, aMediumAttachment, fForce);
+    int vrc = VMR3ReqCallU(pUVM, VMCPUID_ANY, &pReq, 0 /* no wait! */, VMREQFLAGS_VBOX_STATUS,
+                           (PFNRT)changeRemovableMedium, 8,
+                           this, pUVM, pszDevice, uInstance, enmBus, fUseHostIOCache, aMediumAttachment, fForce);
 
     /* release the lock before waiting for a result (EMT will call us back!) */
@@ -3865 +3871 @@
      */
     bool fResume = false;
-    int vrc = suspendBeforeConfigChange(pUVM, &alock, &fResume);
-    if (RT_FAILURE(vrc))
-        return vrc;
+    rc = suspendBeforeConfigChange(pUVM, &alock, &fResume);
+    if (FAILED(rc))
+        return rc;
 
     /*
@@ -3875 +3881 @@
      */
     PVMREQ pReq;
-    vrc = VMR3ReqCallU(pUVM, VMCPUID_ANY, &pReq, 0 /* no wait! */, VMREQFLAGS_VBOX_STATUS,
-                       (PFNRT)attachStorageDevice, 8,
-                       this, pUVM, pszDevice, uInstance, enmBus, fUseHostIOCache, aMediumAttachment, fSilent);
+    int vrc = VMR3ReqCallU(pUVM, VMCPUID_ANY, &pReq, 0 /* no wait! */, VMREQFLAGS_VBOX_STATUS,
+                           (PFNRT)attachStorageDevice, 8,
+                           this, pUVM, pszDevice, uInstance, enmBus, fUseHostIOCache, aMediumAttachment, fSilent);
 
     /* release the lock before waiting for a result (EMT will call us back!) */
@@ -4057 +4063 @@
      */
     bool fResume = false;
-    int vrc = suspendBeforeConfigChange(pUVM, &alock, &fResume);
-    if (RT_FAILURE(vrc))
-        return vrc;
+    rc = suspendBeforeConfigChange(pUVM, &alock, &fResume);
+    if (FAILED(rc))
+        return rc;
 
     /*
@@ -4067 +4073 @@
      */
     PVMREQ pReq;
-    vrc = VMR3ReqCallU(pUVM, VMCPUID_ANY, &pReq, 0 /* no wait! */, VMREQFLAGS_VBOX_STATUS,
-                       (PFNRT)detachStorageDevice, 7,
-                       this, pUVM, pszDevice, uInstance, enmBus, aMediumAttachment, fSilent);
+    int vrc = VMR3ReqCallU(pUVM, VMCPUID_ANY, &pReq, 0 /* no wait! */, VMREQFLAGS_VBOX_STATUS,
+                           (PFNRT)detachStorageDevice, 7,
+                           this, pUVM, pszDevice, uInstance, enmBus, aMediumAttachment, fSilent);
 
     /* release the lock before waiting for a result (EMT will call us back!) */
@@ -4446 +4452 @@
      */
     bool fResume = false;
-    int vrc = suspendBeforeConfigChange(pUVM, NULL, &fResume);
-    if (RT_FAILURE(vrc))
-        return vrc;
+    int rc = suspendBeforeConfigChange(pUVM, NULL, &fResume);
+    if (FAILED(rc))
+        return rc;
 
     /*
@@ -4456 +4462 @@
      */
     PVMREQ pReq;
-    vrc = VMR3ReqCallU(pUVM, 0 /*idDstCpu*/, &pReq, 0 /* no wait! */, VMREQFLAGS_VBOX_STATUS,
-                       (PFNRT)changeNetworkAttachment, 6,
-                       this, pUVM, pszDevice, uInstance, uLun, aNetworkAdapter);
+    int vrc = VMR3ReqCallU(pUVM, 0 /*idDstCpu*/, &pReq, 0 /* no wait! */, VMREQFLAGS_VBOX_STATUS,
+                           (PFNRT)changeNetworkAttachment, 6,
+                           this, pUVM, pszDevice, uInstance, uLun, aNetworkAdapter);
 
     if (vrc == VERR_TIMEOUT || RT_SUCCESS(vrc))