Changeset 61783 in vbox

Timestamp:

Jun 21, 2016 8:37:18 AM (9 years ago)

Author:

vboxsync

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

108177

Message:

Main/xml/Settings.cpp: fix PCnet default settings handling

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (4 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -2333 +2333 @@
 NetworkAdapter::NetworkAdapter() :
     ulSlot(0),
-    type(NetworkAdapterType_Am79C973),
+    type(NetworkAdapterType_Am79C970A), // default for old VMs, for new ones it's Am79C973
     fEnabled(false),
     fCableConnected(false), // default for old VMs, for new ones it's true
@@ -2363 +2363 @@
     return !fEnabled
         && strMACAddress.isEmpty()
-        && (   (sv >= SettingsVersion_v1_16 && fCableConnected)
-            || (sv < SettingsVersion_v1_16 && !fCableConnected))
+        && (   (sv >= SettingsVersion_v1_16 && fCableConnected && type == NetworkAdapterType_Am79C973)
+            || (sv < SettingsVersion_v1_16 && !fCableConnected && type == NetworkAdapterType_Am79C970A))
         && ulLineSpeed == 0
         && enmPromiscModePolicy == NetworkAdapterPromiscModePolicy_Deny
-        && type == NetworkAdapterType_Am79C973
         && mode == NetworkAttachmentType_Null
         && nat.areDefaultSettings()
@@ -3286 +3285 @@
         if (m->sv >= SettingsVersion_v1_16)
         {
-            /* Starting with VirtualBox 5.1 the default is true, before it was
-             * false. This needs to matched by NetworkAdapter.areDefaultSettings(). */
+            /* Starting with VirtualBox 5.1 the default is cable connected and
+             * PCnet-FAST III. Needs to match NetworkAdapter.areDefaultSettings(). */
             nic.fCableConnected = true;
+            nic.type = NetworkAdapterType_Am79C973;
         }
 
@@ -5738 +5738 @@
                     pelmAdapter->setAttribute("promiscuousModePolicy", pszPolicy);
 
-                if (nic.type != NetworkAdapterType_Am79C973)
+                if (   (m->sv >= SettingsVersion_v1_16 && nic.type != NetworkAdapterType_Am79C973)
+                    || (m->sv < SettingsVersion_v1_16 && nic.type != NetworkAdapterType_Am79C970A))
                 {
                     const char *pcszType;