Changeset 66944 in vbox

Timestamp:

May 17, 2017 6:50:12 PM (8 years ago)

Author:

vboxsync

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

115476

Message:

Main/Machine: Streamline API default handling for network adapters (minimizes config file size, potential compatibility issue!), serial and parallel ports. Establish API default handling pattern when loading settings, which can be applied elsewhere later if necessary.

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -338 +338 @@
             mBIOSSettings->i_applyDefaults(aOsType);
 
-            /* Apply network adapters defaults */
-            for (ULONG slot = 0; slot < mNetworkAdapters.size(); ++slot)
-                mNetworkAdapters[slot]->i_applyDefaults(aOsType);
-
-            /* Apply serial port defaults */
-            for (ULONG slot = 0; slot < RT_ELEMENTS(mSerialPorts); ++slot)
-                mSerialPorts[slot]->i_applyDefaults(aOsType);
-
             /* Let the OS type select 64-bit ness. */
             mHWData->mLongMode = aOsType->i_is64Bit()
@@ -353 +345 @@
             mHWData->mX2APIC = aOsType->i_recommendedX2APIC();
         }
+
+        /* Apply network adapters defaults */
+        for (ULONG slot = 0; slot < mNetworkAdapters.size(); ++slot)
+            mNetworkAdapters[slot]->i_applyDefaults(aOsType);
+
+        /* Apply serial port defaults */
+        for (ULONG slot = 0; slot < RT_ELEMENTS(mSerialPorts); ++slot)
+            mSerialPorts[slot]->i_applyDefaults(aOsType);
 
         /* Apply parallel port defaults */
@@ -8935 +8935 @@
     try
     {
+        GuestOSType *pGuestOSType;
+        rc = mParent->i_findGuestOSType(Bstr(mUserData->s.strOsType).raw(),
+                                        pGuestOSType);
+        if (FAILED(rc))
+            return rc;
+
         /* The hardware version attribute (optional). */
         mHWData->mHWVersion = data.strVersion;
@@ -9083 +9089 @@
         if (FAILED(rc)) return rc;
 
-        // network adapters
+        // network adapters (establish array size first and apply defaults, to
+        // ensure reading the same settings as we saved, since the list skips
+        // adapters having defaults)
         size_t newCount = Global::getMaxNetworkAdapters(mHWData->mChipsetType);
         size_t oldCount = mNetworkAdapters.size();
@@ -9097 +9105 @@
         else if (newCount < oldCount)
             mNetworkAdapters.resize(newCount);
+        for (unsigned i = 0; i < mNetworkAdapters.size(); i++)
+            mNetworkAdapters[i]->i_applyDefaults(pGuestOSType);
         for (settings::NetworkAdaptersList::const_iterator
              it = data.llNetworkAdapters.begin();
@@ -9113 +9123 @@
         // settings as we saved, since the list skips ports having defaults)
         for (unsigned i = 0; i < RT_ELEMENTS(mSerialPorts); i++)
-            mSerialPorts[i]->i_applyDefaults(NULL);
+            mSerialPorts[i]->i_applyDefaults(pGuestOSType);
         for (settings::SerialPortsList::const_iterator
              it = data.llSerialPorts.begin();
@@ -10418 +10428 @@
             if (mNetworkAdapters[slot])
             {
+                if (mNetworkAdapters[slot]->i_hasDefaults())
+                    continue;
+
                 rc = mNetworkAdapters[slot]->i_saveSettings(nic);
                 if (FAILED(rc)) throw rc;