Changeset 3288 in vbox for trunk/src

Timestamp:

Jun 26, 2007 12:19:05 PM (18 years ago)

Author:

vboxsync

Message:

Main: More precise check of whether the VM is running or not when USB attach/detach notifications arrive.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (3 diffs)
• include/ConsoleImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3115 +3115 @@
     AutoLock alock (this);
 
-    /* VM might have been stopped when this message arrives */
-    if (mMachineState < MachineState_Running ||
-        mMachineState == MachineState_Stopping)
-    {
+    /* protect mpVM (we don't need error info, since it's a callback) */
+    AutoVMCallerQuiet autoVMCaller (this);
+    if (FAILED (autoVMCaller.rc()))
+    {
+        /* The VM may be no more operational when this message arrives
+         * (e.g. it may be Saving or Stopping or just PoweredOff) --
+         * autoVMCaller.rc() will return a failure in this case. */
         LogFlowThisFunc (("Attach request ignored (mMachineState=%d).\n",
                           mMachineState));
-        return E_FAIL;
+        return autoVMCaller.rc();
     }
 
@@ -3130 +3133 @@
         return S_OK;
     }
-
-    /* protect mpVM */
-    AutoVMCaller autoVMCaller (this);
-    CheckComRCReturnRC (autoVMCaller.rc());
 
     /* Don't proceed unless we've found the usb controller. */
@@ -3198 +3197 @@
     }
 
-    /* VM might have been stopped when this message arrives */
+
     if (device.isNull())
     {
-        LogFlowThisFunc (("Device not found.\n"));
-        if (mMachineState < MachineState_Running ||
-            mMachineState == MachineState_Stopping)
+        LogFlowThisFunc (("USB device not found.\n"));
+
+        /* The VM may be no more operational when this message arrives
+         * (e.g. it may be Saving or Stopping or just PoweredOff). Use
+         * AutoVMCaller to detect it -- AutoVMCaller::rc() will return a
+         * failure in this case. */
+
+        AutoVMCallerQuiet autoVMCaller (this);
+        if (FAILED (autoVMCaller.rc()))
         {
             LogFlowThisFunc (("Detach request ignored (mMachineState=%d).\n",
                               mMachineState));
-            return E_FAIL;
-        }
-        /* the device must be in the list */
+            return autoVMCaller.rc();
+        }
+
+        /* the device must be in the list otherwise */
         AssertFailedReturn (E_FAIL);
     }

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

@@ -272 +272 @@
 
     /**
+     *  Same as AutoVMCaller but doesn't set extended error info on failure.
+     */
+    typedef AutoVMCallerBase <true, false> AutoVMCallerQuiet;
+
+    /**
      *  Base template for SaveVMPtr and SaveVMPtrQuiet.
      */