diff mbox

[27/55] scsi-disk: Switch from BlockDriverState's locked to own tray_locked

Message ID 1311179069-27882-28-git-send-email-armbru@redhat.com
State New
Headers show

Commit Message

Markus Armbruster July 20, 2011, 4:24 p.m. UTC 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/scsi-disk.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Christoph Hellwig July 26, 2011, 12:14 p.m. UTC | #1 
On Wed, Jul 20, 2011 at 06:24:01PM +0200, Markus Armbruster wrote:
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>


Looks good, although I would have merged it into the previous one.


Reviewed-by: Christoph Hellwig <hch@lst.de>
Markus Armbruster July 26, 2011, 1:38 p.m. UTC | #2 
Christoph Hellwig <hch@lst.de> writes:

> On Wed, Jul 20, 2011 at 06:24:01PM +0200, Markus Armbruster wrote:
>> 
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>
>
> Looks good, although I would have merged it into the previous one.

I'll consider squashing when I respin.
diff mbox

Patch

diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index a220426..aac63b6 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -676,7 +676,7 @@  static int mode_sense_page(SCSIRequest *req, int page, uint8_t *p,
         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 */