[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/35] ide/atapi: Track tray open/close state
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 06/35] ide/atapi: Track tray open/close state |
Date: |
Mon, 12 Sep 2011 16:19:05 +0200 |
From: Markus Armbruster <address@hidden>
We already track it in BlockDriverState since commit 4be9762a. As
discussed in that commit's message, we should track it in the device
device models instead, because it's device state.
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
hw/ide/atapi.c | 6 +++++-
hw/ide/internal.h | 1 +
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index cb0cdac..713b1fd 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -521,7 +521,7 @@ static unsigned int event_status_media(IDEState *s,
uint8_t event_code, media_status;
media_status = 0;
- if (s->bs->tray_open) {
+ if (s->tray_open) {
media_status = MS_TRAY_OPEN;
} else if (bdrv_is_inserted(s->bs)) {
media_status = MS_MEDIA_PRESENT;
@@ -926,6 +926,10 @@ static void cmd_start_stop_unit(IDEState *s, uint8_t* buf)
ide_atapi_cmd_error(s, SENSE_NOT_READY, ASC_MEDIUM_NOT_PRESENT);
break;
}
+
+ if (loej && !err) {
+ s->tray_open = !start;
+ }
}
static void cmd_mechanism_status(IDEState *s, uint8_t* buf)
diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index 1117852..8a9052e 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -442,6 +442,7 @@ struct IDEState {
struct unreported_events events;
uint8_t sense_key;
uint8_t asc;
+ bool tray_open;
uint8_t cdrom_changed;
int packet_transfer_size;
int elementary_transfer_size;
--
1.7.6
- [Qemu-devel] [PULL 00/35] Block patches, Kevin Wolf, 2011/09/12
- [Qemu-devel] [PATCH 06/35] ide/atapi: Track tray open/close state,
Kevin Wolf <=
- [Qemu-devel] [PATCH 04/35] ide: Reject ATA commands specific to drive kinds, Kevin Wolf, 2011/09/12
- [Qemu-devel] [PATCH 01/35] qcow2: removed unused depends_on field, Kevin Wolf, 2011/09/12
- [Qemu-devel] [PATCH 03/35] ide: Use a table to declare which drive kinds accept each command, Kevin Wolf, 2011/09/12
- [Qemu-devel] [PATCH 05/35] ide/atapi: Clean up misleading name in cmd_start_stop_unit(), Kevin Wolf, 2011/09/12
- [Qemu-devel] [PATCH 02/35] ide: Fix ATA command READ to set ATAPI signature for CD-ROM, Kevin Wolf, 2011/09/12
- [Qemu-devel] [PATCH 07/35] scsi-disk: Factor out scsi_disk_emulate_start_stop(), Kevin Wolf, 2011/09/12
- [Qemu-devel] [PATCH 08/35] scsi-disk: Track tray open/close state, Kevin Wolf, 2011/09/12
- [Qemu-devel] [PATCH 11/35] ide/atapi: Track tray locked state, Kevin Wolf, 2011/09/12
- [Qemu-devel] [PATCH 10/35] block: Drop tray status tracking, no longer used, Kevin Wolf, 2011/09/12
- [Qemu-devel] [PATCH 09/35] block: Revert entanglement of bdrv_is_inserted() with tray status, Kevin Wolf, 2011/09/12