From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R37Jg-0000u6-Ge for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:17:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R37Je-0006rl-RK for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:16:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5890) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R37Je-0006qx-89 for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:16:54 -0400 From: Kevin Wolf Date: Mon, 12 Sep 2011 16:19:10 +0200 Message-Id: <1315837174-15327-12-git-send-email-kwolf@redhat.com> In-Reply-To: <1315837174-15327-1-git-send-email-kwolf@redhat.com> References: <1315837174-15327-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 11/35] ide/atapi: Track tray locked state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster 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 Signed-off-by: Kevin Wolf --- 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 0943f66..d9db6de 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -788,8 +788,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; @@ -831,6 +832,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 8a9052e..663db39 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