Changeset 11435 in vbox for trunk/src/VBox/Devices/Storage/DrvVD.cpp

Timestamp:

Aug 14, 2008 6:23:31 PM (16 years ago)

Author:

vboxsync

Message:

Storage: big cleanup of the VD interfaces, especially hide the linked list better.

File:

• trunk/src/VBox/Devices/Storage/DrvVD.cpp (modified) (4 diffs)

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

@@ -89 +89 @@
     /** Flag whether suspend has changed image open mode to read only. */
     bool               fTempReadOnly;
+    /** Pointer to list of VD interfaces. */
+    PVDINTERFACE       pVDIfs;
     /** Common structure for the supported error interface. */
     VDINTERFACE        VDIError;
@@ -535 +537 @@
 
     /* Initialize supported VD interfaces. */
+    pThis->pVDIfs = NULL;
+
     pThis->VDIErrorCallbacks.cbSize       = sizeof(VDINTERFACEERROR);
     pThis->VDIErrorCallbacks.enmInterface = VDINTERFACETYPE_ERROR;
     pThis->VDIErrorCallbacks.pfnError     = drvvdErrorCallback;
 
-    rc = VDInterfaceCreate(&pThis->VDIError, "DrvVD_VDIError", VDINTERFACETYPE_ERROR,
-                           &pThis->VDIErrorCallbacks, pDrvIns, NULL);
+    rc = VDInterfaceAdd(&pThis->VDIError, "DrvVD_VDIError", VDINTERFACETYPE_ERROR,
+                        &pThis->VDIErrorCallbacks, pDrvIns, &pThis->pVDIfs);
     AssertRC(rc);
 
@@ -554 +558 @@
     pThis->VDIAsyncIOCallbacks.pfnTasksSubmit          = drvvdAsyncIOTasksSubmit;
 
-    rc = VDInterfaceCreate(&pThis->VDIAsyncIO, "DrvVD_AsyncIO", VDINTERFACETYPE_ASYNCIO,
-                           &pThis->VDIAsyncIOCallbacks, pThis, &pThis->VDIError);
+    rc = VDInterfaceAdd(&pThis->VDIAsyncIO, "DrvVD_AsyncIO", VDINTERFACETYPE_ASYNCIO,
+                        &pThis->VDIAsyncIOCallbacks, pThis, &pThis->pVDIfs);
     AssertRC(rc);
 
@@ -573 +577 @@
      * At the moment this is harmless, as iSCSI can only be used as a base
      * image, and no other backend uses the private data for these callbacks. */
-    rc = VDInterfaceCreate(&pThis->VDIConfig, "DrvVD_Config", VDINTERFACETYPE_CONFIG,
-                           &pThis->VDIConfigCallbacks, NULL /**< @todo TEMP */, &pThis->VDIAsyncIO);
+    rc = VDInterfaceAdd(&pThis->VDIConfig, "DrvVD_Config", VDINTERFACETYPE_CONFIG,
+                        &pThis->VDIConfigCallbacks, NULL /**< @todo TEMP */, &pThis->pVDIfs);
     AssertRC(rc);