[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/29] blockdev: Make eject fail for non-removable d
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 01/29] blockdev: Make eject fail for non-removable drives even with -f |
Date: |
Wed, 3 Aug 2011 16:13:56 +0200 |
From: Markus Armbruster <address@hidden>
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 <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
blockdev.c | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 0b8d3a4..a25367a 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.6
- [Qemu-devel] [PULL 00/29] Block patches, Kevin Wolf, 2011/08/03
- [Qemu-devel] [PATCH 01/29] blockdev: Make eject fail for non-removable drives even with -f,
Kevin Wolf <=
- [Qemu-devel] [PATCH 02/29] block: Reset device model callbacks on detach, Kevin Wolf, 2011/08/03
- [Qemu-devel] [PATCH 04/29] block: Make BlockDriver method bdrv_set_locked() return void, Kevin Wolf, 2011/08/03
- [Qemu-devel] [PATCH 03/29] block/raw-win32: Drop disabled code for removable host devices, Kevin Wolf, 2011/08/03
- [Qemu-devel] [PATCH 05/29] block: Make BlockDriver method bdrv_eject() return void, Kevin Wolf, 2011/08/03
- [Qemu-devel] [PATCH 06/29] block: Don't let locked flag prevent medium load, Kevin Wolf, 2011/08/03
- [Qemu-devel] [PATCH 07/29] block/vpc.c: Detect too-large vpc file, Kevin Wolf, 2011/08/03
- [Qemu-devel] [PATCH 09/29] scsi: Remove references to SET_WINDOW, Kevin Wolf, 2011/08/03
- [Qemu-devel] [PATCH 12/29] scsi-disk: Remove 'drive_kind', Kevin Wolf, 2011/08/03
- [Qemu-devel] [PATCH 11/29] scsi: Sanitize command definitions, Kevin Wolf, 2011/08/03
- [Qemu-devel] [PATCH 08/29] scsi-disk: Codingstyle fixes, Kevin Wolf, 2011/08/03