From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZZu-0003nz-1k for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QjZZi-0008Qz-Eq for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:53 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:55526) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZZd-0008NV-MH for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:38 -0400 From: Markus Armbruster Date: Wed, 20 Jul 2011 18:23:58 +0200 Message-Id: <1311179069-27882-25-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 24/55] 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, 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/ide/atapi.c | 1 + hw/ide/internal.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 08e1a7a..8634e6b 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -820,6 +820,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 5cf95c0..12f80de 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -441,6 +441,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.2.3