Changeset 6217 in vbox for trunk/src/VBox

Timestamp:

Dec 28, 2007 10:35:14 PM (17 years ago)

Author:

vboxsync

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

27025

Message:

serial: don't overwrite VM errors from the driver

Location:

trunk/src/VBox/Devices/Serial

Files:

• DevSerial.cpp (modified) (1 diff)
• DrvChar.cpp (modified) (1 diff)
• DrvNamedPipe.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Serial/DevSerial.cpp

@@ -858 +858 @@
     {
         AssertMsgFailed(("Serial%d: Failed to attach to char driver. rc=%Vrc\n", iInstance, rc));
-        return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
-                                   N_("Serial device %d cannot attach to char driver\n"), iInstance);
+        /* Don't call VMSetError here as we assume that the driver already set an appropriate error */
+        return rc;
     }
 

trunk/src/VBox/Devices/Serial/DrvChar.cpp

@@ -324 +324 @@
     int rc = pDrvIns->pDrvHlp->pfnAttach(pDrvIns, &pBase);
     if (VBOX_FAILURE(rc))
-        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("Char#%d failed to attach driver below"), pDrvIns->iInstance);
+        return rc; /* Don't call PDMDrvHlpVMSetError here as we assume that the driver already set an appropriate error */
     pData->pDrvStream = (PPDMISTREAM)pBase->pfnQueryInterface(pBase, PDMINTERFACE_STREAM);
     if (!pData->pDrvStream)

trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp

@@ -405 +405 @@
 {
     int rc;
+    char *pszLocation = NULL;
     PDRVNAMEDPIPE pData = PDMINS2DATA(pDrvIns, PDRVNAMEDPIPE);
 
@@ -431 +432 @@
      */
     if (!CFGMR3AreValuesValid(pCfgHandle, "Location\0IsServer\0"))
-        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
-
-    char *pszLocation;
+    {
+        rc = VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
+        goto out;
+    }
+
     rc = CFGMR3QueryStringAlloc(pCfgHandle, "Location", &pszLocation);
     if (VBOX_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: query \"Location\" resulted in %Vrc.\n", rc));
-        return rc;
+        goto out;
     }
     pData->pszLocation = pszLocation;
@@ -524 +527 @@
         if (pszLocation)
             MMR3HeapFree(pszLocation);
-    }
-    else
-    {
-        LogFlow(("drvNamedPipeConstruct: location %s isServer %d\n", pszLocation, fIsServer));
-        LogRel(("NamedPipe: location %s, %s\n", pszLocation, fIsServer ? "server" : "client"));
-    }
-    return rc;
+        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("NamedPipe#%d failed to initialize"), pDrvIns->iInstance);
+    }
+
+    LogFlow(("drvNamedPipeConstruct: location %s isServer %d\n", pszLocation, fIsServer));
+    LogRel(("NamedPipe: location %s, %s\n", pszLocation, fIsServer ? "server" : "client"));
+    return VINF_SUCCESS;
 }