diff options
Diffstat (limited to 'src/VBox/Devices/Storage/ATAController.cpp')
| -rw-r--r-- | src/VBox/Devices/Storage/ATAController.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/VBox/Devices/Storage/ATAController.cpp b/src/VBox/Devices/Storage/ATAController.cpp index 2855cd882..854276edc 100644 --- a/src/VBox/Devices/Storage/ATAController.cpp +++ b/src/VBox/Devices/Storage/ATAController.cpp @@ -1648,9 +1648,11 @@ static bool atapiGetConfigurationSS(AHCIATADevState *s) memset(pbBuf, '\0', 32); ataH2BE_U32(pbBuf, 16); /** @todo implement switching between CD-ROM and DVD-ROM profile (the only - * way to differentiate them right now is based on the image size). Also - * implement signalling "no current profile" if no medium is loaded. */ - ataH2BE_U16(pbBuf + 6, 0x08); /* current profile: read-only CD */ + * way to differentiate them right now is based on the image size). */ + if (s->cTotalSectors) + ataH2BE_U16(pbBuf + 6, 0x08); /* current profile: read-only CD */ + else + ataH2BE_U16(pbBuf + 6, 0x00); /* current profile: none -> no media */ ataH2BE_U16(pbBuf + 8, 0); /* feature 0: list of profiles supported */ pbBuf[10] = (0 << 2) | (1 << 1) | (1 || 0); /* version 0, persistent, current */ @@ -2289,7 +2291,7 @@ static void atapiParseCmdVirtualATAPI(AHCIATADevState *s) rc = VMR3ReqCallWait(PDMDevHlpGetVM(pDevIns), VMCPUID_ANY, (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); PDMCritSectEnter(&pCtl->lock, VINF_SUCCESS); |