From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47340) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobBY-0000DH-Dn for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:08:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QobBV-00019s-JH for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:08:32 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:52265) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobBV-00019E-E3 for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:08:29 -0400 From: Markus Armbruster Date: Wed, 3 Aug 2011 15:07:53 +0200 Message-Id: <1312376904-16115-15-git-send-email-armbru@redhat.com> In-Reply-To: <1312376904-16115-1-git-send-email-armbru@redhat.com> References: <1312376904-16115-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 14/45] block: Drop tray status tracking, no longer used List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 Commit 4be9762a is now completely redone. Signed-off-by: Markus Armbruster --- block.c | 1 - block_int.h | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 257aec8..737cdc9 100644 --- a/block.c +++ b/block.c @@ -3027,7 +3027,6 @@ int bdrv_eject(BlockDriverState *bs, int eject_flag) if (drv && drv->bdrv_eject) { drv->bdrv_eject(bs, eject_flag); } - bs->tray_open = eject_flag; return 0; } diff --git a/block_int.h b/block_int.h index 215f008..e0824ce 100644 --- a/block_int.h +++ b/block_int.h @@ -156,7 +156,6 @@ struct BlockDriverState { int open_flags; /* flags used to open the file, re-used for re-open */ int removable; /* if true, the media can be removed */ int locked; /* if true, the media cannot temporarily be ejected */ - int tray_open; /* if true, the virtual tray is open */ int encrypted; /* if true, the media is encrypted */ int valid_key; /* if true, a valid encryption key has been set */ int sg; /* if true, the device is a /dev/sg* */ -- 1.7.6