Changeset 12889 in vbox for trunk

Timestamp:

Oct 2, 2008 5:20:22 AM (16 years ago)

Author:

vboxsync

Message:

Main: IConsole::powerUpPaused for use with the debugger.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (9 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/ConsoleImpl.h (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -186 +186 @@
     VMPowerUpTask (Console *aConsole, Progress *aProgress)
         : VMProgressTask (aConsole, aProgress, false /* aUsesVMPtr */)
-        , mSetVMErrorCallback (NULL), mConfigConstructor (NULL) {}
+        , mSetVMErrorCallback (NULL), mConfigConstructor (NULL), mStartPaused (false) {}
 
     PFNVMATERROR mSetVMErrorCallback;
@@ -192 +192 @@
     Utf8Str mSavedStateFile;
     Console::SharedFolderDataMap mSharedFolders;
+    bool mStartPaused;
 };
 
@@ -621 +622 @@
     hrc = mVRDPServer->COMGETTER(AllowMultiConnection) (&allowMultiConnection);
     AssertComRCReturn (hrc, VERR_ACCESS_DENIED);
-    
+
     BOOL reuseSingleConnection = FALSE;
     hrc = mVRDPServer->COMGETTER(ReuseSingleConnection) (&reuseSingleConnection);
@@ -1191 +1192 @@
 
 STDMETHODIMP Console::PowerUp (IProgress **aProgress)
+{
+    return powerUpCommon (aProgress, false /* aPaused */);
+}
+
+STDMETHODIMP Console::PowerUpPaused (IProgress **aProgress)
+{
+    return powerUpCommon (aProgress, true /* aPaused */);
+}
+
+/**
+ * Common worker for PowerUp and PowerUpPaused.
+ *
+ * @returns COM status code.
+ *
+ * @param   aProgress       Where to return the progress object.
+ * @param   aPaused         true if PowerUpPaused called.
+ *
+ * @todo move down to powerDown();
+ */
+HRESULT Console::powerUpCommon (IProgress **aProgress, bool aPaused)
 {
     LogFlowThisFuncEnter();
@@ -1397 +1418 @@
     task->mConfigConstructor = configConstructor;
     task->mSharedFolders = sharedFolders;
+    task->mStartPaused = aPaused;
     if (mMachineState == MachineState_Saved)
         task->mSavedStateFile = savedStateFile;
@@ -1544 +1566 @@
     alock.leave();
 
-    int vrc = VMR3Resume (mpVM);
+    int vrc;
+    if (VMR3GetState(mpVM) == VMSTATE_CREATED)
+        vrc = VMR3PowerOn (mpVM); /* (PowerUpPaused) */
+    else
+        vrc = VMR3Resume (mpVM);
 
     HRESULT rc = VBOX_SUCCESS (vrc) ? S_OK :
@@ -5161 +5187 @@
                  *  to Running
                  */
-                Assert ((that->mMachineState == MachineState_Starting &&
-                         aOldState == VMSTATE_CREATED) ||
-                        ((that->mMachineState == MachineState_Restoring ||
-                          that->mMachineState == MachineState_Paused) &&
-                         aOldState == VMSTATE_SUSPENDED));
+                Assert (   (   (   that->mMachineState == MachineState_Starting
+                                || that->mMachineState == MachineState_Paused)
+                            && aOldState == VMSTATE_CREATED)
+                        || (   (   that->mMachineState == MachineState_Restoring
+                                || that->mMachineState == MachineState_Paused)
+                            && aOldState == VMSTATE_SUSPENDED));
 
                 that->setMachineState (MachineState_Running);
@@ -6373 +6400 @@
                                     static_cast <VMProgressTask *> (task.get()));
 
-                    /* Start/Resume the VM execution */
                     if (VBOX_SUCCESS (vrc))
                     {
-                        vrc = VMR3Resume (pVM);
-                        AssertRC (vrc);
+                        if (task->mStartPaused)
+                            /* done */
+                            console->setMachineState (MachineState_Paused);
+                        else
+                        {
+                            /* Start/Resume the VM execution */
+                            vrc = VMR3Resume (pVM);
+                            AssertRC (vrc);
+                        }
                     }
 
@@ -6387 +6420 @@
                     }
                 }
+                else if (task->mStartPaused)
+                    /* done */
+                    console->setMachineState (MachineState_Paused);
                 else
                 {

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

@@ -4237 +4237 @@
   <interface
      name="IConsole" extends="$unknown"
-     uuid="d5a1cbda-f5d7-4824-9afe-d640c94c7dcf"
+     uuid="3acbd337-925f-497d-a624-465c8a99ae5a"
      wsmap="managed"
      >
@@ -4386 +4386 @@
 
         <see>#saveState</see>
+      </desc>
+      <param name="progress" type="IProgress" dir="return">
+        <desc>Progress object to track the operation completion.</desc>
+      </param>
+    </method>
+
+    <method name="powerUpPaused">
+      <desc>
+        Identical to powerUp save that the VM will enter the
+        <link to="MachineState::Paused"/> state, instead of
+        <link to="MachineState::Running"/>.
+
+        <see>#powerUp</see>
       </desc>
       <param name="progress" type="IProgress" dir="return">

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

@@ -125 +125 @@
     // IConsole methods
     STDMETHOD(PowerUp) (IProgress **aProgress);
+    STDMETHOD(PowerUpPaused) (IProgress **aProgress);
     STDMETHOD(PowerDown)();
     STDMETHOD(Reset)();
@@ -398 +399 @@
     HRESULT consoleInitReleaseLog (const ComPtr <IMachine> aMachine);
 
+    HRESULT powerUpCommon (IProgress **aProgress, bool aPaused);
     HRESULT powerDown();