提交 81b1008d 编写于 作者: M Markus Armbruster 提交者: Kevin Wolf

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: NMarkus Armbruster <armbru@redhat.com>
Signed-off-by: NKevin Wolf <kwolf@redhat.com>
上级 a0a7573b
...@@ -73,6 +73,7 @@ struct SCSIDiskState ...@@ -73,6 +73,7 @@ struct SCSIDiskState
char *version; char *version;
char *serial; char *serial;
bool tray_open; bool tray_open;
bool tray_locked;
}; };
static int scsi_handle_rw_error(SCSIDiskReq *r, int error, int type); 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, ...@@ -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, p[5] = 0xff; /* CD DA, DA accurate, RW supported,
RW corrected, C2 errors, ISRC, RW corrected, C2 errors, ISRC,
UPC, Bar code */ 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 */ /* Locking supported, jumper present, eject, tray */
p[7] = 0; /* no volume & mute control, no p[7] = 0; /* no volume & mute control, no
changer */ changer */
...@@ -882,6 +883,7 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r, uint8_t *outbuf) ...@@ -882,6 +883,7 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r, uint8_t *outbuf)
scsi_disk_emulate_start_stop(r); scsi_disk_emulate_start_stop(r);
break; break;
case ALLOW_MEDIUM_REMOVAL: case ALLOW_MEDIUM_REMOVAL:
s->tray_locked = req->cmd.buf[4] & 1;
bdrv_set_locked(s->bs, req->cmd.buf[4] & 1); bdrv_set_locked(s->bs, req->cmd.buf[4] & 1);
break; break;
case READ_CAPACITY_10: case READ_CAPACITY_10:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册