Changeset 52682 in vbox

Timestamp:

Sep 10, 2014 4:43:11 PM (10 years ago)

Author:

vboxsync

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

96009

Message:

Main/Machine+Settings: Changing extradata for a Machine instance is special, there is no "old" state available for comparing, and thus it must force saving. The settings change optimizes out the useless effort to do a deep comparison of two maps.

Location:

trunk/src/VBox/Main

Files:

• src-server/MachineImpl.cpp (modified) (1 diff)
• xml/Settings.cpp (modified) (1 diff)

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

@@ -4916 +4916 @@
 
         bool fNeedsGlobalSaveSettings = false;
-        i_saveSettings(&fNeedsGlobalSaveSettings);
+        // This saving of settings is tricky: there is no "old state" for the
+        // extradata items at all (unlike all other settings), so the old/new
+        // settings comparison would give a wrong result!
+        i_saveSettings(&fNeedsGlobalSaveSettings, SaveS_Force);
 
         if (fNeedsGlobalSaveSettings)

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

@@ -2215 +2215 @@
                  && (storageMachine             == c.storageMachine)        // this one's deep
                  && (mediaRegistry              == c.mediaRegistry)         // this one's deep
-                 && (mapExtraDataItems          == c.mapExtraDataItems)     // this one's deep
+                 // skip mapExtraDataItems! there is no old state available as it's always forced
                  && (llFirstSnapshot            == c.llFirstSnapshot)       // this one's deep
                )