Changeset 39566 in vbox

Timestamp:

Dec 9, 2011 1:27:31 PM (13 years ago)

Author:

vboxsync

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

75320

Message:

SCSI: Add support for readonly disks

Location:

trunk

Files:

• include/VBox/scsi.h (modified) (1 diff)
• include/VBox/vscsi.h (modified) (1 diff)
• src/VBox/Devices/Storage/DrvSCSI.cpp (modified) (4 diffs)
• src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp (modified) (2 diffs)

trunk/include/VBox/scsi.h

@@ -185 +185 @@
 #define SCSI_ASC_LOGICAL_BLOCK_OOR                          0x21
 #define SCSI_ASC_INV_FIELD_IN_CMD_PACKET                    0x24
+#define SCSI_ASC_WRITE_PROTECTED                            0x27
 #define SCSI_ASC_MEDIUM_MAY_HAVE_CHANGED                    0x28
 #define SCSI_ASC_MEDIUM_NOT_PRESENT                         0x3a

trunk/include/VBox/vscsi.h

@@ -99 +99 @@
 /** The LUN has a non rotational medium. */
 #define VSCSI_LUN_FEATURE_NON_ROTATIONAL RT_BIT(1)
+/** The medium of the LUN is readonly. */
+#define VSCSI_LUN_FEATURE_READONLY       RT_BIT(2)
 
 /**

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

@@ -107 +107 @@
     /** Mark the drive as having a non-rotational medium (i.e. as a SSD). */
     bool                    fNonRotational;
+    /** Medium is readonly */
+    bool                    fReadonly;
 } DRVSCSI, *PDRVSCSI;
 
@@ -422 +424 @@
         *pfFeatures |= VSCSI_LUN_FEATURE_NON_ROTATIONAL;
 
+    if (pThis->fReadonly)
+        *pfFeatures |= VSCSI_LUN_FEATURE_READONLY;
+
     return VINF_SUCCESS;
 }
@@ -825 +830 @@
      * Validate and read configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "NonRotationalMedium\0"))
+    if (!CFGMR3AreValuesValid(pCfg, "NonRotationalMedium\0Readonly\0"))
         return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
                                 N_("SCSI configuration error: unknown option specified"));
@@ -833 +838 @@
         return PDMDRV_SET_ERROR(pDrvIns, rc,
                     N_("SCSI configuration error: failed to read \"NonRotationalMedium\" as boolean"));
+
+    rc = CFGMR3QueryBoolDef(pCfg, "Readonly", &pThis->fReadonly, false);
+    if (RT_FAILURE(rc))
+        return PDMDRV_SET_ERROR(pDrvIns, rc,
+                                N_("SCSI configuration error: failed to read \"Readonly\" as boolean"));
 
     /*

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

@@ -260 +260 @@
             aReply[3] = 0; /* Block descriptor length. */
 
+            if (pVScsiLun->fFeatures & VSCSI_LUN_FEATURE_READONLY)
+                aReply[2] |= RT_BIT(7); /* Set write protect bit */
+
             pu8ReplyPos = aReply + 4;
 
@@ -509 +512 @@
         {
             /* Enqueue new I/O request */
-            rc = vscsiIoReqTransferEnqueue(pVScsiLun, pVScsiReq, enmTxDir,
-                                           uLbaStart * 512, cSectorTransfer * 512);
+            if (   (   enmTxDir == VSCSIIOREQTXDIR_WRITE
+                    || enmTxDir == VSCSIIOREQTXDIR_FLUSH)
+                && (pVScsiLun->fFeatures & VSCSI_LUN_FEATURE_READONLY))
+                rcReq = vscsiLunReqSenseErrorSet(pVScsiLun, pVScsiReq, SCSI_SENSE_DATA_PROTECT, SCSI_ASC_WRITE_PROTECTED, 0x00);
+            else
+                rc = vscsiIoReqTransferEnqueue(pVScsiLun, pVScsiReq, enmTxDir,
+                                               uLbaStart * 512, cSectorTransfer * 512);
         }
     }