[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/10] atapi: Report correct errors on guest eject r
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 04/10] atapi: Report correct errors on guest eject request |
Date: |
Wed, 13 Apr 2011 14:05:10 +0200 |
From: Amit Shah <address@hidden>
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 <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
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
- [Qemu-devel] [PULL 00/10] Block patches, Kevin Wolf, 2011/04/13
- [Qemu-devel] [PATCH 01/10] docs: Describe zero data clusters in QED specification, Kevin Wolf, 2011/04/13
- [Qemu-devel] [PATCH 04/10] atapi: Report correct errors on guest eject request,
Kevin Wolf <=
- [Qemu-devel] [PATCH 03/10] atapi: Drives can be locked without media present, Kevin Wolf, 2011/04/13
- [Qemu-devel] [PATCH 05/10] atapi: Allow GET_EVENT_STATUS_NOTIFICATION after media change, Kevin Wolf, 2011/04/13
- [Qemu-devel] [PATCH 06/10] atapi: Move GET_EVENT_STATUS_NOTIFICATION command handling to its own function, Kevin Wolf, 2011/04/13
- [Qemu-devel] [PATCH 08/10] atapi: GESN: Standardise event response handling for future additions, Kevin Wolf, 2011/04/13
- [Qemu-devel] [PATCH 10/10] vpc.c: Use get_option_parameter() does the search, Kevin Wolf, 2011/04/13
- [Qemu-devel] [PATCH 07/10] atapi: GESN: Use structs for commonly-used field types, Kevin Wolf, 2011/04/13
- [Qemu-devel] [PATCH 02/10] qed: Add support for zero clusters, Kevin Wolf, 2011/04/13
- [Qemu-devel] [PATCH 09/10] atapi: GESN: implement 'media' subcommand, Kevin Wolf, 2011/04/13