From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZZi-0003jG-HW for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QjZZb-0008NL-9A for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:38 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:55485) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZZa-0008Mw-V5 for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:35 -0400 From: Markus Armbruster Date: Wed, 20 Jul 2011 18:23:35 +0200 Message-Id: <1311179069-27882-2-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 01/55] blockdev: Make eject fail for non-removable drives even with -f 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 Ejecting hard disk platters can only end in tears. If you need to revoke access to an image, use drive_del, not eject -f. Signed-off-by: Markus Armbruster --- blockdev.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/blockdev.c b/blockdev.c index a97a801..fcab8da 100644 --- a/blockdev.c +++ b/blockdev.c @@ -646,16 +646,13 @@ out: static int eject_device(Monitor *mon, BlockDriverState *bs, int force) { - if (!force) { - if (!bdrv_is_removable(bs)) { - qerror_report(QERR_DEVICE_NOT_REMOVABLE, - bdrv_get_device_name(bs)); - return -1; - } - if (bdrv_is_locked(bs)) { - qerror_report(QERR_DEVICE_LOCKED, bdrv_get_device_name(bs)); - return -1; - } + if (!bdrv_is_removable(bs)) { + qerror_report(QERR_DEVICE_NOT_REMOVABLE, bdrv_get_device_name(bs)); + return -1; + } + if (!force && bdrv_is_locked(bs)) { + qerror_report(QERR_DEVICE_LOCKED, bdrv_get_device_name(bs)); + return -1; } bdrv_close(bs); return 0; -- 1.7.2.3