From patchwork Wed Aug 3 13:07:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 108171 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6A7A7B6FF5 for ; Wed, 3 Aug 2011 23:09:46 +1000 (EST) Received: from localhost ([::1]:46431 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobCX-0002ZF-Px for incoming@patchwork.ozlabs.org; Wed, 03 Aug 2011 09:09:33 -0400 Received: from eggs.gnu.org ([140.186.70.92]:47392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobBa-0000EV-Gy for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:08:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QobBV-00019P-HC for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:08:34 -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-9y for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:08:29 -0400 Received: from blackfin.pond.sub.org (p5B32D904.dip.t-dialin.net [91.50.217.4]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 264AEA2C90; Wed, 3 Aug 2011 15:08:27 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 0AFF460056; Wed, 3 Aug 2011 15:08:24 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 3 Aug 2011 15:07:51 +0200 Message-Id: <1312376904-16115-13-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1312376904-16115-1-git-send-email-armbru@redhat.com> References: <1312376904-16115-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 78.46.104.156 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 Subject: [Qemu-devel] [PATCH v2 12/45] scsi-disk: Track tray open/close state X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Acked-by: Hannes Reinecke --- 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 d549cb7..2d5e157 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -72,6 +72,7 @@ struct SCSIDiskState char *version; char *serial; SCSISense sense; + bool tray_open; }; static int scsi_handle_rw_error(SCSIDiskReq *r, int error, int type); @@ -829,6 +830,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; } }