From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:59295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1CCa-0002Dl-VE for qemu-devel@nongnu.org; Wed, 07 Sep 2011 03:05:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R1CCa-0003Hn-22 for qemu-devel@nongnu.org; Wed, 07 Sep 2011 03:05:40 -0400 Received: from mail-vx0-f173.google.com ([209.85.220.173]:56384) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1CCZ-0003Hh-Rq for qemu-devel@nongnu.org; Wed, 07 Sep 2011 03:05:40 -0400 Received: by vxi32 with SMTP id 32so542604vxi.4 for ; Wed, 07 Sep 2011 00:05:39 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <4E6717BF.8010102@redhat.com> Date: Wed, 07 Sep 2011 09:05:35 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1315328340-6192-1-git-send-email-armbru@redhat.com> <1315328340-6192-12-git-send-email-armbru@redhat.com> In-Reply-To: <1315328340-6192-12-git-send-email-armbru@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 11/27] scsi-disk: Track tray locked state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: kwolf@redhat.com, stefano.stabellini@eu.citrix.com, qemu-devel@nongnu.org, lcapitulino@redhat.com, hare@suse.de, amit.shah@redhat.com, hch@lst.de On 09/06/2011 06:58 PM, Markus Armbruster wrote: > 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 > --- > 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: Reviewed-by: Paolo Bonzini