From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZZl-0003kH-Bs for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QjZZe-0008PV-Vr for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:44 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:55545) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZZc-0008O9-RH for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:37 -0400 From: Markus Armbruster Date: Wed, 20 Jul 2011 18:23:50 +0200 Message-Id: <1311179069-27882-17-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 16/55] ide/atapi: Track tray open/close 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 since commit 4be9762a. As discussed in that commit's message, we should track it in the device 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, 5 insertions(+), 0 deletions(-) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 17fbef8..fee567b 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -915,6 +915,10 @@ static void cmd_start_stop_unit(IDEState *s, uint8_t* buf) ide_atapi_cmd_error(s, SENSE_NOT_READY, ASC_MEDIUM_NOT_PRESENT); break; } + + if (loej && !err) { + s->tray_open = !start; + } } static void cmd_mechanism_status(IDEState *s, uint8_t* buf) diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 1f807d4..5cf95c0 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -440,6 +440,7 @@ struct IDEState { struct unreported_events events; uint8_t sense_key; uint8_t asc; + bool tray_open; uint8_t cdrom_changed; int packet_transfer_size; int elementary_transfer_size; -- 1.7.2.3