Changeset 78202 in vbox for trunk/src

Timestamp:

Apr 18, 2019 9:51:02 AM (6 years ago)

Author:

vboxsync

Message:

Main/VirtualBox+Machine: Fix bogus saving of VM config when the VM is inaccessible due to the 2nd or further media registry entry, by making sure that the medium registry isn't marked as modified. For good measure block saving of VM configs when they're inaccessible. Thanks, Socratis, for reporting with reproduction instructions in ticketref:17908.

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImpl.cpp (modified) (1 diff)
• VirtualBoxImpl.cpp (modified) (4 diffs)

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

@@ -9911 +9911 @@
                  E_FAIL);
 
+    if (!mData->mAccessible)
+        return setError(VBOX_E_INVALID_VM_STATE,
+                        tr("The machine is not accessible, so cannot save settings"));
+
     HRESULT rc = S_OK;
     bool fNeedsWrite = false;

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

@@ -778 +778 @@
 
         rc = i_registerMedium(pHardDisk, &pHardDisk, treeLock);
+        // Avoid trouble with lock/refcount, before returning or not.
+        treeLock.release();
+        pHardDisk.setNull();
+        treeLock.acquire();
         if (FAILED(rc)) return rc;
     }
@@ -799 +803 @@
 
         rc = i_registerMedium(pImage, &pImage, treeLock);
+        // Avoid trouble with lock/refcount, before returning or not.
+        treeLock.release();
+        pImage.setNull();
+        treeLock.acquire();
         if (FAILED(rc)) return rc;
     }
@@ -820 +828 @@
 
         rc = i_registerMedium(pImage, &pImage, treeLock);
+        // Avoid trouble with lock/refcount, before returning or not.
+        treeLock.release();
+        pImage.setNull();
+        treeLock.acquire();
         if (FAILED(rc)) return rc;
     }
@@ -4932 +4944 @@
         {
             AutoCaller machineCaller(pMachine);
-            if (SUCCEEDED(machineCaller.rc()))
+            if (SUCCEEDED(machineCaller.rc()) && pMachine->i_isAccessible())
                 ASMAtomicIncU64(&pMachine->uRegistryNeedsSaving);
         }