Changeset 93548 in vbox

Timestamp:

Feb 2, 2022 6:08:28 PM (3 years ago)

Author:

vboxsync

Message:

Main/Machine: When saving the settings fails when creating a new file, delete the file because it usually does not contain anything (or something invalid). Leaving behind such files in the failure case sabotages retrying, since it will then fail with VERR_ALREADY_EXISTS.

Location:

trunk/src/VBox/Main

Files:

• include/MachineImpl.h (modified) (1 diff)
• src-server/MachineImpl.cpp (modified) (7 diffs)

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

@@ -682 +682 @@
     };
 
-    HRESULT i_prepareSaveSettings(bool *pfNeedsGlobalSaveSettings);
+    HRESULT i_prepareSaveSettings(bool *pfNeedsGlobalSaveSettings,
+                                  bool *pfSettingsFileIsNew);
     HRESULT i_saveSettings(bool *pfNeedsGlobalSaveSettings, AutoWriteLock &alock, int aFlags = 0);
 

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

@@ -9613 +9613 @@
  *  @note Must be never called directly but only from #saveSettings().
  */
-HRESULT Machine::i_prepareSaveSettings(bool *pfNeedsGlobalSaveSettings)
+HRESULT Machine::i_prepareSaveSettings(bool *pfNeedsGlobalSaveSettings,
+                                       bool *pfSettingsFileIsNew)
 {
     AssertReturn(isWriteLockOnCurrentThread(), E_FAIL);
@@ -9620 +9621 @@
 
     bool fSettingsFileIsNew = !mData->pMachineConfigFile->fileExists();
-
     /// @todo need to handle primary group change, too
 
@@ -9834 +9834 @@
 
         /* Note: open flags must correlate with RTFileOpen() in lockConfig() */
-        path = Utf8Str(mData->m_strConfigFileFull);
+        path = mData->m_strConfigFileFull;
         RTFILE f = NIL_RTFILE;
         vrc = RTFileOpen(&f, path.c_str(),
@@ -9845 +9845 @@
         RTFileClose(f);
     }
+    if (pfSettingsFileIsNew)
+        *pfSettingsFileIsNew = fSettingsFileIsNew;
 
     return rc;
@@ -9877 +9879 @@
 HRESULT Machine::i_saveSettings(bool *pfNeedsGlobalSaveSettings,
                                 AutoWriteLock &alock,
-                                int  aFlags /*= 0*/)
+                                int aFlags /*= 0*/)
 {
     LogFlowThisFuncEnter();
@@ -9896 +9898 @@
     HRESULT rc = S_OK;
     bool fNeedsWrite = false;
+    bool fSettingsFileIsNew = false;
 
     /* First, prepare to save settings. It will care about renaming the
      * settings directory and file if the machine name was changed and about
      * creating a new settings file if this is a new machine. */
-    rc = i_prepareSaveSettings(pfNeedsGlobalSaveSettings);
+    rc = i_prepareSaveSettings(pfNeedsGlobalSaveSettings,
+                               &fSettingsFileIsNew);
     if (FAILED(rc)) return rc;
 
@@ -9963 +9967 @@
         // we assume that error info is set by the thrower
         rc = err;
+
+        // delete any newly created settings file
+        if (fSettingsFileIsNew)
+            RTFileDelete(mData->m_strConfigFileFull.c_str());
 
         // restore old config