Changeset 27644 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 23, 2010 4:07:49 PM (15 years ago)

Author:

vboxsync

Message:

Main: fix missing machine settings save in some takeSnapshot() situations (recent trunk regression)

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (2 diffs)
• SnapshotImpl.cpp (modified) (1 diff)
• include/MachineImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -7253 +7253 @@
  *    #isReallyModified() returns false. This is necessary for cases when we
  *    change machine data directly, not through the backup()/commit() mechanism.
+ *  - SaveS_Force: settings will be saved without doing a deep compare of the
+ *    settings structures. This is used when this is called because snapshots
+ *    have changed to avoid the overhead of the deep compare.
  *
  * @note Must be called from under this object's write lock. Locks children for
@@ -7355 +7358 @@
         if (aFlags & SaveS_ResetCurStateModified)
         {
-            // this gets set by restoreSnapshot()
+            // this gets set by takeSnapshot() (if offline snapshot) and restoreSnapshot()
             mData->mCurrentStateModified = FALSE;
+            fNeedsWrite = true;     // always, no need to compare
+        }
+        else if (aFlags & SaveS_Force)
+        {
             fNeedsWrite = true;     // always, no need to compare
         }

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -1456 +1456 @@
             mData->mFirstSnapshot = mData->mCurrentSnapshot;
 
+        int flSaveSettings = SaveS_Force;       // do not do a deep compare in machine settings,
+                                                // snapshots change, so we know we need to save
         if (!fOnline)
             /* the machine was powered off or saved when taking a snapshot, so
              * reset the mCurrentStateModified flag */
-            mData->mCurrentStateModified = FALSE;
-
-        rc = saveSettings(NULL);
+            flSaveSettings |= SaveS_ResetCurStateModified;
+
+        rc = saveSettings(NULL, flSaveSettings);
                 // no need to change for whether VirtualBox.xml needs saving since
                 // we'll save the global settings below anyway

trunk/src/VBox/Main/include/MachineImpl.h

@@ -725 +725 @@
         SaveS_ResetCurStateModified = 0x01,
         SaveS_InformCallbacksAnyway = 0x02,
-        /* flags for #saveSnapshotSettings() */
-        SaveSS_CurStateModified = 0x40,
-        SaveSS_CurrentId = 0x80,
+        SaveS_Force = 0x04,
         /* flags for #saveStateSettings() */
         SaveSTS_CurStateModified = 0x20,