Changeset 88086 in vbox

Timestamp:

Mar 11, 2021 12:50:12 PM (4 years ago)

Author:

vboxsync

Message:

VBoxManage: move getMaxNics() to VBoxManageUtils.cpp. bugref:9966.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.h (modified) (1 diff)
• VBoxManageControlVM.cpp (modified) (1 diff)
• VBoxManageInfo.cpp (modified) (1 diff)
• VBoxManageUtils.cpp (modified) (1 diff)
• VBoxManageUtils.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -221 +221 @@
 /* VBoxManageControlVM.cpp */
 RTEXITCODE handleControlVM(HandlerArg *a);
-#ifndef VBOX_ONLY_DOCS
-unsigned int getMaxNics(IVirtualBox* vbox, IMachine* mach);
-#endif
 
 /* VBoxManageModifyVM.cpp */

trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp

@@ -62 +62 @@
         return (unsigned)u32;
     errorArgument("Invalid %s number '%s'", name, psz);
-    return 0;
-}
-
-unsigned int getMaxNics(IVirtualBox* vbox, IMachine* mach)
-{
-    ComPtr<ISystemProperties> info;
-    ChipsetType_T aChipset;
-    ULONG NetworkAdapterCount = 0;
-    HRESULT rc;
-
-    do {
-        CHECK_ERROR_BREAK(vbox, COMGETTER(SystemProperties)(info.asOutParam()));
-        CHECK_ERROR_BREAK(mach, COMGETTER(ChipsetType)(&aChipset));
-        CHECK_ERROR_BREAK(info, GetMaxNetworkAdapters(aChipset, &NetworkAdapterCount));
-
-        return (unsigned int)NetworkAdapterCount;
-    } while (0);
-
     return 0;
 }

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -44 +44 @@
 
 #include "VBoxManage.h"
+#include "VBoxManageUtils.h"
+
 using namespace com;
 

trunk/src/VBox/Frontends/VBoxManage/VBoxManageUtils.cpp

@@ -23 +23 @@
 
 #include <VBox/com/array.h>
+#include <VBox/com/errorprint.h>
 #include <VBox/com/string.h>
 
 using namespace com;
+
+
+
+unsigned int getMaxNics(const ComPtr<IVirtualBox> &pVirtualBox,
+                        const ComPtr<IMachine> &pMachine)
+{
+    ComPtr<ISystemProperties> info;
+    ChipsetType_T aChipset;
+    ULONG NetworkAdapterCount = 0;
+    HRESULT rc;
+
+    do {
+        CHECK_ERROR_BREAK(pVirtualBox, COMGETTER(SystemProperties)(info.asOutParam()));
+        CHECK_ERROR_BREAK(pMachine, COMGETTER(ChipsetType)(&aChipset));
+        CHECK_ERROR_BREAK(info, GetMaxNetworkAdapters(aChipset, &NetworkAdapterCount));
+
+        return (unsigned int)NetworkAdapterCount;
+    } while (0);
+
+    return 0;
+}
 
 

trunk/src/VBox/Frontends/VBoxManage/VBoxManageUtils.h

@@ -28 +28 @@
 #endif
 
+unsigned int getMaxNics(const ComPtr<IVirtualBox> &pVirtualBox,
+                        const ComPtr<IMachine> &pMachine);
+
 void verifyHostNetworkInterfaceName(const ComPtr<IVirtualBox> &pVirtualBox,
                                     const char *pszTargetName,