From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobBb-0000Jd-PY for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:08:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QobBV-0001AN-RD for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:08:35 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:52258) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobBV-000192-MV for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:08:29 -0400 From: Markus Armbruster Date: Wed, 3 Aug 2011 15:07:54 +0200 Message-Id: <1312376904-16115-16-git-send-email-armbru@redhat.com> In-Reply-To: <1312376904-16115-1-git-send-email-armbru@redhat.com> References: <1312376904-16115-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 15/45] ide/atapi: 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, stefano.stabellini@eu.citrix.com, lcapitulino@redhat.com, hare@suse.de, amit.shah@redhat.com, hch@lst.de 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/ide/atapi.c | 4 +++- hw/ide/internal.h | 1 + 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 08e1a7a..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; @@ -820,6 +821,7 @@ static void cmd_test_unit_ready(IDEState *s, uint8_t *buf) static void cmd_prevent_allow_medium_removal(IDEState *s, uint8_t* buf) { + s->tray_locked = buf[4] & 1; bdrv_set_locked(s->bs, buf[4] & 1); ide_atapi_cmd_ok(s); } diff --git a/hw/ide/internal.h b/hw/ide/internal.h index cd8e977..3e56b45 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -443,6 +443,7 @@ struct IDEState { uint8_t sense_key; uint8_t asc; bool tray_open; + bool tray_locked; uint8_t cdrom_changed; int packet_transfer_size; int elementary_transfer_size; -- 1.7.6