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

Timestamp:

Aug 22, 2007 8:49:37 PM (18 years ago)

Author:

vboxsync

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

23820

Message:

Main/GUI: Implemented the Stuck state.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (11 diffs)
• idl/VirtualBox.xidl (modified) (8 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -1468 +1468 @@
 
     if (mMachineState != MachineState_Running &&
-        mMachineState != MachineState_Paused)
+        mMachineState != MachineState_Paused &&
+        mMachineState != MachineState_Stuck)
     {
         /* extra nice error message for a common case */
@@ -1891 +1892 @@
     //  Paused, Starting, Saving, Stopping, etc? if not, we should make a
     //  stricter check (mMachineState != MachineState_Running).
-    /* bird: It is not permitted to attach or detach while the VM is saving, is restoring
-     * or has stopped - definintly not.
+    //
+    //  I'm changing it to the semi-strict check for the time being. We'll
+    //  consider the below later.
+    //
+    /* bird: It is not permitted to attach or detach while the VM is saving,
+     * is restoring or has stopped - definintly not.
      *
-     * Attaching while starting, well, if you don't create any deadlock it should work...
-     * Paused should work I guess, but we shouldn't push our luck if we're pausing because an
-     * runtime error condition was raised (which is one of the reasons there better be a separate
-     * state for that in the VMM).
+     * Attaching while starting, well, if you don't create any deadlock it
+     * should work...  Paused should work I guess, but we shouldn't push our
+     * luck if we're pausing because an runtime error condition was raised
+     * (which is one of the reasons there better be a separate state for that
+     * in the VMM).
      */
-    if (mMachineState < MachineState_Running)
+    if (mMachineState != MachineState_Running &&
+        mMachineState != MachineState_Paused)
         return setError (E_FAIL,
-            tr ("Cannot attach a USB device to a machine which is not running "
-                "(machine state: %d)"), mMachineState);
+            tr ("Cannot attach a USB device to the machine which is not running"
+                "(machine state: %d)"),
+            mMachineState);
 
     /* protect mpVM */
@@ -1999 +2007 @@
     AutoLock alock (this);
 
+    /// @todo see @todo in AttachUSBDevice() about the Paused state
     if (mMachineState == MachineState_Saved)
         return setError (E_FAIL,
-            tr ("Cannot create a transient shared folder on a "
+            tr ("Cannot create a transient shared folder on the "
                 "machine in the saved state"));
+    if (mMachineState > MachineState_Paused)
+        return setError (E_FAIL,
+            tr ("Cannot create a transient shared folder on the "
+                "machine while it is changing the state (machine state: %d)"),
+            mMachineState);
 
     ComObjPtr <SharedFolder> sharedFolder;
@@ -2065 +2079 @@
     AutoLock alock (this);
 
+    /// @todo see @todo in AttachUSBDevice() about the Paused state
     if (mMachineState == MachineState_Saved)
         return setError (E_FAIL,
-            tr ("Cannot remove a transient shared folder when the "
-                "machine is in the saved state."));
+            tr ("Cannot remove a transient shared folder from the "
+                "machine in the saved state"));
+    if (mMachineState > MachineState_Paused)
+        return setError (E_FAIL,
+            tr ("Cannot remove a transient shared folder from the "
+                "machine while it is changing the state (machine state: %d)"),
+            mMachineState);
 
     ComObjPtr <SharedFolder> sharedFolder;
@@ -2124 +2144 @@
     AutoLock alock (this);
 
-    if (mMachineState > MachineState_Running &&
-        mMachineState != MachineState_Paused)
+    if (mMachineState > MachineState_Paused)
     {
         return setError (E_FAIL,
-            tr ("Cannot take a snapshot of a machine while it is changing state.  (Machine state: %d)"), mMachineState);
+            tr ("Cannot take a snapshot of the machine "
+                "while it is changing the state (machine state: %d)"),
+            mMachineState);
     }
 
@@ -2296 +2317 @@
     if (mMachineState >= MachineState_Running)
         return setError (E_FAIL,
-            tr ("Cannot discard a snapshot on a running machine (Machine state: %d)"), mMachineState);
+            tr ("Cannot discard a snapshot of the running machine "
+                "(machine state: %d)"),
+            mMachineState);
 
     MachineState_T machineState = MachineState_InvalidMachineState;
