[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 05/27] ide/atapi: Track tray open/close state
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 05/27] ide/atapi: Track tray open/close state |
Date: |
Tue, 6 Sep 2011 18:58:38 +0200 |
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>
---
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] [PATCH v3 00/27] Block layer cleanup & fixes, Markus Armbruster, 2011/09/06
- [Qemu-devel] [PATCH v3 04/27] ide/atapi: Clean up misleading name in cmd_start_stop_unit(), Markus Armbruster, 2011/09/06
- [Qemu-devel] [PATCH v3 03/27] ide: Reject ATA commands specific to drive kinds, Markus Armbruster, 2011/09/06
- [Qemu-devel] [PATCH v3 10/27] ide/atapi: Track tray locked state, Markus Armbruster, 2011/09/06
- [Qemu-devel] [PATCH v3 11/27] scsi-disk: Track tray locked state, Markus Armbruster, 2011/09/06
- [Qemu-devel] [PATCH v3 09/27] block: Drop tray status tracking, no longer used, Markus Armbruster, 2011/09/06
- [Qemu-devel] [PATCH v3 05/27] ide/atapi: Track tray open/close state,
Markus Armbruster <=
- [Qemu-devel] [PATCH v3 22/27] hw: Trim superfluous #include "block_int.h", Markus Armbruster, 2011/09/06
- [Qemu-devel] [PATCH v3 21/27] block: Move BlockConf & friends from block_int.h to block.h, Markus Armbruster, 2011/09/06
- [Qemu-devel] [PATCH v3 17/27] ide/atapi: Preserve tray state on migration, Markus Armbruster, 2011/09/06
- [Qemu-devel] [PATCH v3 02/27] ide: Use a table to declare which drive kinds accept each command, Markus Armbruster, 2011/09/06
- [Qemu-devel] [PATCH v3 16/27] scsi-disk: Fix START_STOP to fail when it can't eject, Markus Armbruster, 2011/09/06