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

Timestamp:

Sep 15, 2023 2:54:42 PM (15 months ago)

Author:

vboxsync

Message:

Main: Limit network adapter types for different platforms and also guard them with their proper #ifdefs. bugref:10384

File:

• trunk/src/VBox/Main/src-all/PlatformPropertiesImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-all/PlatformPropertiesImpl.cpp

@@ -715 +715 @@
 HRESULT PlatformProperties::getSupportedNetworkAdapterTypes(std::vector<NetworkAdapterType_T> &aSupportedNetworkAdapterTypes)
 {
-    static const NetworkAdapterType_T aNetworkAdapterTypes[] =
-    {
-        NetworkAdapterType_Am79C970A,
-        NetworkAdapterType_Am79C973,
-        NetworkAdapterType_I82540EM,
-        NetworkAdapterType_I82543GC,
-        NetworkAdapterType_I82545EM,
-        NetworkAdapterType_Virtio
-    };
-    aSupportedNetworkAdapterTypes.assign(aNetworkAdapterTypes,
-                                         aNetworkAdapterTypes + RT_ELEMENTS(aNetworkAdapterTypes));
+    switch (mPlatformArchitecture)
+    {
+        case PlatformArchitecture_x86:
+        {
+            static const NetworkAdapterType_T aNetworkAdapterTypes[] =
+            {
+                NetworkAdapterType_Null,
+                NetworkAdapterType_Am79C970A,
+                NetworkAdapterType_Am79C973
+#ifdef VBOX_WITH_E1000
+              , NetworkAdapterType_I82540EM
+              , NetworkAdapterType_I82543GC
+              , NetworkAdapterType_I82545EM
+#endif
+#ifdef VBOX_WITH_VIRTIO
+              , NetworkAdapterType_Virtio
+#endif
+            };
+            aSupportedNetworkAdapterTypes.assign(aNetworkAdapterTypes,
+                                                 aNetworkAdapterTypes + RT_ELEMENTS(aNetworkAdapterTypes));
+            break;
+        }
+
+        case PlatformArchitecture_ARM:
+        {
+            static const NetworkAdapterType_T aNetworkAdapterTypes[] =
+            {
+                NetworkAdapterType_Null
+#ifdef VBOX_WITH_E1000
+              , NetworkAdapterType_I82540EM
+              , NetworkAdapterType_I82543GC
+              , NetworkAdapterType_I82545EM
+#endif
+#ifdef VBOX_WITH_VIRTIO
+              , NetworkAdapterType_Virtio
+#endif
+            };
+            aSupportedNetworkAdapterTypes.assign(aNetworkAdapterTypes,
+                                                 aNetworkAdapterTypes + RT_ELEMENTS(aNetworkAdapterTypes));
+            break;
+        }
+
+        default:
+            AssertFailedStmt(aSupportedNetworkAdapterTypes.clear());
+            break;
+    }
+
     return S_OK;
 }