vbox的更動 22277 路徑 trunk/src/VBox/Devices/Serial/DrvRawFile.cpp

時間撮記:

2009-8-16 下午09:12:50 (15 年 以前)

作者:

vboxsync

訊息:

PDMDRVREG change (big changeset).

檔案:

• trunk/src/VBox/Devices/Serial/DrvRawFile.cpp (修改) (8 筆差異)

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

@@ -1 @@
-/** @file
- *
- * VBox stream devices:
- * Raw file output
+/* $Id$ */
+/** @file 
+ * VBox stream drivers - Raw file output. 
  */
 
@@ -25 +24 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#define LOG_GROUP LOG_GROUP_DRV_NAMEDPIPE
+#define LOG_GROUP LOG_GROUP_DEFAULT
 #include <VBox/pdmdrv.h>
 #include <iprt/assert.h>
@@ -60 +59 @@
     PPDMDRVINS          pDrvIns;
     /** Pointer to the file name. (Freed by MM) */
-    char                *pszLocation;
+    char               *pszLocation;
     /** Flag whether VirtualBox represents the server or client side. */
     RTFILE              OutputFile;
@@ -121 +120 @@
  * Construct a raw output stream driver instance.
  *
- * @returns VBox status.
- * @param   pDrvIns     The driver instance data.
- *                      If the registration structure is needed, pDrvIns->pDrvReg points to it.
- * @param   pCfgHandle  Configuration node handle for the driver. Use this to obtain the configuration
- *                      of the driver instance. It's also found in pDrvIns->pCfgHandle, but like
- *                      iInstance it's expected to be used a bit in this function.
- */
-static DECLCALLBACK(int) drvRawFileConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle)
-{
-    int rc;
-    char *pszLocation = NULL;
+ * @copydoc FNPDMDRVCONSTRUCT
+ */
+static DECLCALLBACK(int) drvRawFileConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
+{
     PDRVRAWFILE pThis = PDMINS_2_DATA(pDrvIns, PDRVRAWFILE);
 
@@ -149 +141 @@
      */
     if (!CFGMR3AreValuesValid(pCfgHandle, "Location\0"))
-    {
-        rc = VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
-        goto out;
-    }
-
-    rc = CFGMR3QueryStringAlloc(pCfgHandle, "Location", &pszLocation);
+        AssertFailedReturn(VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES);
+
+    int rc = CFGMR3QueryStringAlloc(pCfgHandle, "Location", &pThis->pszLocation);
+    if (RT_FAILURE(rc))
+        AssertMsgFailedReturn(("Configuration error: query \"Location\" resulted in %Rrc.\n", rc), rc);
+
+    /*
+     * Open the raw file.
+     */
+    rc = RTFileOpen(&pThis->OutputFile, pThis->pszLocation, RTFILE_O_CREATE_REPLACE | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
     if (RT_FAILURE(rc))
     {
-        AssertMsgFailed(("Configuration error: query \"Location\" resulted in %Rrc.\n", rc));
-        goto out;
-    }
-    pThis->pszLocation = pszLocation;
-
-    rc = RTFileOpen(&pThis->OutputFile, pThis->pszLocation, RTFILE_O_WRITE | RTFILE_O_CREATE_REPLACE);
-    if (RT_FAILURE(rc))
-    {
-        LogRel(("RawFile%d: CreateFile failed rc=%Rrc\n", pThis->pDrvIns->iInstance));
-        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("RawFile#%d failed to create the raw output file %s"), pDrvIns->iInstance, pszLocation);
-    }
-
-out:
-    if (RT_FAILURE(rc))
-    {
-        if (pszLocation)
-            MMR3HeapFree(pszLocation);
-        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("RawFile#%d failed to initialize"), pDrvIns->iInstance);
-    }
-
-    LogFlow(("drvRawFileConstruct: location %s\n", pszLocation));
-    LogRel(("RawFile: location %s\n", pszLocation));
+        LogRel(("RawFile%d: CreateFile failed rc=%Rrc\n", pDrvIns->iInstance));
+        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("RawFile#%d failed to create the raw output file %s"), pDrvIns->iInstance, pThis->pszLocation);
+    }
+
+    LogFlow(("drvRawFileConstruct: location %s\n", pThis->pszLocation));
+    LogRel(("RawFile#%u: location %s\n", pDrvIns->iInstance, pThis->pszLocation));
     return VINF_SUCCESS;
 }
@@ -198 +178 @@
     if (pThis->pszLocation)
         MMR3HeapFree(pThis->pszLocation);
+
+    if (pThis->OutputFile != NIL_RTFILE)
+    {    
+        RTFileClose(pThis->OutputFile);
+        pThis->OutputFile = NIL_RTFILE;
+    }
 }
 
@@ -214 +200 @@
 
     if (pThis->OutputFile != NIL_RTFILE)
+    {    
         RTFileClose(pThis->OutputFile);
+        pThis->OutputFile = NIL_RTFILE;
+    }
 }
 
@@ -251 +240 @@
     /* pfnResume */
     NULL,
+    /* pfnAttach */
+    NULL,
     /* pfnDetach */
     NULL,
     /* pfnPowerOff */
     drvRawFilePowerOff,
+    /* pfnSoftReset */
+    NULL,
+    /* u32EndVersion */
+    PDM_DRVREG_VERSION
 };
+