From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38384) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R37Jg-0000s5-2l for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:16:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R37Jb-0006mU-AL for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:16:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7788) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R37Ja-0006jr-Jh for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:16:51 -0400 From: Kevin Wolf Date: Mon, 12 Sep 2011 16:19:07 +0200 Message-Id: <1315837174-15327-9-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 08/35] scsi-disk: Track tray open/close 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 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 Signed-off-by: Kevin Wolf --- hw/scsi-disk.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index c8ad2e7..f18ddd7 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -72,6 +72,7 @@ struct SCSIDiskState QEMUBH *bh; char *version; char *serial; + bool tray_open; }; static int scsi_handle_rw_error(SCSIDiskReq *r, int error, int type); @@ -823,6 +824,7 @@ static void scsi_disk_emulate_start_stop(SCSIDiskReq *r) if (s->qdev.type == TYPE_ROM && loej) { bdrv_eject(s->bs, !start); + s->tray_open = !start; } } -- 1.7.6