diff options
| author | Markus Armbruster | 2011-09-06 18:58:38 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2011-09-12 15:17:20 +0200 |
| commit | dd063333929f2e2a44dc900aa4f75f11dea7cb28 (patch) | |
| tree | 495f1f7aee675d16f580c2f011d9f30b6e5f0e63 | |
| parent | ide/atapi: Clean up misleading name in cmd_start_stop_unit() (diff) | |
| download | qemu-dd063333929f2e2a44dc900aa4f75f11dea7cb28.tar.gz qemu-dd063333929f2e2a44dc900aa4f75f11dea7cb28.tar.xz qemu-dd063333929f2e2a44dc900aa4f75f11dea7cb28.zip | |
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>
| -rw-r--r-- | hw/ide/atapi.c | 6 | ||||
| -rw-r--r-- | 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 cb0cdac42e..713b1fd1e5 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 111785294d..8a9052ea53 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; |