Changeset 10715 in vbox for trunk/src/VBox/Main/HardDiskImpl.cpp

Timestamp:

Jul 16, 2008 10:38:23 PM (17 years ago)

Author:

vboxsync

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

33435

Message:

Merge async I/O for VMDK backend from private branch

File:

• trunk/src/VBox/Main/HardDiskImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/HardDiskImpl.cpp

@@ -3403 +3403 @@
     mActualSize = 0;
 
+    /* Create supported error interface. */
+    mInterfaceErrorCallbacks.cbSize       = sizeof(VDINTERFACEERROR);
+    mInterfaceErrorCallbacks.enmInterface = VDINTERFACETYPE_ERROR;
+    mInterfaceErrorCallbacks.pfnError     = VDError;
+    int vrc = VDInterfaceCreate(&mInterfaceError, "VMDK_IError", VDINTERFACETYPE_ERROR,
+                                &mInterfaceErrorCallbacks, this, NULL);
+    ComAssertRCRet (vrc, E_FAIL);
+
     /* initialize the container */
-    int vrc = VDCreate (VDError, this, &mContainer);
+    vrc = VDCreate (&mInterfaceError, &mContainer);
     ComAssertRCRet (vrc, E_FAIL);
 
@@ -4283 +4291 @@
     ComAssertRCRet (rc, E_FAIL);
 
+    /* Create supported error interface. */
+    mInterfaceErrorCallbacks.cbSize       = sizeof(VDINTERFACEERROR);
+    mInterfaceErrorCallbacks.enmInterface = VDINTERFACETYPE_ERROR;
+    mInterfaceErrorCallbacks.pfnError     = VDError;
+    int vrc = VDInterfaceCreate(&mInterfaceError, "Custom_IError", VDINTERFACETYPE_ERROR,
+                                &mInterfaceErrorCallbacks, this, NULL);
+    ComAssertRCRet (vrc, E_FAIL);
+
     return S_OK;
 }
@@ -4344 +4360 @@
 
         /* initialize the container */
-        vrc = VDCreate (VDError, this, &mContainer);
+        vrc = VDCreate (&mInterfaceError, &mContainer);
         if (VBOX_FAILURE (vrc))
         {
@@ -4447 +4463 @@
             RTStrFree (pszFormat);
 
-            /* Create the corresponding container. */
-            vrc = VDCreate (VDError, this, &mContainer);
+            /* initialize the container */
+            vrc = VDCreate (&mInterfaceError, &mContainer);
 
             /* the format has been already checked for presence at this point */
@@ -5111 +5127 @@
     mActualSize = 0;
 
+    /* Create supported error interface. */
+    mInterfaceErrorCallbacks.cbSize       = sizeof(VDINTERFACEERROR);
+    mInterfaceErrorCallbacks.enmInterface = VDINTERFACETYPE_ERROR;
+    mInterfaceErrorCallbacks.pfnError     = VDError;
+    int vrc = VDInterfaceCreate(&mInterfaceError, "VHD_IError", VDINTERFACETYPE_ERROR,
+                                &mInterfaceErrorCallbacks, this, NULL);
+    ComAssertRCRet (vrc, E_FAIL);
+
     /* initialize the container */
-    int vrc = VDCreate (VDError, this, &mContainer);
+    vrc = VDCreate (&mInterfaceError, &mContainer);
     ComAssertRCRet (vrc, E_FAIL);