Changeset 64152 in vbox

Timestamp:

Oct 5, 2016 12:05:35 PM (8 years ago)

Author:

vboxsync

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

111128

Message:

DrvSCSI,VSCSI: Fix detection of new media, need to recalculate the number of sectors when the medium has changed

Location:

trunk/src/VBox/Devices/Storage

Files:

• DrvSCSI.cpp (modified) (3 diffs)
• VSCSI/VSCSILunMmc.cpp (modified) (6 diffs)

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

@@ -1242 +1242 @@
     if (pThis->pDrvMount)
     {
-        if (pThis->pDrvMedia->pfnGetSize(pThis->pDrvMedia))
+        if (pThis->pDrvMount->pfnIsMounted(pThis->pDrvMount))
         {
             rc = VINF_SUCCESS; VSCSILunMountNotify(pThis->hVScsiLun);
@@ -1274 +1274 @@
     pThis->pDrvMediaEx = NULL;
     pThis->pDrvMount = NULL;
+
+    VSCSILunUnmountNotify(pThis->hVScsiLun);
 }
 
@@ -1492 +1494 @@
     if (pThis->pDrvMount)
     {
-        if (pThis->pDrvMedia->pfnGetSize(pThis->pDrvMedia))
+        if (pThis->pDrvMount->pfnIsMounted(pThis->pDrvMount))
         {
             rc = VINF_SUCCESS; VSCSILunMountNotify(pThis->hVScsiLun);

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

@@ -747 +747 @@
     RT_ZERO(aReply);
 
+    LogFlowFunc(("pVScsiLunMmc=%#p pVScsiReq=%#p cbMaxTransfer=%zu\n",
+                 pVScsiLunMmc, pVScsiReq, cbMaxTransfer));
+
     do
     {
@@ -763 +766 @@
                 aReply[6] = 0x00;
                 aReply[7] = 0x00;
+                pVScsiLunMmc->Core.fReady = true;
                 break;
 
@@ -800 +804 @@
                 break;
         }
+
+        LogFlowFunc(("OldStatus=%u NewStatus=%u\n", OldStatus, NewStatus));
+
     } while (!ASMAtomicCmpXchgU32((volatile uint32_t *)&pVScsiLunMmc->MediaEventStatus, NewStatus, OldStatus));
 
@@ -838 +845 @@
     unsigned        uCmd = pVScsiReq->pbCDB[0];
 
+    LogFlowFunc(("pVScsiLun=%#p{.fReady=%RTbool, .fMediaPresent=%RTbool} pVScsiReq=%#p{.pbCdb[0]=%#x}\n",
+                 pVScsiLun, pVScsiLun->fReady, pVScsiLun->fMediaPresent, pVScsiReq, uCmd));
+
     /*
      * GET CONFIGURATION, GET EVENT/STATUS NOTIFICATION, INQUIRY, and REQUEST SENSE commands
@@ -843 +853 @@
      * needs to report CHECK CONDITION in that case.
      */
-    if (!pVScsiLunMmc->Core.fReady && uCmd != SCSI_INQUIRY)
+    if (   !pVScsiLunMmc->Core.fReady
+        && uCmd != SCSI_INQUIRY
+        && uCmd != SCSI_GET_CONFIGURATION
+        && uCmd != SCSI_GET_EVENT_STATUS_NOTIFICATION)
     {
         /*
@@ -1260 +1273 @@
 {
     PVSCSILUNMMC pVScsiLunMmc = (PVSCSILUNMMC)pVScsiLun;
-
-    uint32_t OldStatus, NewStatus;
-    do
-    {
-        OldStatus = ASMAtomicReadU32((volatile uint32_t *)&pVScsiLunMmc->MediaEventStatus);
-        switch (OldStatus)
+    uint64_t cbDisk = 0;
+    int rc = vscsiLunMediumGetSize(pVScsiLun, &cbDisk);
+    if (RT_SUCCESS(rc))
+    {
+        pVScsiLunMmc->cSectors = cbDisk / pVScsiLunMmc->cbSector;
+
+        uint32_t OldStatus, NewStatus;
+        do
         {
-            case MMCEVENTSTATUSTYPE_MEDIA_CHANGED:
-            case MMCEVENTSTATUSTYPE_MEDIA_REMOVED:
-                /* no change, we will send "medium removed" + "medium inserted" */
-                NewStatus = MMCEVENTSTATUSTYPE_MEDIA_CHANGED;
-                break;
-            default:
-                NewStatus = MMCEVENTSTATUSTYPE_MEDIA_NEW;
-                break;
-        }
-    } while (!ASMAtomicCmpXchgU32((volatile uint32_t *)&pVScsiLunMmc->MediaEventStatus,
-                                  NewStatus, OldStatus));
-
-    ASMAtomicXchgU32(&pVScsiLunMmc->u32MediaTrackType, MMC_MEDIA_TYPE_UNKNOWN);
-    return VINF_SUCCESS;
+            OldStatus = ASMAtomicReadU32((volatile uint32_t *)&pVScsiLunMmc->MediaEventStatus);
+            switch (OldStatus)
+            {
+                case MMCEVENTSTATUSTYPE_MEDIA_CHANGED:
+                case MMCEVENTSTATUSTYPE_MEDIA_REMOVED:
+                    /* no change, we will send "medium removed" + "medium inserted" */
+                    NewStatus = MMCEVENTSTATUSTYPE_MEDIA_CHANGED;
+                    break;
+                default:
+                    NewStatus = MMCEVENTSTATUSTYPE_MEDIA_NEW;
+                    break;
+            }
+        } while (!ASMAtomicCmpXchgU32((volatile uint32_t *)&pVScsiLunMmc->MediaEventStatus,
+                                      NewStatus, OldStatus));
+
+        ASMAtomicXchgU32(&pVScsiLunMmc->u32MediaTrackType, MMC_MEDIA_TYPE_UNKNOWN);
+    }
+
+    return rc;
 }