Changeset 2728 in vbox for trunk/src

Timestamp:

May 21, 2007 11:57:36 AM (18 years ago)

Author:

vboxsync

Message:

Allow (but punish with an assertion) creation of a HDD container without
error callback. Also fix typo (copied several times) that passed wrong
data to the backend, which didn't work correctly then.

File:

• trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp (modified) (9 diffs)

trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp

@@ -134 +134 @@
     va_list va;
     va_start(va, pszFormat);
-    pfnError(pvErrorUser, rc, RT_SRC_POS_ARGS, pszFormat, va);
+    if (pfnError)
+        pfnError(pvErrorUser, rc, RT_SRC_POS_ARGS, pszFormat, va);
     va_end(va);
     return rc;
@@ -147 +148 @@
     va_list va;
     va_start(va, pszFormat);
-    pDisk->pfnError(pDisk->pvErrorUser, rc, RT_SRC_POS_ARGS, pszFormat, va);
+    if (pDisk->pfnError)
+        pDisk->pfnError(pDisk->pvErrorUser, rc, RT_SRC_POS_ARGS, pszFormat, va);
     va_end(va);
     return rc;
@@ -469 +471 @@
     PVBOXHDDBACKEND pBackend = NULL;
     PVBOXHDD pDisk = NULL;
+
+    /* Passing an error callback is strictly not necessary any more. Any code
+     * calling the HDD container functions should provide one, as otherwise
+     * many detailed error messages will go unnoticed. If you find a situation
+     * where you get no sensible error message from this code but you think
+     * there should be one, shout loudly. There are no error messages for rare
+     * and obvious error codes such as VERR_NO_MEMORY, and for situations which
+     * the user cannot be made responsible for, such as program bugs causing
+     * parameter checks to fail etc. */
+    Assert(pfnError);
 
     /* Find backend. */
@@ -1617 +1629 @@
     int rc;
     if (pImage)
-        rc = pDisk->Backend->pfnGetUuid(pImage, pUuid);
+        rc = pDisk->Backend->pfnGetUuid(pImage->pvBackendData, pUuid);
     else
         rc = VERR_VDI_IMAGE_NOT_FOUND;
@@ -1646 +1658 @@
     int rc;
     if (pImage)
-        rc = pDisk->Backend->pfnSetUuid(pImage, pUuid);
+        rc = pDisk->Backend->pfnSetUuid(pImage->pvBackendData, pUuid);
     else
         rc = VERR_VDI_IMAGE_NOT_FOUND;
@@ -1673 +1685 @@
     int rc;
     if (pImage)
-        rc = pDisk->Backend->pfnGetModificationUuid(pImage, pUuid);
+        rc = pDisk->Backend->pfnGetModificationUuid(pImage->pvBackendData, pUuid);
     else
         rc = VERR_VDI_IMAGE_NOT_FOUND;
@@ -1702 +1714 @@
     int rc;
     if (pImage)
-        rc = pDisk->Backend->pfnSetModificationUuid(pImage, pUuid);
+        rc = pDisk->Backend->pfnSetModificationUuid(pImage->pvBackendData, pUuid);
     else
         rc = VERR_VDI_IMAGE_NOT_FOUND;
@@ -1730 +1742 @@
     int rc;
     if (pImage)
-        rc = pDisk->Backend->pfnGetParentUuid(pImage, pUuid);
+        rc = pDisk->Backend->pfnGetParentUuid(pImage->pvBackendData, pUuid);
     else
         rc = VERR_VDI_IMAGE_NOT_FOUND;
@@ -1759 +1771 @@
     int rc;
     if (pImage)
-        rc = pDisk->Backend->pfnSetParentUuid(pImage, pUuid);
+        rc = pDisk->Backend->pfnSetParentUuid(pImage->pvBackendData, pUuid);
     else
         rc = VERR_VDI_IMAGE_NOT_FOUND;