[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 09/40] blockdev: Implement eject with basic operat
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL v2 09/40] blockdev: Implement eject with basic operations |
Date: |
Tue, 10 Nov 2015 15:09:09 +0100 |
From: Max Reitz <address@hidden>
Implement 'eject' by calling blockdev-open-tray and
blockdev-remove-medium.
Signed-off-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
blockdev.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 0f2a7e2..1624297 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1980,16 +1980,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,
--
1.8.3.1
- [Qemu-devel] [PULL v2 00/40] Block layer patches, Kevin Wolf, 2015/11/10
- [Qemu-devel] [PULL v2 03/40] block: Make bdrv_states public, Kevin Wolf, 2015/11/10
- [Qemu-devel] [PULL v2 02/40] block: Add blk_remove_bs(), Kevin Wolf, 2015/11/10
- [Qemu-devel] [PULL v2 04/40] block: Add functions for inheriting a BBRS, Kevin Wolf, 2015/11/10
- [Qemu-devel] [PULL v2 01/40] block: Don't call blk_bs() twice in bdrv_lookup_bs(), Kevin Wolf, 2015/11/10
- [Qemu-devel] [PULL v2 05/40] blockdev: Add blockdev-open-tray, Kevin Wolf, 2015/11/10
- [Qemu-devel] [PULL v2 06/40] blockdev: Add blockdev-close-tray, Kevin Wolf, 2015/11/10
- [Qemu-devel] [PULL v2 09/40] blockdev: Implement eject with basic operations,
Kevin Wolf <=
- [Qemu-devel] [PULL v2 08/40] blockdev: Add blockdev-insert-medium, Kevin Wolf, 2015/11/10
- [Qemu-devel] [PULL v2 07/40] blockdev: Add blockdev-remove-medium, Kevin Wolf, 2015/11/10
- [Qemu-devel] [PULL v2 11/40] block: Inquire tray state before tray-moved events, Kevin Wolf, 2015/11/10
- [Qemu-devel] [PULL v2 12/40] qmp: Introduce blockdev-change-medium, Kevin Wolf, 2015/11/10
- [Qemu-devel] [PULL v2 10/40] blockdev: Implement change with basic operations, Kevin Wolf, 2015/11/10
- [Qemu-devel] [PULL v2 13/40] hmp: Use blockdev-change-medium for change command, Kevin Wolf, 2015/11/10
- [Qemu-devel] [PULL v2 15/40] hmp: Add read-only-mode option to change command, Kevin Wolf, 2015/11/10
- [Qemu-devel] [PULL v2 14/40] blockdev: read-only-mode for blockdev-change-medium, Kevin Wolf, 2015/11/10
- [Qemu-devel] [PULL v2 18/40] block: rename BlockdevSnapshot to BlockdevSnapshotSync, Kevin Wolf, 2015/11/10
- [Qemu-devel] [PULL v2 17/40] block: check for existing device IDs in external_snapshot_prepare(), Kevin Wolf, 2015/11/10