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

Timestamp:

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

Author:

vboxsync

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

164777

Message:

Main/ConsoleImpl.cpp: i_powerDownHostInterfaces doesn't need to do anything unless VBOX_WITH_NETFLT isn't defined (non-standard config) and we're on linux or freebsd, so expanded the #if to cover most of the code.

File:

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

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

@@ -10040 +10040 @@
             }
 #endif /* VBOX_WITH_CLOUD_NET */
+
             /* Terminate host interface networking. If pUVM is NULL, we've been
              * manually called from powerUpThread() either before calling
@@ -10858 +10859 @@
     AssertReturn(isWriteLockOnCurrentThread(), E_FAIL);
 
+#if (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) && !defined(VBOX_WITH_NETFLT)
     /*
-     * host interface termination handling
+     * Host TAP interface termination handling.
      */
     ComPtr<IVirtualBox> pVirtualBox;
@@ -10899 +10901 @@
         if (attachment == NetworkAttachmentType_Bridged)
         {
-#if ((defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) && !defined(VBOX_WITH_NETFLT))
             HRESULT hrc2 = i_detachFromTapInterface(pNetworkAdapter);
             if (FAILED(hrc2) && SUCCEEDED(hrc))
                 hrc = hrc2;
-#endif /* (RT_OS_LINUX || RT_OS_FREEBSD) && !VBOX_WITH_NETFLT */
         }
     }
 
     return hrc;
+
+#else
+    /* Nothing to do here. */
+    return S_OK;
+#endif
 }