Changeset 67841 in vbox

Timestamp:

Jul 6, 2017 4:57:59 PM (8 years ago)

Author:

vboxsync

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

116778

Message:

Devices/Storage: Don't prevent VM startup with an empty host DVD drive when attached to the VM

Location:

trunk/src/VBox/Devices/Storage

Files:

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

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

@@ -343 +343 @@
 static DECLCALLBACK(uint32_t) drvHostBaseGetRegionCount(PPDMIMEDIA pInterface)
 {
-    RT_NOREF1(pInterface);
+    PDRVHOSTBASE pThis = RT_FROM_MEMBER(pInterface, DRVHOSTBASE, IMedia);
 
     LogFlowFunc(("\n"));
-    uint32_t cRegions = 1;
+    uint32_t cRegions = pThis->fMediaPresent ? 1 : 0;
 
     /* For now just return one region for all devices. */
@@ -364 +364 @@
     PDRVHOSTBASE pThis = RT_FROM_MEMBER(pInterface, DRVHOSTBASE, IMedia);
 
-    if (uRegion < 1)
+    if (uRegion < 1 && pThis->fMediaPresent)
     {
         uint64_t cbMedia;
@@ -414 +414 @@
         && u64LbaStart < cbMedia / cbBlock)
     {
-        rc = VERR_NOT_FOUND;
-
         if (puRegion)
             *puRegion = 0;

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

@@ -165 +165 @@
         int rc = vscsiLunMediumQueryRegionProperties(pVScsiLun, iTrack - 1, &uLbaStart,
                                                      NULL, NULL, &enmDataForm);
-        AssertRC(rc);
+        if (rc == VERR_NOT_FOUND || rc == VERR_MEDIA_NOT_PRESENT)
+             return vscsiLunReqSenseErrorSet(pVScsiLun, pVScsiReq, SCSI_SENSE_NOT_READY,
+                                             SCSI_ASC_MEDIUM_NOT_PRESENT, 0x00);
+        else
+            AssertRC(rc);
 
         *q++ = 0;                  /* reserved */
@@ -201 +205 @@
     int rc = vscsiLunMediumQueryRegionProperties(pVScsiLun, cTracks - 1, &uLbaStart,
                                                  &cBlocks, NULL, NULL);
-    AssertRC(rc);
+    if (rc == VERR_NOT_FOUND || rc == VERR_MEDIA_NOT_PRESENT)
+         return vscsiLunReqSenseErrorSet(pVScsiLun, pVScsiReq, SCSI_SENSE_NOT_READY,
+                                         SCSI_ASC_MEDIUM_NOT_PRESENT, 0x00);
+    else
+        AssertRC(rc);
 
     uLbaStart += cBlocks;
@@ -241 +249 @@
     int rc = vscsiLunMediumQueryRegionProperties(pVScsiLun, 0, NULL,
                                                  NULL, NULL, &enmDataForm);
-    AssertRC(rc);
+    if (rc == VERR_NOT_FOUND || rc == VERR_MEDIA_NOT_PRESENT)
+         return vscsiLunReqSenseErrorSet(pVScsiLun, pVScsiReq, SCSI_SENSE_NOT_READY,
+                                         SCSI_ASC_MEDIUM_NOT_PRESENT, 0x00);
+    else
+        AssertRC(rc);
 
     if (enmDataForm == VDREGIONDATAFORM_CDDA)
@@ -995 +1007 @@
 
     uint32_t cTracks = vscsiLunMediumGetRegionCount(pVScsiLun);
-    for (uint32_t i = 0; i < cTracks; i++)
-    {
-        uint64_t cBlocks = 0;
-        rc = vscsiLunMediumQueryRegionProperties(pVScsiLun, i, NULL, &cBlocks,
-                                                 NULL, NULL);
-        AssertRC(rc);
-
-        pVScsiLunMmc->cSectors += cBlocks;
+    if (cTracks)
+    {
+        for (uint32_t i = 0; i < cTracks; i++)
+        {
+            uint64_t cBlocks = 0;
+            rc = vscsiLunMediumQueryRegionProperties(pVScsiLun, i, NULL, &cBlocks,
+                                                     NULL, NULL);
+            AssertRC(rc);
+
+            pVScsiLunMmc->cSectors += cBlocks;
+        }
+
+        pVScsiLunMmc->Core.fMediaPresent = true;
+        pVScsiLunMmc->Core.fReady = false;
+    }
+    else
+    {
+        pVScsiLunMmc->Core.fMediaPresent = false;
+        pVScsiLunMmc->Core.fReady = false;
     }
 
@@ -1604 +1627 @@
             rc = vscsiLunMediumQueryRegionPropertiesForLba(pVScsiLun, uLbaStart,
                                                            NULL, NULL, NULL, &enmDataForm);
-            AssertRC(rc);
-            if (   enmDataForm != VDREGIONDATAFORM_MODE1_2048
-                && enmDataForm != VDREGIONDATAFORM_MODE1_2352
-                && enmDataForm != VDREGIONDATAFORM_MODE2_2336
-                && enmDataForm != VDREGIONDATAFORM_MODE2_2352
-                && enmDataForm != VDREGIONDATAFORM_RAW
-                && cbSector == _2K)
+            if (RT_FAILURE(rc))
+            {
+                rcReq = vscsiLunReqSenseErrorSet(pVScsiLun, pVScsiReq, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_LOGICAL_BLOCK_OOR, 0x00);
+                vscsiDeviceReqComplete(pVScsiLun->pVScsiDevice, pVScsiReq, rcReq, false, VINF_SUCCESS);
+            }
+            else if (   enmDataForm != VDREGIONDATAFORM_MODE1_2048
+                     && enmDataForm != VDREGIONDATAFORM_MODE1_2352
+                     && enmDataForm != VDREGIONDATAFORM_MODE2_2336
+                     && enmDataForm != VDREGIONDATAFORM_MODE2_2352
+                     && enmDataForm != VDREGIONDATAFORM_RAW
+                     && cbSector == _2K)
             {
                 rcReq = vscsiLunReqSenseErrorInfoSet(pVScsiLun, pVScsiReq,
@@ -1691 +1718 @@
     ASMAtomicWriteU32((volatile uint32_t *)&pVScsiLunMmc->MediaEventStatus, MMCEVENTSTATUSTYPE_MEDIA_REMOVED);
     ASMAtomicXchgU32(&pVScsiLunMmc->u32MediaTrackType, MMC_MEDIA_TYPE_NO_DISC);
+    pVScsiLunMmc->cSectors = 0;
     return VINF_SUCCESS;
 }