Changeset 24954 in vbox for trunk/src

Timestamp:

Nov 25, 2009 2:01:57 PM (15 years ago)

Author:

vboxsync

Message:

Main: do not reset diff images for immutable disks if the machine has snapshots

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (3 diffs)
• MediumImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -4727 +4727 @@
 
     /* the network cards will undergo a quick consistency check */
-    for (ULONG slot = 0; slot < SchemaDefs::NetworkAdapterCount; slot ++)
+    for (ULONG slot = 0;
+         slot < SchemaDefs::NetworkAdapterCount;
+         ++slot)
     {
         ComPtr<INetworkAdapter> adapter;
@@ -4851 +4853 @@
     task->mTeleporterEnabled = fTeleporterEnabled;
 
-    /* Reset differencing hard disks for which autoReset is true */
-    {
+    ULONG cSnapshots;
+    rc = mMachine->COMGETTER(SnapshotCount)(&cSnapshots);
+    CheckComRCReturnRC(rc);
+
+    /* Reset differencing hard disks for which autoReset is true,
+     * but only if the machine does not have any snapshots (otherwise
+     * the behavior of differencing images would get very confusing)
+     */
+    if (0 == cSnapshots)
+    {
+        LogFlowThisFunc(("Machine has no snapshots, looking for immutable images to reset\n"));
+
         com::SafeIfaceArray<IMediumAttachment> atts;
         rc = mMachine->COMGETTER(MediumAttachments)(ComSafeArrayAsOutParam(atts));
         CheckComRCReturnRC(rc);
 
-        for (size_t i = 0; i < atts.size(); ++ i)
+        for (size_t i = 0;
+             i < atts.size();
+             ++i)
         {
             DeviceType_T devType;
@@ -4888 +4902 @@
         }
     }
+    else
+        LogFlowThisFunc(("Machine has %d snapshots, skipping immutable images reset\n", cSnapshots));
 
     rc = consoleInitReleaseLog(mMachine);

trunk/src/VBox/Main/MediumImpl.cpp

@@ -1103 +1103 @@
     }
 
-    /* optional, only for diffs, default is false */
+    /* optional, only for diffs, default is false;
+     * we can only auto-reset diff images, so they
+     * must not have a parent */
     if (aParent != NULL)
         m->autoReset = data.fAutoReset;
@@ -2522 +2524 @@
     AutoWriteLock alock(this);
 
+    LogFlowThisFunc(("ENTER for medium %s\n", m->strLocationFull.c_str()));
+
     if (mParent.isNull())
         return setError(VBOX_E_NOT_SUPPORTED,
@@ -2547 +2551 @@
          * asynchronously */
 
-        std::auto_ptr <Task> task(new Task(this, progress, Task::Reset));
+        std::auto_ptr<Task> task(new Task(this, progress, Task::Reset));
         AssertComRCThrowRC(task->autoCaller.rc());
 
@@ -2572 +2576 @@
         progress.queryInterfaceTo(aProgress);
     }
+
+    LogFlowThisFunc(("LEAVE, rc=%Rhrc\n", rc));
 
     return rc;