From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35510) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZZp-0003lQ-2x for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QjZZi-0008R9-Hm for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:47 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:55528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZZd-0008Nc-Uc for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:38 -0400 From: Markus Armbruster Date: Wed, 20 Jul 2011 18:24:01 +0200 Message-Id: <1311179069-27882-28-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 27/55] scsi-disk: Switch from BlockDriverState's locked to own tray_locked 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 Signed-off-by: Markus Armbruster --- hw/scsi-disk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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 */ -- 1.7.2.3