Changeset 24746 in vbox for trunk

Timestamp:

Nov 17, 2009 11:02:47 PM (15 years ago)

Author:

vboxsync

Message:

AsyncCompletion: Make it possible to enable the new I/O path with a CFGM key. The RTFile* API is still used if the key is not present

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/Storage/DrvVD.cpp (modified) (5 diffs)

trunk/Config.kmk

@@ -516 +516 @@
 endif
 # Enable the new I/O path
-#if1of ($(KBUILD_TARGET), linux solaris win freebsd darwin)
-# VBOX_WITH_NEW_IO_CODE = 1
-#endif
+if1of ($(KBUILD_TARGET), linux solaris win freebsd darwin)
+ VBOX_WITH_NEW_IO_CODE = 1
+endif
 
 #

trunk/src/VBox/Devices/Storage/DrvVD.cpp

@@ -1011 +1011 @@
     AssertRC(rc);
 
-#ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
-    pThis->VDIAsyncIOCallbacks.cbSize                  = sizeof(VDINTERFACEASYNCIO);
-    pThis->VDIAsyncIOCallbacks.enmInterface            = VDINTERFACETYPE_ASYNCIO;
-    pThis->VDIAsyncIOCallbacks.pfnOpen                 = drvvdAsyncIOOpen;
-    pThis->VDIAsyncIOCallbacks.pfnClose                = drvvdAsyncIOClose;
-    pThis->VDIAsyncIOCallbacks.pfnGetSize              = drvvdAsyncIOGetSize;
-    pThis->VDIAsyncIOCallbacks.pfnSetSize              = drvvdAsyncIOSetSize;
-    pThis->VDIAsyncIOCallbacks.pfnReadSync             = drvvdAsyncIOReadSync;
-    pThis->VDIAsyncIOCallbacks.pfnWriteSync            = drvvdAsyncIOWriteSync;
-    pThis->VDIAsyncIOCallbacks.pfnFlushSync            = drvvdAsyncIOFlushSync;
-    pThis->VDIAsyncIOCallbacks.pfnReadAsync            = drvvdAsyncIOReadAsync;
-    pThis->VDIAsyncIOCallbacks.pfnWriteAsync           = drvvdAsyncIOWriteAsync;
-    pThis->VDIAsyncIOCallbacks.pfnFlushAsync           = drvvdAsyncIOFlushAsync;
-
-    rc = VDInterfaceAdd(&pThis->VDIAsyncIO, "DrvVD_AsyncIO", VDINTERFACETYPE_ASYNCIO,
-                        &pThis->VDIAsyncIOCallbacks, pThis, &pThis->pVDIfsDisk);
-    AssertRC(rc);
-#endif
-
     /* This is just prepared here, the actual interface is per-image, so it's
      * added later. No need to have separate callback tables. */
@@ -1049 +1030 @@
      */
     bool        fHostIP = false;
+    bool        fUseNewIo = false;
     unsigned    iLevel = 0;
     PCFGMNODE   pCurNode = pCfgHandle;
@@ -1063 +1045 @@
                                           "Format\0Path\0"
                                           "ReadOnly\0TempReadOnly\0HonorZeroWrites\0"
-                                          "HostIPStack\0");
+                                          "HostIPStack\0UseNewIo\0");
         }
         else
@@ -1117 +1099 @@
                 break;
             }
+            rc = CFGMR3QueryBoolDef(pCurNode, "UseNewIo", &fUseNewIo, false);
+            if (RT_FAILURE(rc))
+            {
+                rc = PDMDRV_SET_ERROR(pDrvIns, rc,
+                                      N_("DrvVD: Configuration error: Querying \"UseNewIo\" as boolean failed"));
+                break;
+            }
         }
 
@@ -1168 +1157 @@
                                 &pThis->pVDIfsDisk);
         }
+
+        if (RT_SUCCESS(rc) && fUseNewIo)
+        {
+#ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
+            pThis->VDIAsyncIOCallbacks.cbSize        = sizeof(VDINTERFACEASYNCIO);
+            pThis->VDIAsyncIOCallbacks.enmInterface  = VDINTERFACETYPE_ASYNCIO;
+            pThis->VDIAsyncIOCallbacks.pfnOpen       = drvvdAsyncIOOpen;
+            pThis->VDIAsyncIOCallbacks.pfnClose      = drvvdAsyncIOClose;
+            pThis->VDIAsyncIOCallbacks.pfnGetSize    = drvvdAsyncIOGetSize;
+            pThis->VDIAsyncIOCallbacks.pfnSetSize    = drvvdAsyncIOSetSize;
+            pThis->VDIAsyncIOCallbacks.pfnReadSync   = drvvdAsyncIOReadSync;
+            pThis->VDIAsyncIOCallbacks.pfnWriteSync  = drvvdAsyncIOWriteSync;
+            pThis->VDIAsyncIOCallbacks.pfnFlushSync  = drvvdAsyncIOFlushSync;
+            pThis->VDIAsyncIOCallbacks.pfnReadAsync  = drvvdAsyncIOReadAsync;
+            pThis->VDIAsyncIOCallbacks.pfnWriteAsync = drvvdAsyncIOWriteAsync;
+            pThis->VDIAsyncIOCallbacks.pfnFlushAsync = drvvdAsyncIOFlushAsync;
+
+            rc = VDInterfaceAdd(&pThis->VDIAsyncIO, "DrvVD_AsyncIO", VDINTERFACETYPE_ASYNCIO,
+                                &pThis->VDIAsyncIOCallbacks, pThis, &pThis->pVDIfsDisk);
+#else /* !VBOX_WITH_PDM_ASYNC_COMPLETION */
+            rc = PDMDrvHlpVMSetError(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
+                                     RT_SRC_POS, N_("DrvVD: Configuration error: Async Completion Framework not compiled in"));
+#endif /* !VBOX_WITH_PDM_ASYNC_COMPLETION */
+        }
+
         if (RT_SUCCESS(rc))
         {