Changeset 22784 in vbox for trunk/src/VBox/Main

Timestamp:

Sep 4, 2009 2:25:31 PM (16 years ago)

Author:

vboxsync

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

51969

Message:

VMM,Main,VBoxBFE: Changed VMR3Save and started working on making TakeSnapshot work without pausing the VM first.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (4 diffs)
• MachineImpl.cpp (modified) (2 diffs)
• Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -2386 +2386 @@
     MachineState_T lastMachineState = mMachineState;
 
+#ifndef VBOX_WITH_LIVE_MIGRATION /** @todo update the API docs. */
     if (mMachineState == MachineState_Running)
     {
@@ -2391 +2392 @@
         CheckComRCReturnRC(rc);
     }
+#endif
 
     HRESULT rc = S_OK;
 
-    bool fTakingSnapshotOnline = (mMachineState == MachineState_Paused);
+    bool const fTakingSnapshotOnline = (   mMachineState == MachineState_Running
+                                        || mMachineState == MachineState_Paused);
 
     /*
@@ -2450 +2453 @@
 
         /*
-         *  state file is non-null only when the VM is paused
-         *  (i.e. creating a snapshot online)
+         *  The state file is non-null only when creating a online or live snapshot.
          */
         ComAssertBreak(    (!stateFilePath.isNull() && fTakingSnapshotOnline)
@@ -7316 +7318 @@
         int vrc = VMR3Save(that->mpVM,
                            task->mSavedStateFile.c_str(),
+                           task->mIsSnapshot /*fContinueAfterwards*/,
                            Console::stateProgressCallback,
                            static_cast<VMProgressTask*>(task.get()));

trunk/src/VBox/Main/MachineImpl.cpp

@@ -7927 +7927 @@
     AssertReturn(    (    !Global::IsOnlineOrTransient (mData->mMachineState)
                        || mData->mMachineState == MachineState_Paused
+#ifdef VBOX_WITH_LIVE_MIGRATION
+                       || mData->mMachineState == MachineState_Running
+#endif
                      )
                   && mSnapshotData.mLastState == MachineState_Null
@@ -7933 +7936 @@
                   && mSnapshotData.mCombinedProgress.isNull(), E_FAIL);
 
-    bool fTakingSnapshotOnline = (mData->mMachineState == MachineState_Paused);
+    bool const fTakingSnapshotOnline = (   mData->mMachineState == MachineState_Running
+                                        || mData->mMachineState == MachineState_Paused);
 
     if (    !fTakingSnapshotOnline

trunk/src/VBox/Main/Makefile.kmk

@@ -216 +216 @@
         $(if $(VBOX_WITH_PDM_ASYNC_COMPLETION),VBOX_WITH_PDM_ASYNC_COMPLETION,) \
         $(if $(VBOX_WITH_DBUS),VBOX_WITH_DBUS,) \
-        $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,)
+        $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,) \
+        $(if $(VBOX_WITH_LIVE_MIGRATION),VBOX_WITH_LIVE_MIGRATION,)
 ifdef VBOX_WITH_USB
  VBoxSVC_DEFS += \
@@ -529 +530 @@
         $(if $(VBOX_WITH_SMC),VBOX_WITH_SMC,) \
         $(if $(VBOX_WITH_LPC),VBOX_WITH_LPC,) \
-        $(if $(VBOX_WITH_PDM_ASYNC_COMPLETION),VBOX_WITH_PDM_ASYNC_COMPLETION,)
+        $(if $(VBOX_WITH_PDM_ASYNC_COMPLETION),VBOX_WITH_PDM_ASYNC_COMPLETION,) \
+        $(if $(VBOX_WITH_LIVE_MIGRATION),VBOX_WITH_LIVE_MIGRATION,)
 ifdef VBOX_WITH_USB
 VBoxC_DEFS += \