From patchwork Tue Sep 6 16:58:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 113615 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 AF1CBB6F6F for ; Wed, 7 Sep 2011 02:59:36 +1000 (EST) Received: from localhost ([::1]:34255 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0yzl-00064t-Lu for incoming@patchwork.ozlabs.org; Tue, 06 Sep 2011 12:59:33 -0400 Received: from eggs.gnu.org ([140.186.70.92]:38061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0yzN-0005bu-HH for qemu-devel@nongnu.org; Tue, 06 Sep 2011 12:59:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0yzK-0004Yu-H3 for qemu-devel@nongnu.org; Tue, 06 Sep 2011 12:59:09 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:55980) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0yzK-0004YW-51 for qemu-devel@nongnu.org; Tue, 06 Sep 2011 12:59:06 -0400 Received: from blackfin.pond.sub.org (p5B32C9A8.dip.t-dialin.net [91.50.201.168]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 5A47BA2C87; Tue, 6 Sep 2011 18:59:04 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 1042260072; Tue, 6 Sep 2011 18:59:01 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 6 Sep 2011 18:58:42 +0200 Message-Id: <1315328340-6192-10-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1315328340-6192-1-git-send-email-armbru@redhat.com> References: <1315328340-6192-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, stefano.stabellini@eu.citrix.com, lcapitulino@redhat.com, hare@suse.de, amit.shah@redhat.com, pbonzini@redhat.com, hch@lst.de Subject: [Qemu-devel] [PATCH v3 09/27] block: Drop tray status tracking, no longer used 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 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 6fe8add..8c86251 100644 --- a/block.c +++ b/block.c @@ -3062,7 +3062,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 5dc0074..b63c57b 100644 --- a/block_int.h +++ b/block_int.h @@ -157,7 +157,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* */