Changeset 47829 in vbox for trunk/src/VBox/Devices/Storage/VSCSI

Timestamp:

Aug 18, 2013 12:30:02 PM (12 years ago)

Author:

vboxsync

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

88090

Message:

Devices/Storage: Preparations for non 512 byte sector sizes. Add a new getter in the block and media interfaces and remove uses of 512 constants and use the reported sector size from the underlying medium

Location:

trunk/src/VBox/Devices/Storage/VSCSI

Files:

• VSCSIInternal.h (modified) (1 diff)
• VSCSILunSbc.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h

@@ -364 +364 @@
 
 /**
+ * Wrapper for the get medium sector size I/O callback.
+ *
+ * @returns VBox status code.
+ * @param   pVScsiLun     The LUN.
+ * @param   pcbSectorSize Where to store the sector size on success.
+ */
+DECLINLINE(int) vscsiLunMediumGetSectorSize(PVSCSILUNINT pVScsiLun, uint32_t *pcbSectorSize)
+{
+    return pVScsiLun->pVScsiLunIoCallbacks->pfnVScsiLunMediumGetSectorSize(pVScsiLun,
+                                                                           pVScsiLun->pvVScsiLunUser,
+                                                                           pcbSectorSize);
+}
+
+/**
  * Wrapper for the get medium lock/unlock I/O callback.
  *

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp

@@ -33 +33 @@
 
 /** Maximum of amount of LBAs to unmap with one command. */
-#define VSCSI_UNMAP_LBAS_MAX ((10*_1M) / 512)
+#define VSCSI_UNMAP_LBAS_MAX(a_cbSector) ((10*_1M) / a_cbSector)
 
 /**
@@ -42 +42 @@
     /** Core LUN structure */
     VSCSILUNINT    Core;
+    /** Sector size of the medium. */
+    uint32_t       cbSector;
     /** Size of the virtual disk. */
     uint64_t       cSectors;
@@ -57 +59 @@
     int cVpdPages = 0;
 
-    rc = vscsiLunMediumGetSize(pVScsiLun, &cbDisk);
+    rc = vscsiLunMediumGetSectorSize(pVScsiLun, &pVScsiLunSbc->cbSector);
     if (RT_SUCCESS(rc))
-        pVScsiLunSbc->cSectors = cbDisk / 512; /* Fixed sector size */
+    {
+        rc = vscsiLunMediumGetSize(pVScsiLun, &cbDisk);
+        if (RT_SUCCESS(rc))
+            pVScsiLunSbc->cSectors = cbDisk / pVScsiLunSbc->cbSector;
+    }
 
     if (RT_SUCCESS(rc))
@@ -100 +106 @@
                 pBlkPage->u32OptTrfLength              = 0;
                 pBlkPage->u32MaxPreXdTrfLength         = 0;
-                pBlkPage->u32MaxUnmapLbaCount          = RT_H2BE_U32(VSCSI_UNMAP_LBAS_MAX);
+                pBlkPage->u32MaxUnmapLbaCount          = RT_H2BE_U32(VSCSI_UNMAP_LBAS_MAX(pVScsiLunSbc->cbSector));
                 pBlkPage->u32MaxUnmapBlkDescCount      = UINT32_C(0xffffffff);
                 pBlkPage->u32OptUnmapGranularity       = 0;
@@ -246 +252 @@
             else
                 vscsiH2BEU32(aReply, pVScsiLunSbc->cSectors - 1);
-            vscsiH2BEU32(&aReply[4], 512);
+            vscsiH2BEU32(&aReply[4], pVScsiLunSbc->cbSector);
             RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, aReply, sizeof(aReply));
             rcReq = vscsiLunReqSenseOkSet(pVScsiLun, pVScsiReq);