From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZZq-0003mA-UJ for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QjZZi-0008RJ-Rj for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:50 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:55529) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZZd-0008Nj-R8 for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:37 -0400 From: Markus Armbruster Date: Wed, 20 Jul 2011 18:24:00 +0200 Message-Id: <1311179069-27882-27-git-send-email-armbru@redhat.com> In-Reply-To: <1311179069-27882-1-git-send-email-armbru@redhat.com> References: <1311179069-27882-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 26/55] scsi-disk: Track tray locked state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, quintela@redhat.com, dbaryshkov@gmail.com, stefano.stabellini@eu.citrix.com, lcapitulino@redhat.com, amit.shah@redhat.com 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 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index ff52d87..a220426 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -75,6 +75,7 @@ struct SCSIDiskState char *serial; SCSISense sense; bool tray_open; + bool tray_locked; SCSIDriveKind drive_kind; }; @@ -893,6 +894,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: -- 1.7.2.3