diff options
author | Markus Armbruster <armbru@redhat.com> | 2011-09-06 18:58:38 +0200 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2011-09-12 15:17:20 +0200 |
commit | dd063333929f2e2a44dc900aa4f75f11dea7cb28 (patch) | |
tree | 495f1f7aee675d16f580c2f011d9f30b6e5f0e63 /hw/ide/atapi.c | |
parent | f0776564182c37362f070b84b5fc63c2a944df6e (diff) | |
download | qemu-dd063333929f2e2a44dc900aa4f75f11dea7cb28.zip qemu-dd063333929f2e2a44dc900aa4f75f11dea7cb28.tar.gz qemu-dd063333929f2e2a44dc900aa4f75f11dea7cb28.tar.bz2 |
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>
Diffstat (limited to 'hw/ide/atapi.c')
-rw-r--r-- | hw/ide/atapi.c | 6 |
1 files changed, 5 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) |