Changeset 49195 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Oct 19, 2013 6:07:58 PM (12 years ago)

Author:

vboxsync

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

90072

Message:

Storage/AHCI: Fix detection of CD/DVD media when switching from an empty to a host drive

File:

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

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

@@ -3827 +3827 @@
  * Sets the given media track type.
  */
-static uint32_t ataMediumTypeSet(PAHCIPort pAhciPort, uint32_t MediaTrackType)
+static uint32_t ahciMediumTypeSet(PAHCIPort pAhciPort, uint32_t MediaTrackType)
 {
     return ASMAtomicXchgU32(&pAhciPort->MediaTrackType, MediaTrackType);
@@ -7242 +7242 @@
             pAhciPort->cNotifiedMediaChange = 2;
         ahciMediumInserted(pAhciPort);
-        ataMediumTypeSet(pAhciPort, ATA_MEDIA_TYPE_UNKNOWN);
+        ahciMediumTypeSet(pAhciPort, ATA_MEDIA_TYPE_UNKNOWN);
     }
     else
@@ -7269 +7269 @@
         pAhciPort->cNotifiedMediaChange = 4;
         ahciMediumRemoved(pAhciPort);
-        ataMediumTypeSet(pAhciPort, ATA_MEDIA_TYPE_UNKNOWN);
+        ahciMediumTypeSet(pAhciPort, ATA_MEDIA_TYPE_UNKNOWN);
     }
     else
@@ -7674 +7674 @@
     rc = PDMDevHlpDriverAttach(pDevIns, pAhciPort->iLUN, &pAhciPort->IBase, &pAhciPort->pDrvBase, NULL);
     if (RT_SUCCESS(rc))
+    {
         rc = ahciR3ConfigureLUN(pDevIns, pAhciPort);
+
+        /*
+         * In case there is a medium inserted.
+         */
+        ahciMediumInserted(pAhciPort);
+        ahciMediumTypeSet(pAhciPort, ATA_MEDIA_TYPE_UNKNOWN);
+    }
     else
         AssertMsgFailed(("Failed to attach LUN#%d. rc=%Rrc\n", pAhciPort->iLUN, rc));