Changeset 59630 in vbox

Timestamp:

Feb 10, 2016 1:05:39 PM (9 years ago)

Author:

vboxsync

Message:

Devices/GIMDev: Gracefully fail on invalid config of debug support (when GIM forces debugging but debug port CFGM is missing).

File:

• trunk/src/VBox/Devices/GIMDev/GIMDev.cpp (modified) (1 diff)

trunk/src/VBox/Devices/GIMDev/GIMDev.cpp

@@ -207 +207 @@
                 LogRel(("GIMDev: LUN#%u: Debug port configured\n", GIMDEV_DEBUG_LUN));
             else
+            {
                 LogRel(("GIMDev: LUN#%u: No unit\n", GIMDEV_DEBUG_LUN));
-        }
-        else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
+                rc = VERR_INTERNAL_ERROR_2;
+            }
+        }
+        else
         {
             pThis->pDbgDrvBase = NULL;
-            LogRel(("GIMDev: LUN#%u: No debug port configured\n", GIMDEV_DEBUG_LUN));
-        }
-        else
-        {
-            AssertLogRelMsgFailed(("GIMDev: LUN#%u: Failed to attach to driver on debug port. rc=%Rrc\n", GIMDEV_DEBUG_LUN, rc));
-            /* Don't call VMSetError here as we assume that the driver already set an appropriate error */
-            return rc;
+            LogRel(("GIMDev: LUN#%u: No debug port configured! rc=%Rrc\n", GIMDEV_DEBUG_LUN, rc));
+        }
+
+        if (!pDbgDrvStream)
+        {
+            Assert(rc != VINF_SUCCESS);
+            return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
+                                   N_("Debug port configuration expected when GIM configured with debugging support"));
         }