Changeset 23149 in vbox for trunk/src

Timestamp:

Sep 18, 2009 10:31:42 PM (15 years ago)

Author:

vboxsync

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

52563

Message:

ATA,AHCI: Assertion is to is strict. VERR_PDM_MEDIA_LOCKED is expected if the pfnUnmount is called while the medium is still locked. Will be handled by the device emulation correctly

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevAHCI.cpp (modified) (1 diff)
• DevATA.cpp (modified) (1 diff)

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

@@ -3662 +3662 @@
                             rc = VMR3ReqCallWait(PDMDevHlpGetVM(pDevIns), VMCPUID_ANY,
                                                  (PFNRT)pAhciPort->pDrvMount->pfnUnmount, 2, pAhciPort->pDrvMount, false);
-                            AssertReleaseRC(rc);
+                            Assert(RT_SUCCESS(rc) || (rc == VERR_PDM_MEDIA_LOCKED));
                         }
                         break;

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

@@ -2893 +2893 @@
                         rc = VMR3ReqCallWait(PDMDevHlpGetVM(pDevIns), VMCPUID_ANY,
                                              (PFNRT)s->pDrvMount->pfnUnmount, 2, s->pDrvMount, false);
-                        AssertReleaseRC(rc);
+                        Assert(RT_SUCCESS(rc) || (rc == VERR_PDM_MEDIA_LOCKED));
                         {
                             STAM_PROFILE_START(&pCtl->StatLockWait, a);