diff options
| author | Markus Armbruster | 2011-09-06 18:58:44 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2011-09-12 15:17:20 +0200 |
| commit | 81b1008d50829fdcbe79aa67fa1113bb00a787d6 (patch) | |
| tree | 121f72f462c6d261cc13486f443ebbc20c904b6a /hw/scsi-disk.c | |
| parent | ide/atapi: Track tray locked state (diff) | |
| download | qemu-81b1008d50829fdcbe79aa67fa1113bb00a787d6.tar.gz qemu-81b1008d50829fdcbe79aa67fa1113bb00a787d6.tar.xz qemu-81b1008d50829fdcbe79aa67fa1113bb00a787d6.zip | |
scsi-disk: 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>
Diffstat (limited to 'hw/scsi-disk.c')
| -rw-r--r-- | 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 f35ada4a3f..e7358e3c4d 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: |