Changeset 106026 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Sep 12, 2024 11:21:40 AM (6 months ago)

Author:

vboxsync

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

164775

Message:

Main/ConsoleImpl.cpp: Converted release assertion in Console::i_changeNetworkAttachment to AssertLogRelMsgReturn and wrapped up 7 IPC calls only needed for a debug assertion inside a #ifdef VBOX_STRICT/#endif.

File:

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

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

@@ -5328 +5328 @@
  * @note The VM must not be running.
  */
-DECLCALLBACK(int) Console::i_changeNetworkAttachment(Console *pThis,
-                                                     PUVM pUVM,
-                                                     PCVMMR3VTABLE pVMM,
-                                                     const char *pszDevice,
-                                                     unsigned uInstance,
-                                                     unsigned uLun,
-                                                     INetworkAdapter *aNetworkAdapter)
+/*static*/ DECLCALLBACK(int) Console::i_changeNetworkAttachment(Console *pThis,
+                                                                PUVM pUVM,
+                                                                PCVMMR3VTABLE pVMM,
+                                                                const char *pszDevice,
+                                                                unsigned uInstance,
+                                                                unsigned uLun,
+                                                                INetworkAdapter *aNetworkAdapter)
 {
     LogFlowFunc(("pThis=%p pszDevice=%p:{%s} uInstance=%u uLun=%u aNetworkAdapter=%p\n",
@@ -5344 +5344 @@
     AssertComRCReturn(autoCaller.hrc(), VERR_ACCESS_DENIED);
 
+#ifdef VBOX_STRICT
     ComPtr<IPlatform> pPlatform;
     HRESULT hrc = pThis->mMachine->COMGETTER(Platform)(pPlatform.asOutParam());
@@ -5366 +5367 @@
     hrc = pPlatformProperties->GetMaxNetworkAdapters(chipsetType, &maxNetworkAdapters);
     AssertComRC(hrc);
-    AssertMsg(   (   !strcmp(pszDevice, "pcnet")
-                  || !strcmp(pszDevice, "e1000")
-                  || !strcmp(pszDevice, "virtio-net"))
-              && uLun == 0
-              && uInstance < maxNetworkAdapters,
+    AssertMsg(uLun == 0 && uInstance < maxNetworkAdapters,
               ("pszDevice=%s uLun=%d uInstance=%d\n", pszDevice, uLun, uInstance));
+#endif
     Log(("pszDevice=%s uLun=%d uInstance=%d\n", pszDevice, uLun, uInstance));
 
@@ -5377 +5375 @@
      * Check the VM for correct state.
      */
-    PCFGMNODE pCfg = NULL;          /* /Devices/Dev/.../Config/ */
+    PCFGMNODE pCfg   = NULL;        /* /Devices/Dev/.../Config/ */
     PCFGMNODE pLunL0 = NULL;        /* /Devices/Dev/0/LUN#0/ */
-    PCFGMNODE pInst = pVMM->pfnCFGMR3GetChildF(pVMM->pfnCFGMR3GetRootU(pUVM), "Devices/%s/%d/", pszDevice, uInstance);
-    AssertRelease(pInst);
+    PCFGMNODE pInst  = pVMM->pfnCFGMR3GetChildF(pVMM->pfnCFGMR3GetRootU(pUVM), "Devices/%s/%d/", pszDevice, uInstance);
+    AssertLogRelMsgReturn(pInst, ("pszDevices=%s uInstance=%u\n", pszDevice, uInstance), VERR_CFGM_CHILD_NOT_FOUND);
 
     int vrc = pThis->i_configNetwork(pszDevice, uInstance, uLun, aNetworkAdapter, pCfg, pLunL0, pInst,