From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZZq-0003ls-44 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-0008S1-Rx for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:49 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:55527) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZZd-0008Ne-JS for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:38 -0400 From: Markus Armbruster Date: Wed, 20 Jul 2011 18:23:51 +0200 Message-Id: <1311179069-27882-18-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 17/55] ide/atapi: Switch from BlockDriverState's tray_open to own 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 Signed-off-by: Markus Armbruster --- hw/ide/atapi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index fee567b..96f7c31 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -510,7 +510,7 @@ static unsigned int event_status_media(IDEState *s, uint8_t event_code, media_status; media_status = 0; - if (s->bs->tray_open) { + if (s->tray_open) { media_status = MS_TRAY_OPEN; } else if (bdrv_is_inserted(s->bs)) { media_status = MS_MEDIA_PRESENT; -- 1.7.2.3