Changeset 19435 in vbox for trunk/include/VBox

Timestamp:

May 6, 2009 2:01:15 PM (16 years ago)

Author:

vboxsync

Message:

VMM: VMCPU::enmState.

Location:

trunk/include/VBox

Files:

• vm.h (modified) (7 diffs)
• vmapi.h (modified) (1 diff)

trunk/include/VBox/vm.h

@@ -45 +45 @@
 
 /**
- * The state of a virtual CPU.
- *
- * The VM running states are a sub-states of the VMSTATE_RUNNING state. While
- * VMCPUSTATE_NOT_RUNNING is a place holder for the other VM states.
+ * The state of a Virtual CPU.
+ *
+ * The basic state indicated here is whether the CPU has been started or not. In
+ * addition, there are sub-states when started for assisting scheduling (GVMM
+ * mostly).
+ *
+ * The transision out of the STOPPED state is done by a vmR3PowerOn.
+ * The transision back to the STOPPED state is done by vmR3PowerOff.
+ *
+ * (Alternatively we could let vmR3PowerOn start CPU 0 only and let the SPIP
+ * handling switch on the other CPUs. Then vmR3Reset would stop all but CPU 0.)
  */
 typedef enum VMCPUSTATE
@@ -55 +62 @@
     VMCPUSTATE_INVALID = 0,
 
-    /** Running guest code (VM running). */
-    VMCPUSTATE_RUN_EXEC,
-    /** Running guest code in the recompiler (VM running). */
-    VMCPUSTATE_RUN_EXEC_REM,
-    /** Halted (VM running). */
-    VMCPUSTATE_RUN_HALTED,
-    /** All the other bits we do while running a VM (VM running). */
-    VMCPUSTATE_RUN_MISC,
-    /** VM not running, we're servicing requests or whatever. */
-    VMCPUSTATE_NOT_RUNNING,
+    /** Virtual CPU has not yet been started.  */
+    VMCPUSTATE_STOPPED,
+
+    /** CPU started. */
+    VMCPUSTATE_STARTED,
+    /** Executing guest code and can be poked. */
+    VMCPUSTATE_STARTED_EXEC,
+    /** Executing guest code in the recompiler. */
+    VMCPUSTATE_STARTED_EXEC_REM,
+    /** Halted. */
+    VMCPUSTATE_STARTED_HALTED,
+
     /** The end of valid virtual CPU states. */
     VMCPUSTATE_END,
@@ -182 +191 @@
 } VMCPU;
 
-/** Pointer to a VMCPU. */
-#ifndef ___VBox_types_h
-typedef struct VMCPU *PVMCPU;
-#endif
+
+/** @name Operations on VMCPU::enmState
+ * @{ */
+/** Gets the VMCPU state. */
+#define VMCPU_GET_STATE(pVCpu)              ( (pVCpu)->enmState )
+/** Sets the VMCPU state. */
+#define VMCPU_SET_STATE(pVCpu, enmNewState) \
+    ASMAtomicWriteU32((uint32_t volatile *)&(pVCpu)->enmState, (enmNewState))
+/** Checks the VMCPU state. */
+#define VMCPU_ASSERT_STATE(pVCpu, enmExpectedState) \
+    do { \
+        VMCPUSTATE enmState = VMCPU_GET_STATE(pVCpu); \
+        AssertMsg(enmState == (enmExpectedState), \
+                  ("enmState=%d  enmExpectedState=%d idCpu=%u\n", \
+                  enmState, enmExpectedState, (pVCpu)->idCpu)); \
+    } while (0)
+/** Tests if the state means that the CPU is started. */
+#define VMCPUSTATE_IS_STARTED(enmState)     ( (enmState) > VMCPUSTATE_STOPPED )
+/** Tests if the state means that the CPU is stopped. */
+#define VMCPUSTATE_IS_STOPPED(enmState)     ( (enmState) == VMCPUSTATE_STOPPED )
+/** @} */
+
 
 /** The name of the Guest Context VMM Core module. */
@@ -450 +477 @@
 # define VMCPU_IS_EMT(pVCpu)                true
 #else
-# define VMCPU_IS_EMT(pVCpu)                (pVCpu && (pVCpu == VMMGetCpu(pVCpu->CTX_SUFF(pVM))))
+# define VMCPU_IS_EMT(pVCpu)                ((pVCpu) && ((pVCpu) == VMMGetCpu((pVCpu)->CTX_SUFF(pVM))))
 #endif
 
@@ -523 +550 @@
 #define VM_ASSERT_STATE(pVM, _enmState) \
         AssertMsg((pVM)->enmVMState == (_enmState), \
-                  ("state %s, expected %s\n", VMGetStateName(pVM->enmVMState), VMGetStateName(_enmState)))
+                  ("state %s, expected %s\n", VMGetStateName((pVM)->enmVMState), VMGetStateName(_enmState)))
 
 /** @def VM_ASSERT_STATE_RETURN
@@ -530 +557 @@
 #define VM_ASSERT_STATE_RETURN(pVM, _enmState, rc) \
         AssertMsgReturn((pVM)->enmVMState == (_enmState), \
-                        ("state %s, expected %s\n", VMGetStateName(pVM->enmVMState), VMGetStateName(_enmState)), \
+                        ("state %s, expected %s\n", VMGetStateName((pVM)->enmVMState), VMGetStateName(_enmState)), \
                         (rc))
 
@@ -900 +927 @@
 } VM;
 
-/** Pointer to a VM. */
-#ifndef ___VBox_types_h
-typedef struct VM *PVM;
-#endif
-
 
 #ifdef IN_RC

trunk/include/VBox/vmapi.h

@@ -376 +376 @@
 VMMR3DECL(void) VMR3Relocate(PVM pVM, RTGCINTPTR offDelta);
 VMMR3DECL(PVM)  VMR3EnumVMs(PVM pVMPrev);
-VMMR3DECL(int)  VMR3WaitForResume(PVM pVM);
 
 /**