From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53159) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9yml-0002rl-Ee for qemu-devel@nongnu.org; Wed, 13 Apr 2011 08:03:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q9ymf-0003hj-Mi for qemu-devel@nongnu.org; Wed, 13 Apr 2011 08:03:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34420) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9ymf-0003hY-EP for qemu-devel@nongnu.org; Wed, 13 Apr 2011 08:02:57 -0400 From: Kevin Wolf Date: Wed, 13 Apr 2011 14:05:10 +0200 Message-Id: <1302696316-26190-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1302696316-26190-1-git-send-email-kwolf@redhat.com> References: <1302696316-26190-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 04/10] atapi: Report correct errors on guest eject request 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: Amit Shah 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 Signed-off-by: Kevin Wolf --- hw/ide/core.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index a290142..b5de22e 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1304,7 +1304,7 @@ static void ide_atapi_cmd(IDEState *s) break; case GPCMD_START_STOP_UNIT: { - int start, eject, err = 0; + int start, eject, sense, err = 0; start = packet[4] & 1; eject = (packet[4] >> 1) & 1; @@ -1317,7 +1317,11 @@ static void ide_atapi_cmd(IDEState *s) ide_atapi_cmd_ok(s); break; 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); break; default: -- 1.7.2.3