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

Timestamp:

Dec 12, 2008 1:50:32 PM (16 years ago)

Author:

vboxsync

Message:

Storage: Eradicated the last bits using the old VDI only backend, keeping only the testcases for now (no longer built).

Completely removed old iSCSI driver.

Added intnet option to addiscsidisk and adjusted documentation.

Made backend name comparisons case-insensitive.

Detect VMDK files not according to VMDK 1.0 and reject with clear error message.

Changed format probing logic to not fall through to the "unsupported" case if it's a known format, i.e. has valid header.

VBoxManage converthd generic format converter made official.

Added format flag to VBoxManage createhd, allows creating VMDK files.

VBoxManage convertdd reimplemented based on new framework, supporting any image format.

VBoxManage internalcommands sethduuid reimplemented based on new framework, supporting any image format.

Cleaned up error codes.

File:

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

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

@@ -552 +552 @@
     PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
     int rc = VDSetPCHSGeometry(pThis->pDisk, VD_LAST_IMAGE, pPCHSGeometry);
-    if (rc == VERR_VDI_GEOMETRY_NOT_SET)
+    if (rc == VERR_VD_GEOMETRY_NOT_SET)
         rc = VERR_PDM_GEOMETRY_NOT_SET;
     LogFlow(("%s: returns %Rrc\n", __FUNCTION__, rc));
@@ -583 +583 @@
     PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
     int rc = VDSetLCHSGeometry(pThis->pDisk, VD_LAST_IMAGE, pLCHSGeometry);
-    if (rc == VERR_VDI_GEOMETRY_NOT_SET)
+    if (rc == VERR_VD_GEOMETRY_NOT_SET)
         rc = VERR_PDM_GEOMETRY_NOT_SET;
     LogFlow(("%s: returns %Rrc\n", __FUNCTION__, rc));
@@ -635 +635 @@
     PVBOXDISK pThis = PDMITRANSPORTASYNCPORT_2_VBOXDISK(pInterface);
     PDRVVDASYNCTASK pDrvVDAsyncTask = (PDRVVDASYNCTASK)pvUser;
-    int rc = VINF_VDI_ASYNC_IO_FINISHED;
+    int rc = VINF_VD_ASYNC_IO_FINISHED;
 
     /* Having a completion callback for a task is not mandatory. */
@@ -642 +642 @@
 
     /* Check if the request is finished. */
-    if (rc == VINF_VDI_ASYNC_IO_FINISHED)
+    if (rc == VINF_VD_ASYNC_IO_FINISHED)
     {
         rc = pThis->pDrvMediaAsyncPort->pfnTransferCompleteNotify(pThis->pDrvMediaAsyncPort, pDrvVDAsyncTask->pvUserCaller);
     }
-    else if (rc == VERR_VDI_ASYNC_IO_IN_PROGRESS)
+    else if (rc == VERR_VD_ASYNC_IO_IN_PROGRESS)
         rc = VINF_SUCCESS;