Changeset 61138 in vbox

Timestamp:

May 23, 2016 6:32:40 PM (9 years ago)

Author:

vboxsync

Message:

Main/Settings: fix default handling for fCableConnected with old settings version, otherwise we end up with VMs which have the network disconnected in 5.0

Location:

trunk

Files:

• include/VBox/settings.h (modified) (2 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (9 diffs)

trunk/include/VBox/settings.h

@@ -541 +541 @@
 
     bool areGenericDriverDefaultSettings() const;
-    bool areDefaultSettings() const;
+    bool areDefaultSettings(SettingsVersion_T sv) const;
     bool areDisabledDefaultSettings() const;
 
@@ -878 +878 @@
     bool areDisplayDefaultSettings() const;
     bool areVideoCaptureDefaultSettings() const;
-    bool areAllNetworkAdaptersDefaultSettings() const;
+    bool areAllNetworkAdaptersDefaultSettings(SettingsVersion_T sv) const;
 
     bool operator==(const Hardware&) const;

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

@@ -2335 +2335 @@
     type(NetworkAdapterType_Am79C973),
     fEnabled(false),
-    fCableConnected(true),
+    fCableConnected(false), // default for old VMs, for new ones it's true
     ulLineSpeed(0),
     enmPromiscModePolicy(NetworkAdapterPromiscModePolicy_Deny),
@@ -2356 +2356 @@
  * Check if all settings have default values.
  */
-bool NetworkAdapter::areDefaultSettings() const
-{
+bool NetworkAdapter::areDefaultSettings(SettingsVersion_T sv) const
+{
+    // 5.0 and earlier had a default of fCableConnected=false, which doesn't
+    // make a lot of sense (but it's a fact). Later versions don't save the
+    // setting if it's at the default value and thus must get it right.
     return !fEnabled
         && strMACAddress.isEmpty()
-        && fCableConnected
+        && (   (sv >= SettingsVersion_v1_16 && fCableConnected)
+            || (sv < SettingsVersion_v1_16 && !fCableConnected))
         && ulLineSpeed == 0
         && enmPromiscModePolicy == NetworkAdapterPromiscModePolicy_Deny
@@ -2762 +2766 @@
 {
     // 5.0 didn't save the paravirt settings if it is ParavirtProvider_Legacy,
-    // so this default must be kept. Later versions don't savethis release. Newer versionsRemember, this is the default for VMs created with 5.0, and older
-    // VMs will keep ParavirtProvider_Legacy which must be saved.
+    // so this default must be kept. Later versions don't save the setting if
+    // it's at the default value.
     return (   (sv >= SettingsVersion_v1_16 && paravirtProvider == ParavirtProvider_Default)
-            || (sv == SettingsVersion_v1_15 && paravirtProvider == ParavirtProvider_Legacy))
+            || (sv < SettingsVersion_v1_16 && paravirtProvider == ParavirtProvider_Legacy))
         && strParavirtDebug.isEmpty();
 }
@@ -2817 +2821 @@
  * Check if all Network Adapter settings have default values.
  */
-bool Hardware::areAllNetworkAdaptersDefaultSettings() const
+bool Hardware::areAllNetworkAdaptersDefaultSettings(SettingsVersion_T sv) const
 {
     for (NetworkAdaptersList::const_iterator it = llNetworkAdapters.begin();
@@ -2823 +2827 @@
          ++it)
     {
-        if (!it->areDefaultSettings())
+        if (!it->areDefaultSettings(sv))
             return false;
     }
@@ -3280 +3284 @@
         NetworkAdapter nic;
 
+        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(). */
+            nic.fCableConnected = true;
+        }
+
         if (!pelmAdapter->getAttributeValue("slot", nic.ulSlot))
             throw ConfigFileError(this, pelmAdapter, N_("Required Adapter/@slot attribute is missing"));
@@ -5684 +5695 @@
 
     if (   hw.llNetworkAdapters.size()
-        && !hw.areAllNetworkAdaptersDefaultSettings())
+        && !hw.areAllNetworkAdaptersDefaultSettings(m->sv))
     {
         xml::ElementNode *pelmNetwork = pelmHardware->createChild("Network");
@@ -5693 +5704 @@
             const NetworkAdapter &nic = *it;
 
-            if (!nic.areDefaultSettings())
+            if (!nic.areDefaultSettings(m->sv))
             {
                 xml::ElementNode *pelmAdapter = pelmNetwork->createChild("Adapter");
@@ -5701 +5712 @@
                 if (!nic.strMACAddress.isEmpty())
                     pelmAdapter->setAttribute("MACAddress", nic.strMACAddress);
-                if (!nic.fCableConnected)
+                if (   (m->sv >= SettingsVersion_v1_16 && !nic.fCableConnected)
+                    || (m->sv < SettingsVersion_v1_16 && nic.fCableConnected))
                     pelmAdapter->setAttribute("cable", nic.fCableConnected);
                 if (nic.ulLineSpeed)