Changeset 98122 in vbox for trunk/include

Timestamp:

Jan 19, 2023 12:03:23 AM (23 months ago)

Author:

vboxsync

Message:

VMM/PDM: Fixed assertion in PDMR3ResumeUsb after attaching a virtual MSD.

Location:

trunk/include/VBox/vmm

Files:

• pdmusb.h (modified) (2 diffs)
• vm.h (modified) (2 diffs)

trunk/include/VBox/vmm/pdmusb.h

@@ -240 +240 @@
      * VM Resume notification.
      *
+     * This is not called when the device is hotplugged device, instead
+     * pfnHotPlugged will be called.
+     *
      * @returns VBox status.
      * @param   pUsbIns     The USB device instance data.
@@ -260 +263 @@
      * Called after the constructor when attaching a device at run time.
      *
-     * This can be used to do tasks normally assigned to pfnInitComplete and/or pfnVMPowerOn.
+     * This can be used to do tasks normally assigned to pfnInitComplete and/or
+     * pfnVMPowerOn.  There will not be a call to pfnVMResume following this.
      *
      * @returns VBox status.

trunk/include/VBox/vmm/vm.h

@@ -989 +989 @@
  */
 #define VMSTATE_IS_RUNNING(a_enmVMState) \
-    (   (enmVMState) == VMSTATE_RUNNING \
-     || (enmVMState) == VMSTATE_RUNNING_LS )
+    (   (a_enmVMState) == VMSTATE_RUNNING \
+     || (a_enmVMState) == VMSTATE_RUNNING_LS )
 
 /** @def VM_IS_RUNNING_FOR_ASSERTIONS_ONLY
@@ -1000 +1000 @@
     (   (pVM)->enmVMState == VMSTATE_RUNNING \
      || (pVM)->enmVMState == VMSTATE_RUNNING_LS )
+
+
+/** @def VMSTATE_IS_POWERED_ON
+ * Checks if the given state indicates the VM is powered on.
+ *
+ * @note Excludes all error states, so a powered on VM that hit a fatal error,
+ *       guru meditation, state load failure or similar will not be considered
+ *       powered on by this test.
+ */
+#define VMSTATE_IS_POWERED_ON(a_enmVMState) \
+    ( (a_enmVMState) >= VMSTATE_RESUMING && (a_enmVMState) < VMSTATE_POWERING_OFF )
 
 /** @def VM_ASSERT_IS_NOT_RUNNING