[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 10/27] ide/atapi: Track tray locked state
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 10/27] ide/atapi: Track tray locked state |
Date: |
Tue, 6 Sep 2011 18:58:43 +0200 |
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 <address@hidden>
---
hw/ide/atapi.c | 4 +++-
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 0943f66..d9db6de 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 8a9052e..663db39 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;
--
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 <=
- [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, 2011/09/06
- [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