Changeset 61501 in vbox

Timestamp:

Jun 6, 2016 5:12:32 PM (9 years ago)

Author:

vboxsync

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

107836

Message:

Main/xml/Settings.cpp: fix almost complete snapshot breakage, it saved the hardware part of the current state for all snapshot instead of the right data, plus a fix for a much older bug where the same happened partially for some USB related data

File:

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

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

@@ -5624 +5624 @@
         xml::ElementNode *pelmUSB = pelmHardware->createChild("USBController");
 
-        for (USBControllerList::const_iterator it = hardwareMachine.usbSettings.llUSBControllers.begin();
-             it != hardwareMachine.usbSettings.llUSBControllers.end();
+        for (USBControllerList::const_iterator it = hw.usbSettings.llUSBControllers.begin();
+             it != hw.usbSettings.llUSBControllers.end();
              ++it)
         {
@@ -5650 +5650 @@
     else
     {
-        if (   hardwareMachine.usbSettings.llUSBControllers.size()
-            || hardwareMachine.usbSettings.llDeviceFilters.size())
+        if (   hw.usbSettings.llUSBControllers.size()
+            || hw.usbSettings.llDeviceFilters.size())
         {
             xml::ElementNode *pelmUSB = pelmHardware->createChild("USB");
-            if (hardwareMachine.usbSettings.llUSBControllers.size())
+            if (hw.usbSettings.llUSBControllers.size())
             {
                 xml::ElementNode *pelmCtrls = pelmUSB->createChild("Controllers");
 
-                for (USBControllerList::const_iterator it = hardwareMachine.usbSettings.llUSBControllers.begin();
-                     it != hardwareMachine.usbSettings.llUSBControllers.end();
+                for (USBControllerList::const_iterator it = hw.usbSettings.llUSBControllers.begin();
+                     it != hw.usbSettings.llUSBControllers.end();
                      ++it)
                 {
@@ -5686 +5686 @@
             }
 
-            if (hardwareMachine.usbSettings.llDeviceFilters.size())
+            if (hw.usbSettings.llDeviceFilters.size())
             {
                 xml::ElementNode *pelmFilters = pelmUSB->createChild("DeviceFilters");
@@ -6104 +6104 @@
     xml::ElementNode &elmStorageParent = (m->sv > SettingsVersion_Future) ? *pelmHardware : elmParent;
     buildStorageControllersXML(elmStorageParent,
-                               hardwareMachine.storage,
+                               hw.storage,
                                !!(fl & BuildMachineXML_SkipRemovableMedia),
                                pllElementsWithUuidAttributes);