[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 30/38] blockdev: Implement eject with basic opera
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v4 30/38] blockdev: Implement eject with basic operations |
Date: |
Mon, 20 Jul 2015 19:45:57 +0200 |
Implement 'eject' by calling blockdev-open-tray and
blockdev-remove-medium.
Signed-off-by: Max Reitz <address@hidden>
---
blockdev.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index a80d0e2..0a4a761 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1952,16 +1952,15 @@ out:
void qmp_eject(const char *device, bool has_force, bool force, Error **errp)
{
- BlockBackend *blk;
+ Error *local_err = NULL;
- blk = blk_by_name(device);
- if (!blk) {
- error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
- "Device '%s' not found", device);
+ qmp_blockdev_open_tray(device, has_force, force, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
return;
}
- eject_device(blk, force, errp);
+ qmp_blockdev_remove_medium(device, errp);
}
void qmp_block_passwd(bool has_device, const char *device,
--
2.4.6
- [Qemu-block] [PATCH v4 24/38] blockdev: Allow more options for BB-less BDS tree, (continued)
- [Qemu-block] [PATCH v4 24/38] blockdev: Allow more options for BB-less BDS tree, Max Reitz, 2015/07/20
- [Qemu-block] [PATCH v4 25/38] block: Add blk_remove_bs(), Max Reitz, 2015/07/20
- [Qemu-block] [PATCH v4 27/38] blockdev: Add blockdev-close-tray, Max Reitz, 2015/07/20
- [Qemu-block] [PATCH v4 26/38] blockdev: Add blockdev-open-tray, Max Reitz, 2015/07/20
- [Qemu-block] [PATCH v4 28/38] blockdev: Add blockdev-remove-medium, Max Reitz, 2015/07/20
- [Qemu-block] [PATCH v4 29/38] blockdev: Add blockdev-insert-medium, Max Reitz, 2015/07/20
- [Qemu-block] [PATCH v4 33/38] qmp: Introduce blockdev-change-medium, Max Reitz, 2015/07/20
- [Qemu-block] [PATCH v4 35/38] blockdev: read-only-mode for blockdev-change-medium, Max Reitz, 2015/07/20
- [Qemu-block] [PATCH v4 37/38] iotests: More options for VM.add_drive(), Max Reitz, 2015/07/20
- [Qemu-block] [PATCH v4 34/38] hmp: Use blockdev-change-medium for change command, Max Reitz, 2015/07/20
- [Qemu-block] [PATCH v4 30/38] blockdev: Implement eject with basic operations,
Max Reitz <=
- [Qemu-block] [PATCH v4 32/38] block: Inquire tray state before tray-moved events, Max Reitz, 2015/07/20
- [Qemu-block] [PATCH v4 19/38] block: Prepare remaining BB functions for NULL BDS, Max Reitz, 2015/07/20
- [Qemu-block] [PATCH v4 36/38] hmp: Add read-only-mode option to change command, Max Reitz, 2015/07/20
- [Qemu-block] [PATCH v4 31/38] blockdev: Implement change with basic operations, Max Reitz, 2015/07/20
- [Qemu-block] [PATCH v4 38/38] iotests: Add test for change-related QMP commands, Max Reitz, 2015/07/20