@@ -2315 +2338 @@
     if (mMachineState >= MachineState_Running)
         return setError (E_FAIL,
-            tr ("Cannot discard the current state of a running machine.  (Machine state: %d)"), mMachineState);
+            tr ("Cannot discard the current state of the running machine "
+                "(nachine state: %d)"),
+            mMachineState);
 
     MachineState_T machineState = MachineState_InvalidMachineState;
@@ -2334 +2359 @@
     if (mMachineState >= MachineState_Running)
         return setError (E_FAIL,
-            tr ("Cannot discard the current snapshot and state on a running machine.  (Machine state: %d)"), mMachineState);
+            tr ("Cannot discard the current snapshot and state of the "
+                "running machine (machine state: %d)"),
+            mMachineState);
 
     MachineState_T machineState = MachineState_InvalidMachineState;
@@ -3869 +3896 @@
     AssertMsg (mMachineState == MachineState_Running ||
                mMachineState == MachineState_Paused ||
+               mMachineState == MachineState_Stuck ||
                mMachineState == MachineState_Saving ||
                mMachineState == MachineState_Starting ||
@@ -4548 +4576 @@
                 that->setMachineState (MachineState_Paused);
             }
+
+            break;
         }
 
@@ -4572 +4602 @@
                 that->setMachineState (MachineState_Running);
             }
+
+            break;
+        }
+
+        case VMSTATE_GURU_MEDITATION:
+        {
+            AutoLock alock (that);
+
+            if (that->mVMStateChangeCallbackDisabled)
+                break;
+
+            /* Guru respects only running VMs */
+            Assert ((that->mMachineState >= MachineState_Running));
+
+            that->setMachineState (MachineState_Stuck);
+
+            break;
         }
 

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

@@ -111 +111 @@
   <enum
      name="MachineState"
-     uuid="b8bb15f7-4fa2-4e84-87a8-b4677dd87deb"
+     uuid="73bf04d0-7c4f-4684-9abf-d65a9ad74343"
      >
     <desc>
@@ -118 +118 @@
     </desc>
 
-    <const name="InvalidMachineState"   value="0"/>
+    <const name="InvalidMachineState"   value="0">
+      <desc>
+        Invalid machine state. This state is never used by the virtual machine
+        and may be used as a <tt>null</tt> value for state
+        variables.
+      </desc>
+    </const>
     <const name="PoweredOff"            value="1">
       <desc>
@@ -150 +156 @@
           action).
         </note>
+        <note>
+          For whoever decides to touch this enum: In order to keep the
+          aforementioned comparisons valid, this state must immediately
+          preceed the Paused state.
+        </note>
       </desc>
     </const>
@@ -156 +167 @@
         The execution of the machine has been paused.
         <note>
-          This value can be used in comparison expressions:
-          all state values above it represent unstable states of the
-          virtual machine. No any settings can be altered when the
-          VM is in one of the unstable sates.
+          This value can be used in comparison expressions: all state values
+          above it represent unstable states of the running virtual
+          machine. Unless explicitly stated otherwise, no machine settings can
+          be altered when it is in one of the unstable sates.
+        </note>
+        <note>
+          For whoever decides to touch this enum: In order to keep the
+          aforementioned comparisons valid, this state must immediately
+          follow the Running state.
         </note>
       </desc>
     </const>
-    <const name="Starting"              value="6">
+    <const name="Stuck"                 value="6">
+      <desc>
+        The execution of the machine has reached the Guru Meditaion
+        condition. This condition indicates an internal VMM failure which may
+        happen as a result of either an unhandled low-level virtual hardware
+        exception or one of the recompiler exceptions (such as
+        the <i>too-many-traps</i> condition).
+      </desc>
+    </const>
+    <const name="Starting"              value="7">
       <desc>
         The machine is being started after
@@ -170 +195 @@
       </desc>
     </const>
-    <const name="Stopping"              value="7">
+    <const name="Stopping"              value="8">
       <desc>
         The machine is being normally stopped
@@ -177 +202 @@
       </desc>
     </const>
-    <const name="Saving"                value="8">
+    <const name="Saving"                value="9">
       <desc>
         The machine is saving its execution state to a file as a
@@ -185 +210 @@
       </desc>
     </const>
-    <const name="Restoring"             value="9">
+    <const name="Restoring"             value="10">
       <desc>
         The execution state of the machine is being restored from a file
@@ -192 +217 @@
       </desc>
     </const>
-    <const name="Discarding"            value="10">
+    <const name="Discarding"            value="11">
       <desc>
         A snapshot of the machine is being discarded after calling