Changeset 36316 in vbox

Timestamp:

Mar 18, 2011 5:27:47 PM (14 years ago)

Author:

vboxsync

Message:

Storage/DevATA+DevAHCI+ATAController: make assertion less strict, locked media and double unmount are harmless

Location:

trunk/src/VBox/Devices/Storage

Files:

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

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

@@ -2290 +2290 @@
                                              (PFNRT)s->pDrvMount->pfnUnmount, 3, s->pDrvMount,
                                              false /*=fForce*/, true /*=fEeject*/);
-                        AssertReleaseRC(rc);
+                        Assert(RT_SUCCESS(rc) || (rc == VERR_PDM_MEDIA_LOCKED) || (rc = VERR_PDM_MEDIA_NOT_MOUNTED));
                         {
                             STAM_PROFILE_START(&pCtl->StatLockWait, a);

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

@@ -4039 +4039 @@
                                                   (PFNRT)pAhciPort->pDrvMount->pfnUnmount, 3,
                                                   pAhciPort->pDrvMount, false/*=fForce*/, true/*=fEject*/);
-                            Assert(RT_SUCCESS(rc2) || (rc == VERR_PDM_MEDIA_LOCKED));
+                            Assert(RT_SUCCESS(rc2) || (rc2 == VERR_PDM_MEDIA_LOCKED) || (rc2 = VERR_PDM_MEDIA_NOT_MOUNTED));
                         }
                         break;

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

@@ -2984 +2984 @@
                                              (PFNRT)s->pDrvMount->pfnUnmount, 3,
                                              s->pDrvMount /*=fForce*/, true /*=fEject*/);
-                        Assert(RT_SUCCESS(rc) || (rc == VERR_PDM_MEDIA_LOCKED));
+                        Assert(RT_SUCCESS(rc) || (rc == VERR_PDM_MEDIA_LOCKED) || (rc = VERR_PDM_MEDIA_NOT_MOUNTED));
                         {
                             STAM_PROFILE_START(&pCtl->StatLockWait, a);