david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

atapi: Report correct errors on guest eject request

Browse Source 
Table 629 of the MMC-5 spec mentions two different error conditions when
a CDROM eject is requested: a) while a disc is inserted and b) while a
disc is not inserted.

Ensure we return the appropriate error for the present condition of the
drive and disc status.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Amit Shah 2011-04-09 15:54:39 +05:30 committed by Kevin Wolf
parent 8aa71917f7
commit 88f2bb58ef
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/ide/core.c
View File

@ -1304,7 +1304,7 @@ static void ide_atapi_cmd(IDEState *s)
break; break;
case GPCMD_START_STOP_UNIT: case GPCMD_START_STOP_UNIT:
{ {
int start, eject, err = 0; int start, eject, sense, err = 0;
start = packet[4] & 1; start = packet[4] & 1;
eject = (packet[4] >> 1) & 1; eject = (packet[4] >> 1) & 1;
@ -1317,7 +1317,11 @@ static void ide_atapi_cmd(IDEState *s)
ide_atapi_cmd_ok(s); ide_atapi_cmd_ok(s);
break; break;
case -EBUSY: case -EBUSY:
ide_atapi_cmd_error(s, SENSE_NOT_READY, sense = SENSE_NOT_READY;
if (bdrv_is_inserted(s->bs)) {
sense = SENSE_ILLEGAL_REQUEST;
}
ide_atapi_cmd_error(s, sense,
ASC_MEDIA_REMOVAL_PREVENTED); ASC_MEDIA_REMOVAL_PREVENTED);
break; break;
default: default: