Changeset 31574 in vbox for trunk/src/VBox

Timestamp:

Aug 11, 2010 2:54:09 PM (14 years ago)

Author:

vboxsync

Message:

Main: bring back boolean argument to IConsole::discardSavedState()

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (1 diff)
• Frontends/VBoxSDL/VBoxSDL.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp (modified) (1 diff)
• Main/ConsoleImpl.cpp (modified) (2 diffs)
• Main/MachineImpl.cpp (modified) (3 diffs)
• Main/idl/VirtualBox.xidl (modified) (3 diffs)
• Main/include/ConsoleImpl.h (modified) (1 diff)
• Main/include/MachineImpl.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -433 +433 @@
                 ComPtr<IConsole> console;
                 CHECK_ERROR_BREAK(a->session, COMGETTER(Console)(console.asOutParam()));
-                CHECK_ERROR_BREAK(console, DiscardSavedState());
+                CHECK_ERROR_BREAK(console, DiscardSavedState(true /* fDeleteFile */));
             } while (0);
             CHECK_ERROR_BREAK(a->session, UnlockMachine());

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -1651 +1651 @@
         if (machineState == MachineState_Saved)
         {
-            CHECK_ERROR(gConsole, DiscardSavedState());
+            CHECK_ERROR(gConsole, DiscardSavedState(true /* fDeleteFile */));
         }
         /*

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp

@@ -770 +770 @@
 
     CConsole console = session.GetConsole();
-    console.DiscardSavedState();
+    console.DiscardSavedState(true /* fDeleteFile */);
     if (!console.isOk())
         vboxProblem().cannotDiscardSavedState (console);

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -2388 +2388 @@
 }
 
-STDMETHODIMP Console::DiscardSavedState()
+STDMETHODIMP Console::DiscardSavedState(BOOL aRemoveFile)
 {
     AutoCaller autoCaller(this);
@@ -2400 +2400 @@
             Global::stringifyMachineState(mMachineState));
 
-    HRESULT rc = S_OK;
+    HRESULT rc = mControl->SetRemoveSavedStateFile(aRemoveFile);
+    if (FAILED(rc)) return rc;
 
     /*

trunk/src/VBox/Main/MachineImpl.cpp

@@ -9659 +9659 @@
     }
 
+    /* default is to delete saved state on Saved -> PoweredOff transition */
+    mRemoveSavedState = true;
+
     /* Confirm a successful initialization when it's the case */
     autoInitSpan.setSucceeded();
@@ -9952 +9955 @@
 
 /**
+ *  @note Locks this object for writing.
+ */
+STDMETHODIMP SessionMachine::SetRemoveSavedStateFile(BOOL aRemove)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    mRemoveSavedState = aRemove;
+
+    return S_OK;
+}
+
+/**
  *  @note Locks the same as #setMachineState() does.
  */
@@ -11262 +11280 @@
     if (deleteSavedState)
     {
-        Assert(!mSSData->mStateFilePath.isEmpty());
-        RTFileDelete(mSSData->mStateFilePath.c_str());
+        if (mRemoveSavedState)
+        {
+            Assert(!mSSData->mStateFilePath.isEmpty());
+            RTFileDelete(mSSData->mStateFilePath.c_str());
+        }
         mSSData->mStateFilePath.setNull();
         stsFlags |= SaveSTS_StateFilePath;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -2988 +2988 @@
      wsmap="suppress"
      >
+    <method name="setRemoveSavedStateFile">
+      <desc>
+        Updates the flag whether the saved state file is removed on a
+        machine state change from Saved to PoweredOff.
+      </desc>
+      <param name="aRemove" type="boolean" dir="in"/>
+    </method>
+
     <method name="updateState">
       <desc>
         Updates the VM state.
         <note>
-          This operation will also update the settings file with
-          the correct information about the saved state file
-          and delete this file from disk when appropriate.
+          This operation will also update the settings file with the correct
+          information about the saved state file and delete this file from disk
+          when appropriate.
         </note>
       </desc>
@@ -6151 +6159 @@
       <desc>
         Forcibly resets the machine to "Powered Off" state if it is
-        currently in the "Saved" state (previously created by <link to="#saveState"/>)
-        and deletes the file into which the machine state was saved.
+        currently in the "Saved" state (previously created by <link to="#saveState"/>).
         Next time the machine is powered up, a clean boot will occur.
         <note>
@@ -6160 +6167 @@
           computer, it can can lead to data loss.
         </note>
+        If @a fRemoveFile is @c true, the file in the machine directory
+        into which the machine state was saved is also deleted. If
+        this is @c false, then the state can be recovered and later
+        re-inserted into a machine using <link to="#adoptSavedState" />.
+        The location of the file can be found in the
+        <link to="IMachine::stateFilePath" /> attribute.
         <result name="VBOX_E_INVALID_VM_STATE">
           Virtual machine not in state Saved.
         </result>
       </desc>
+      <param name="fRemoveFile" type="boolean" dir="in" >
+        <desc>Whether to also remove the saved state file.</desc>
+      </param>
     </method>
 

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

@@ -138 +138 @@
     STDMETHOD(SaveState)(IProgress **aProgress);
     STDMETHOD(AdoptSavedState)(IN_BSTR aSavedStateFile);
-    STDMETHOD(DiscardSavedState)();
+    STDMETHOD(DiscardSavedState)(BOOL aRemoveFile);
     STDMETHOD(GetDeviceActivity)(DeviceType_T aDeviceType,
                                 DeviceActivity_T *aDeviceActivity);

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

@@ -888 +888 @@
 
     // IInternalMachineControl methods
+    STDMETHOD(SetRemoveSavedStateFile)(BOOL aRemove);
     STDMETHOD(UpdateState)(MachineState_T machineState);
     STDMETHOD(GetIPCId)(BSTR *id);
@@ -1025 +1026 @@
     HRESULT updateMachineStateOnClient();
 
+    HRESULT mRemoveSavedState;
+
     SnapshotData mSnapshotData;