Changeset 55835 in vbox for trunk

Timestamp:

May 12, 2015 6:37:34 PM (10 years ago)

Author:

vboxsync

Message:

Main/Machine: repair VM configs a bit more thoroughly, as otherwise it can lead to inconsistencies (repair gets lost) when the config was repaired and then immediately a new offline snapshot is taken

File:

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

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

@@ -9068 +9068 @@
 
 #ifdef VBOX_WITH_GUEST_PROPS
+        /* Guest properties (optional) */
+
         /* Only load transient guest properties for configs which have saved
          * state, because there shouldn't be any for powered off VMs. The same
@@ -9074 +9076 @@
          * Note: can't rely on the machine state, as it isn't set yet. */
         bool fSkipTransientGuestProperties = mSSData->strStateFilePath.isEmpty();
-        /* Guest properties (optional) */
-        for (settings::GuestPropertiesList::const_iterator it = data.llGuestProperties.begin();
-            it != data.llGuestProperties.end();
-            ++it)
+        /* apologies for the hacky unconst() usage, but this needs hacking
+         * actually inconsistent settings into consistency, otherwise there
+         * will be some corner cases where the inconsistency survives
+         * surprisingly long without getting fixed, especially for snapshots
+         * as there are no config changes. */
+        settings::GuestPropertiesList &llGuestProperties = unconst(data.llGuestProperties);
+        for (settings::GuestPropertiesList::iterator it = llGuestProperties.begin();
+            it != llGuestProperties.end();
+            /*nothing*/)
         {
             const settings::GuestProperty &prop = *it;
@@ -9085 +9092 @@
                 && (   fFlags & guestProp::TRANSIENT
                     || fFlags & guestProp::TRANSRESET))
+            {
+                it = llGuestProperties.erase(it);
                 continue;
+            }
             HWData::GuestProperty property = { prop.strValue, (LONG64) prop.timestamp, fFlags };
             mHWData->mGuestProperties[prop.strName] = property;
+            ++it;
         }