Changeset 108318 in vbox

Timestamp:

Feb 20, 2025 5:50:24 PM (2 months ago)

Author:

vboxsync

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

167662

Message:

Main/MachineImplMoveVM: After a successful invocation of
IMachine::moveTo() VBoxSVC would trigger the following assert in
Machine::uninit(): 'Assert(!uRegistryNeedsSaving);'. This was due to a
mistake in MachineMoveVM::i_MoveVMThreadTask() which incorrectly marked
the Machine's registry as modified (i_markRegistryModified()) but then
called VirtualBox::i_saveSettings() which clears the VirtualBox
registry's (i_unmarkRegistryModified(i_getGlobalRegistryId())) modified
state. This left the Machine registry in a modified state as indicated
by uRegistryNeedsSaving=1. Since nothing cleared the Machine registry's
modified state Machine::uninit() correctly asserted to point out the
oversight. Fixed by marking the global VirtualBox registry as modified
instead of the Machine's registry.

File:

• trunk/src/VBox/Main/src-server/MachineImplMoveVM.cpp (modified) (2 diffs)

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

@@ -931 +931 @@
 
         /* Marks the global registry for uuid as modified */
-        Guid uuid = machine->mData->mUuid;
+        Guid uuid = machine->mParent->i_getGlobalRegistryId();
         machine->mParent->i_markRegistryModified(uuid);
 
@@ -1062 +1062 @@
                 AutoWriteLock  srcLock(machine COMMA_LOCKVAL_SRC_POS);
                 srcLock.release();
-                Guid uuid = machine->mData->mUuid;
+                Guid uuid = machine->mParent->i_getGlobalRegistryId();
                 machine->mParent->i_markRegistryModified(uuid);
                 srcLock.acquire();