[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 11/27] scsi-disk: Track tray locked state
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 11/27] scsi-disk: Track tray locked state |
Date: |
Tue, 6 Sep 2011 18:58:44 +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/scsi-disk.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index f35ada4..e7358e3 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -73,6 +73,7 @@ struct SCSIDiskState
char *version;
char *serial;
bool tray_open;
+ bool tray_locked;
};
static int scsi_handle_rw_error(SCSIDiskReq *r, int error, int type);
@@ -671,7 +672,7 @@ static int mode_sense_page(SCSIDiskState *s, int page,
uint8_t **p_outbuf,
p[5] = 0xff; /* CD DA, DA accurate, RW supported,
RW corrected, C2 errors, ISRC,
UPC, Bar code */
- p[6] = 0x2d | (bdrv_is_locked(s->bs)? 2 : 0);
+ p[6] = 0x2d | (s->tray_locked ? 2 : 0);
/* Locking supported, jumper present, eject, tray */
p[7] = 0; /* no volume & mute control, no
changer */
@@ -882,6 +883,7 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r,
uint8_t *outbuf)
scsi_disk_emulate_start_stop(r);
break;
case ALLOW_MEDIUM_REMOVAL:
+ s->tray_locked = req->cmd.buf[4] & 1;
bdrv_set_locked(s->bs, req->cmd.buf[4] & 1);
break;
case READ_CAPACITY_10:
--
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, 2011/09/06
- [Qemu-devel] [PATCH v3 11/27] scsi-disk: Track tray locked state,
Markus Armbruster <=
- [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
- [Qemu-devel] [PATCH v3 02/27] ide: Use a table to declare which drive kinds accept each command, Markus Armbruster, 2011/09/06