Changeset 92223 in vbox

Timestamp:

Nov 4, 2021 9:15:15 PM (3 years ago)

Author:

vboxsync

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

148056

Message:

Main/Settings: Remove the unnecessary additional settings version. bugref:9932

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (1 diff)
• xml/Settings.cpp (modified) (7 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -611 +611 @@
     </const>
     <const name="v1_19" value="21">
-      <desc>Settings version "1.19", written by VirtualBox 6.2.x.</desc>
-      <!--
-          Machine changes: IOMMU device.
-      -->
-    </const>
-    <const name="v1_20" value="22">
-      <desc>Settings version "1.20", written by VirtualBox 7.0.x.</desc>
+      <desc>Settings version "1.19", written by VirtualBox 7.0.x.</desc>
       <!--
           VirtualBox.xml additions: HostOnlyNetworks in NetserviceRegistry
-          NetworkAdapter changes: HostOnlyNetwork mode.
+          Machine changes: IOMMU device, HostOnlyNetwork mode for
+          NetworkAdapter.
       -->
     </const>
     <const name="Future" value="99999">
-      <desc>Settings version greater than "1.20", written by a future VirtualBox version.</desc>
+      <desc>Settings version greater than "1.19", written by a future VirtualBox version.</desc>
     </const>
   </enum>

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

@@ -413 +413 @@
             else if (uMinor == 19)
                 sv = SettingsVersion_v1_19;
-#ifndef VBOX_WITH_VMNET
             else if (uMinor > 19)
-#else /* VBOX_WITH_VMNET */
-            else if (uMinor == 20)
-                sv = SettingsVersion_v1_20;
-            else if (uMinor > 20)
-#endif /* VBOX_WITH_VMNET */
                 sv = SettingsVersion_Future;
         }
@@ -1055 +1049 @@
             break;
 
-#ifdef VBOX_WITH_VMNET
-        case SettingsVersion_v1_20:
-            pcszVersion = "1.20";
-            break;
-#endif /* VBOX_WITH_VMNET */
-
         default:
             // catch human error: the assertion below will trigger in debug
@@ -1083 +1071 @@
                 // but as it's an omission of someone who changed this file
                 // it's the only generic possibility.
-#ifndef VBOX_WITH_VMNET
                 pcszVersion = "1.19";
                 m->sv = SettingsVersion_v1_19;
-#else /* VBOX_WITH_VMNET */
-                pcszVersion = "1.20";
-                m->sv = SettingsVersion_v1_20;
-#endif /* VBOX_WITH_VMNET */
             }
             break;
@@ -2414 +2397 @@
 {
 #ifdef VBOX_WITH_VMNET
-    if (m->sv < SettingsVersion_v1_20)
+    if (m->sv < SettingsVersion_v1_19)
     {
         // VirtualBox 7.0 adds support for host-only networks.
         if (!llHostOnlyNetworks.empty())
-            m->sv = SettingsVersion_v1_20;
+            m->sv = SettingsVersion_v1_19;
     }
 #endif /* VBOX_WITH_VMNET */
@@ -7962 +7945 @@
 void MachineConfigFile::bumpSettingsVersionIfNeeded()
 {
-#ifdef VBOX_WITH_VMNET
-    if (m->sv < SettingsVersion_v1_20)
-    {
-        // VirtualBox 7.0 adds a host-only network attachment.
+    if (m->sv < SettingsVersion_v1_19)
+    {
+        // VirtualBox 7.0 adds iommu device.
+        if (hardwareMachine.iommuType != IommuType_None)
+        {
+            m->sv = SettingsVersion_v1_19;
+            return;
+        }
+
+        // VirtualBox 7.0 adds a Trusted Platform Module.
+        if (   hardwareMachine.tpmSettings.tpmType != TpmType_None
+            || hardwareMachine.tpmSettings.strLocation.isNotEmpty())
+        {
+            m->sv = SettingsVersion_v1_19;
+            return;
+        }
+
         NetworkAdaptersList::const_iterator netit;
         for (netit = hardwareMachine.llNetworkAdapters.begin();
@@ -7971 +7967 @@
              ++netit)
         {
-            if (netit->mode == NetworkAttachmentType_HostOnlyNetwork)
-            {
-                m->sv = SettingsVersion_v1_20;
-                break;
-            }
-        }
-    }
-#endif /* VBOX_WITH_VMNET */
-    if (m->sv < SettingsVersion_v1_19)
-    {
-        // VirtualBox 6.2 adds iommu device.
-        if (hardwareMachine.iommuType != IommuType_None)
-        {
-            m->sv = SettingsVersion_v1_19;
-            return;
-        }
-
-        // VirtualBox 6.2 adds a Trusted Platform Module.
-        if (   hardwareMachine.tpmSettings.tpmType != TpmType_None
-            || hardwareMachine.tpmSettings.strLocation.isNotEmpty())
-        {
-            m->sv = SettingsVersion_v1_19;
-            return;
-        }
-
-        NetworkAdaptersList::const_iterator netit;
-        for (netit = hardwareMachine.llNetworkAdapters.begin();
-             netit != hardwareMachine.llNetworkAdapters.end();
-             ++netit)
-        {
+            // VirtualBox 7.0 adds a flag if NAT can reach localhost.
             if (   netit->fEnabled
                 && netit->mode == NetworkAttachmentType_NAT
@@ -8008 +7975 @@
                 break;
             }
+
+#ifdef VBOX_WITH_VMNET
+            // VirtualBox 7.0 adds a host-only network attachment.
+            if (netit->mode == NetworkAttachmentType_HostOnlyNetwork)
+            {
+                m->sv = SettingsVersion_v1_19;
+                break;
+            }
+#endif /* VBOX_WITH_VMNET */
         }
     }