儲存庫 vbox 的更動 15448

時間撮記:

2008-12-13 下午07:32:05 (16 年 以前)

作者:

vboxsync

訊息:

Main: #3314: Don't delete the saved state file if restoring the VM fails in the middle of VMR3Load() (for example due to the state file incompatibility).

位置:

trunk/src/VBox/Main

檔案:

• ConsoleImpl.cpp (修改) (1 筆差異)
• MachineImpl.cpp (修改) (1 筆差異)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -4598 +4598 @@
 
     /* go to Stopping state if not already there. Note that we don't go from
-     * Saving to Stopping because vmstateChangeCallback() needs it to set the
-     * state to Saved on VMSTATE_TERMINATED. In terms of protecting from
-     * inappropriate operations while leaving the lock below, Saving should be
-     * fine too */
+     * Saving/Restoring to Stopping because vmstateChangeCallback() needs it to
+     * set the state to Saved on VMSTATE_TERMINATED. In terms of protecting from
+     * inappropriate operations while leaving the lock below, Saving or
+     * Restoring should be fine too */
     if (mMachineState != MachineState_Saving &&
+        mMachineState != MachineState_Restoring &&
         mMachineState != MachineState_Stopping)
         setMachineState (MachineState_Stopping);

trunk/src/VBox/Main/MachineImpl.cpp

@@ -5885 +5885 @@
 
         /* stateFile (optional) */
-        if (mData->mMachineState == MachineState_Saved)
+        /// @todo The reason for MachineState_Restoring below:
+        /// PushGuestProperties() is always called from Console::powerDown()
+        /// (including the case when restoring from the saved state fails) and
+        /// calls SaveSettings() to save guest properties. Since the saved state
+        /// file is still present there (and should be kept), we must save it
+        /// while in Restoring state too. However, calling SaveSettings() from
+        /// PushGuestProperties() is wrong in the first place. A proper way is
+        /// to only save guest properties node and not involve the whole save
+        /// process.
+        if (mData->mMachineState == MachineState_Saved ||
+            mData->mMachineState == MachineState_Restoring)
         {
             Assert (!mSSData->mStateFilePath.isEmpty());