Changeset 11435 in vbox for trunk/src/VBox/Main

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.

Location:

trunk/src/VBox/Main

Files:

• HardDiskImpl.cpp (modified) (3 diffs)
• include/HardDiskImpl.h (modified) (3 diffs)

trunk/src/VBox/Main/HardDiskImpl.cpp

@@ -3404 +3404 @@
 
     /* Create supported error interface. */
+    mVDInterfaces = NULL;
     mInterfaceErrorCallbacks.cbSize       = sizeof(VDINTERFACEERROR);
     mInterfaceErrorCallbacks.enmInterface = VDINTERFACETYPE_ERROR;
     mInterfaceErrorCallbacks.pfnError     = VDError;
-    int vrc = VDInterfaceCreate(&mInterfaceError, "VMDK_IError", VDINTERFACETYPE_ERROR,
-                                &mInterfaceErrorCallbacks, this, NULL);
+    int vrc = VDInterfaceAdd(&mInterfaceError, "VMDK_IError", VDINTERFACETYPE_ERROR,
+                             &mInterfaceErrorCallbacks, this, &mVDInterfaces);
     ComAssertRCRet (vrc, E_FAIL);
 
@@ -4292 +4293 @@
 
     /* Create supported error interface. */
+    mVDInterfaces = NULL;
     mInterfaceErrorCallbacks.cbSize       = sizeof(VDINTERFACEERROR);
     mInterfaceErrorCallbacks.enmInterface = VDINTERFACETYPE_ERROR;
     mInterfaceErrorCallbacks.pfnError     = VDError;
-    int vrc = VDInterfaceCreate(&mInterfaceError, "Custom_IError", VDINTERFACETYPE_ERROR,
-                                &mInterfaceErrorCallbacks, this, NULL);
+    int vrc = VDInterfaceAdd(&mInterfaceError, "Custom_IError", VDINTERFACETYPE_ERROR,
+                             &mInterfaceErrorCallbacks, this, &mVDInterfaces);
     ComAssertRCRet (vrc, E_FAIL);
 
@@ -5138 +5140 @@
 
     /* Create supported error interface. */
+    mVDInterfaces = NULL;
     mInterfaceErrorCallbacks.cbSize       = sizeof(VDINTERFACEERROR);
     mInterfaceErrorCallbacks.enmInterface = VDINTERFACETYPE_ERROR;
     mInterfaceErrorCallbacks.pfnError     = VDError;
-    int vrc = VDInterfaceCreate(&mInterfaceError, "VHD_IError", VDINTERFACETYPE_ERROR,
-                                &mInterfaceErrorCallbacks, this, NULL);
+    int vrc = VDInterfaceAdd(&mInterfaceError, "VHD_IError", VDINTERFACETYPE_ERROR,
+                             &mInterfaceErrorCallbacks, this, &mVDInterfaces);
     ComAssertRCRet (vrc, E_FAIL);
 

trunk/src/VBox/Main/include/HardDiskImpl.h

@@ -539 +539 @@
     PVBOXHDD mContainer;
 
+    PVDINTERFACE     mVDInterfaces;
+
     VDINTERFACE      mInterfaceError;
     VDINTERFACEERROR mInterfaceErrorCallbacks;
@@ -654 +656 @@
     PVBOXHDD mContainer;
 
+    PVDINTERFACE     mVDInterfaces;
+
     VDINTERFACE      mInterfaceError;
     VDINTERFACEERROR mInterfaceErrorCallbacks;
@@ -770 +774 @@
     PVBOXHDD mContainer;
 
+    PVDINTERFACE     mVDInterfaces;
+
     VDINTERFACE      mInterfaceError;
     VDINTERFACEERROR mInterfaceErrorCallbacks;