From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:39978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZhI-00060H-EP for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QjZhF-0001Nr-EO for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:31 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:39238) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZhD-0001LZ-5b for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:27 -0400 From: Markus Armbruster Date: Wed, 20 Jul 2011 18:23:59 +0200 Message-Id: <1311179069-27882-26-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 25/55] ide/atapi: 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/ide/atapi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 8634e6b..237657f 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -777,8 +777,9 @@ static void cmd_mode_sense(IDEState *s, uint8_t *buf) buf[12] = 0x71; buf[13] = 3 << 5; buf[14] = (1 << 0) | (1 << 3) | (1 << 5); - if (bdrv_is_locked(s->bs)) + if (s->tray_locked) { buf[6] |= 1 << 1; + } buf[15] = 0x00; cpu_to_ube16(&buf[16], 706); buf[18] = 0; -- 1.7.2.3