[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 15/45] ide/atapi: Track tray locked state
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 15/45] ide/atapi: Track tray locked state |
Date: |
Wed, 3 Aug 2011 15:07:54 +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 08e1a7a..237657f 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -777,8 +777,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;
@@ -820,6 +821,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 cd8e977..3e56b45 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 v2 12/45] scsi-disk: Track tray open/close state, (continued)
- [Qemu-devel] [PATCH v2 12/45] scsi-disk: Track tray open/close state, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 06/45] ide: Fix ATA command READ to set ATAPI signature for CD-ROM, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 04/45] ide: Update command code definitions as per ACS-2 Table B.2, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 07/45] ide: Use a table to declare which drive kinds accept each command, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 03/45] block: Split change_cb() into change_media_cb(), resize_cb(), Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 01/45] block: Attach non-qdev devices as well, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 13/45] block: Revert entanglement of bdrv_is_inserted() with tray status, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 15/45] ide/atapi: Track tray locked state,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 11/45] scsi-disk: Factor out scsi_disk_emulate_start_stop(), Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 05/45] ide: Clean up case label indentation in ide_exec_cmd(), Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 09/45] ide/atapi: Clean up misleading name in cmd_start_stop_unit(), Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 10/45] ide/atapi: Track tray open/close state, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 24/45] scsi-disk: Avoid physical/virtual tray state mismatch, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 33/45] xen: Clean up pci_piix3_xen_ide_unplug()'s test for "not a CD", Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 21/45] ide/atapi: Don't fail eject when tray is already open, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 25/45] ide: Give vmstate structs internal linkage where possible, Markus Armbruster, 2011/08/03