diff options
| author | Markus Armbruster <armbru@redhat.com> | 2011-09-06 18:58:48 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-09-12 15:17:21 +0200 |
| commit | 48f65b3f52fdaf8fdae331248236e8b487de2b3b (patch) | |
| tree | e99ed15d2ce3d4ae240074d2d24d50527a20695e | |
| parent | eb93d5d9906cfa9fb6c3039a310d796dddfddeea (diff) | |
| download | focaccia-qemu-48f65b3f52fdaf8fdae331248236e8b487de2b3b.tar.gz focaccia-qemu-48f65b3f52fdaf8fdae331248236e8b487de2b3b.zip | |
ide/atapi: Don't fail eject when tray is already open
MMC-5 6.40.2.6 specifies that START STOP UNIT succeeds when the drive already has the requested state. cmd_start_stop_unit() fails when asked to eject while the tray is open and locked. Fix that. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | hw/ide/atapi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 06778f3bca..3f909c3a99 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -910,7 +910,7 @@ static void cmd_start_stop_unit(IDEState *s, uint8_t* buf) bool loej = buf[4] & 2; /* load on start, eject on !start */ if (loej) { - if (!start && s->tray_locked) { + if (!start && !s->tray_open && s->tray_locked) { sense = bdrv_is_inserted(s->bs) ? SENSE_NOT_READY : SENSE_ILLEGAL_REQUEST; ide_atapi_cmd_error(s, sense, ASC_MEDIA_REMOVAL_PREVENTED); |