Changeset 98265 in vbox

Timestamp:

Jan 24, 2023 9:26:46 AM (2 years ago)

Author:

vboxsync

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

155468

Message:

Main/ConsoleImpl.cpp: rc -> hrc/vrc. Made Console::i_reconfigureMediumAttachments return rather than throw it's failures, as it's just stupid code bloat to throw HRESULT have the Session's api wrapper code catch them. bugref:10223

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (6 diffs)

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

@@ -5334 +5334 @@
         ::FireHostAudioDeviceChangedEvent(mEventSource, aDevice, aNew, aState, aErrInfo);
 
-    LogFlowThisFunc(("Leaving rc=%#x\n", S_OK));
+    LogFlowThisFunc(("Leaving S_OK\n"));
     return S_OK;
 }
@@ -6827 +6827 @@
 HRESULT Console::i_reconfigureMediumAttachments(const std::vector<ComPtr<IMediumAttachment> > &aAttachments)
 {
-    HRESULT rc = S_OK;
 
     AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.hrc())) return autoCaller.hrc();
+    if (FAILED(autoCaller.hrc()))
+        return autoCaller.hrc();
 
     /* get the VM handle. */
@@ -6839 +6839 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
+    HRESULT rc = S_OK;
     for (size_t i = 0; i < aAttachments.size(); ++i)
     {
-        ComPtr<IStorageController> pStorageController;
-        Bstr controllerName;
-        ULONG lInstance;
-        StorageControllerType_T enmController;
-        StorageBus_T enmBus;
-        BOOL fUseHostIOCache;
-
         /*
          * We could pass the objects, but then EMT would have to do lots of
@@ -6853 +6847 @@
          * Better query needed values here and pass them.
          */
-        rc = aAttachments[i]->COMGETTER(Controller)(controllerName.asOutParam());
-        if (FAILED(rc))
-            throw rc;
-
-        rc = mMachine->GetStorageControllerByName(controllerName.raw(), pStorageController.asOutParam());
-        if (FAILED(rc))
-            throw rc;
-
-        rc = pStorageController->COMGETTER(ControllerType)(&enmController);
-        if (FAILED(rc))
-            throw rc;
-        rc = pStorageController->COMGETTER(Instance)(&lInstance);
-        if (FAILED(rc))
-            throw rc;
-        rc = pStorageController->COMGETTER(Bus)(&enmBus);
-        if (FAILED(rc))
-            throw rc;
-        rc = pStorageController->COMGETTER(UseHostIOCache)(&fUseHostIOCache);
-        if (FAILED(rc))
-            throw rc;
-
-        const char *pcszDevice = i_storageControllerTypeToStr(enmController);
+        Bstr controllerName;
+        HRESULT hrc = aAttachments[i]->COMGETTER(Controller)(controllerName.asOutParam());
+        if (FAILED(hrc))
+            return hrc;
+
+        ComPtr<IStorageController> pStorageController;
+        hrc = mMachine->GetStorageControllerByName(controllerName.raw(), pStorageController.asOutParam());
+        if (FAILED(hrc))
+            return hrc;
+
+        StorageControllerType_T enmController;
+        hrc = pStorageController->COMGETTER(ControllerType)(&enmController);
+        if (FAILED(hrc))
+            return hrc;
+        const char * const pcszDevice = i_storageControllerTypeToStr(enmController);
+
+        ULONG lInstance;
+        hrc = pStorageController->COMGETTER(Instance)(&lInstance);
+        if (FAILED(hrc))
+            return hrc;
+
+        StorageBus_T enmBus;
+        hrc = pStorageController->COMGETTER(Bus)(&enmBus);
+        if (FAILED(hrc))
+            return hrc;
+
+        BOOL fUseHostIOCache;
+        hrc = pStorageController->COMGETTER(UseHostIOCache)(&fUseHostIOCache);
+        if (FAILED(hrc))
+            return hrc;
 
         BOOL fBuiltinIOCache;
         rc = mMachine->COMGETTER(IOCacheEnabled)(&fBuiltinIOCache);
         if (FAILED(rc))
-            throw rc;
+            return hrc;
 
         bool fInsertDiskIntegrityDrv = false;
         Bstr strDiskIntegrityFlag;
-        rc = mMachine->GetExtraData(Bstr("VBoxInternal2/EnableDiskIntegrityDriver").raw(),
-                                    strDiskIntegrityFlag.asOutParam());
-        if (   rc   == S_OK
+        hrc = mMachine->GetExtraData(Bstr("VBoxInternal2/EnableDiskIntegrityDriver").raw(),
+                                     strDiskIntegrityFlag.asOutParam());
+        if (   hrc   == S_OK
             && strDiskIntegrityFlag == "1")
             fInsertDiskIntegrityDrv = true;
@@ -6891 +6893 @@
         alock.release();
 
+        hrc = S_OK;
         IMediumAttachment *pAttachment = aAttachments[i];
         int vrc = ptrVM.vtable()->pfnVMR3ReqCallWaitU(ptrVM.rawUVM(), VMCPUID_ANY,
@@ -6900 +6903 @@
         if (RT_FAILURE(vrc))
             throw setErrorBoth(E_FAIL, vrc, "%Rrc", vrc);
-        if (FAILED(rc))
-            throw rc;
+        if (FAILED(hrc))
+            throw hrc;
 
         alock.acquire();
     }
 
-    return rc;
+    return S_OK;
 }