[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/2] atapi: Report correct errors on guest eject req
From: |
Amit Shah |
Subject: |
[Qemu-devel] [PATCH 2/2] atapi: Report correct errors on guest eject request |
Date: |
Sat, 9 Apr 2011 15:54:39 +0530 |
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>
---
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 8958ff2..b8b78bb 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -1464,7 +1464,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;
@@ -1477,7 +1477,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.4.2