OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ide/atapi: Track tray open/close state 

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 <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster 2011-09-06 18:58:38 +02:00 committed by Kevin Wolf
parent f077656418
commit dd06333392
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/ide/atapi.c
View File

@ -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)

1
hw/ide/internal.h
View File

@ -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;