diff options
| author | Markus Armbruster | 2011-09-06 18:58:43 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2011-09-12 15:17:20 +0200 |
| commit | a0a7573b846ae9b346a34f10c4fe4e317b9eebfd (patch) | |
| tree | 0de6ee5cb1c4b7f5913f41a7c3776736b89012af | |
| parent | block: Drop tray status tracking, no longer used (diff) | |
| download | qemu-a0a7573b846ae9b346a34f10c4fe4e317b9eebfd.tar.gz qemu-a0a7573b846ae9b346a34f10c4fe4e317b9eebfd.tar.xz qemu-a0a7573b846ae9b346a34f10c4fe4e317b9eebfd.zip | |
ide/atapi: Track tray locked state
We already track it in BlockDriverState. Just like tray open/close
state, we should track it in the 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 | 4 | ||||
| -rw-r--r-- | hw/ide/internal.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 0943f66fba..d9db6de3d6 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -788,8 +788,9 @@ static void cmd_mode_sense(IDEState *s, uint8_t *buf) buf[12] = 0x71; buf[13] = 3 << 5; buf[14] = (1 << 0) | (1 << 3) | (1 << 5); - if (bdrv_is_locked(s->bs)) + if (s->tray_locked) { buf[6] |= 1 << 1; + } buf[15] = 0x00; cpu_to_ube16(&buf[16], 706); buf[18] = 0; @@ -831,6 +832,7 @@ static void cmd_test_unit_ready(IDEState *s, uint8_t *buf) static void cmd_prevent_allow_medium_removal(IDEState *s, uint8_t* buf) { + s->tray_locked = buf[4] & 1; bdrv_set_locked(s->bs, buf[4] & 1); ide_atapi_cmd_ok(s); } diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 8a9052ea53..663db39697 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -443,6 +443,7 @@ struct IDEState { uint8_t sense_key; uint8_t asc; bool tray_open; + bool tray_locked; uint8_t cdrom_changed; int packet_transfer_size; int elementary_transfer_size; |