From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R37Jq-0001Pe-J9 for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:17:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R37Jp-00076f-Ef for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:17:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56668) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R37Jp-00076W-79 for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:17:05 -0400 From: Kevin Wolf Date: Mon, 12 Sep 2011 16:19:18 +0200 Message-Id: <1315837174-15327-20-git-send-email-kwolf@redhat.com> In-Reply-To: <1315837174-15327-1-git-send-email-kwolf@redhat.com> References: <1315837174-15327-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 19/35] ide/atapi: Don't fail eject when tray is already open List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster 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 Signed-off-by: Kevin Wolf --- 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 06778f3..3f909c3 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); -- 1.7.6