[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 30/38] blockdev: Implement eject with basic opera
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v3 30/38] blockdev: Implement eject with basic operations |
Date: |
Wed, 3 Jun 2015 21:44:11 +0200 |
Implement 'eject' by calling blockdev-open-tray and
blockdev-remove-medium.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
blockdev.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 1aea565..2fc201c 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1928,15 +1928,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, QERR_DEVICE_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.1
- Re: [Qemu-devel] [PATCH v3 21/38] block: Prepare for NULL BDS, (continued)
- [Qemu-devel] [PATCH v3 22/38] blockdev: Do not create BDS for empty drive, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 24/38] blockdev: Allow more options for BB-less BDS tree, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 23/38] blockdev: Pull out blockdev option extraction, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 26/38] blockdev: Add blockdev-open-tray, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 25/38] block: Add blk_remove_bs(), Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 28/38] blockdev: Add blockdev-remove-medium, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 29/38] blockdev: Add blockdev-insert-medium, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 27/38] blockdev: Add blockdev-close-tray, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 30/38] blockdev: Implement eject with basic operations,
Max Reitz <=
- [Qemu-devel] [PATCH v3 31/38] blockdev: Implement change with basic operations, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 32/38] block: Inquire tray state before tray-moved events, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 34/38] hmp: Use blockdev-change-medium for change command, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 33/38] qmp: Introduce blockdev-change-medium, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 35/38] blockdev: read-only-mode for blockdev-change-medium, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 37/38] iotests: More options for VM.add_drive(), Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 36/38] hmp: Add read-only-mode option to change command, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 38/38] iotests: Add test for change-related QMP commands, Max Reitz, 2015/06/03