[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 28/38] blockdev: Add blockdev-remove-medium
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v3 28/38] blockdev: Add blockdev-remove-medium |
Date: |
Wed, 3 Jun 2015 21:44:09 +0200 |
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
blockdev.c | 25 +++++++++++++++++++++++++
qapi/block-core.json | 15 +++++++++++++++
qmp-commands.hx | 45 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 85 insertions(+)
diff --git a/blockdev.c b/blockdev.c
index 1678b7f..7673b61 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2106,6 +2106,31 @@ void qmp_blockdev_close_tray(const char *device, Error
**errp)
blk_dev_change_media_cb(blk, true);
}
+void qmp_blockdev_remove_medium(const char *device, Error **errp)
+{
+ BlockBackend *blk;
+
+ blk = blk_by_name(device);
+ if (!blk) {
+ error_set(errp, QERR_DEVICE_NOT_FOUND, device);
+ return;
+ }
+
+ if (!blk_dev_has_removable_media(blk)) {
+ error_setg(errp, "Device '%s' is not removable", device);
+ return;
+ }
+
+ if (!blk_dev_is_tray_open(blk)) {
+ error_setg(errp, "Tray of device '%s' is not open", device);
+ return;
+ }
+
+ if (blk_bs(blk)) {
+ blk_remove_bs(blk);
+ }
+}
+
/* throttling disk I/O limits */
void qmp_block_set_io_throttle(const char *device, int64_t bps, int64_t bps_rd,
int64_t bps_wr,
diff --git a/qapi/block-core.json b/qapi/block-core.json
index ac661e9..1224200 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1875,6 +1875,21 @@
{ 'command': 'blockdev-close-tray',
'data': { 'device': 'str' } }
+##
+# @blockdev-remove-medium:
+#
+# Removes a medium (a block driver state tree) from a block device. That block
+# device's tray must currently be open.
+#
+# If the tray is open and there is no medium inserted, this will be a no-op.
+#
+# @device: block device name
+#
+# Since: 2.3
+##
+{ 'command': 'blockdev-remove-medium',
+ 'data': { 'device': 'str' } }
+
##
# @BlockErrorAction
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 5bb0179..7335f61 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -3941,6 +3941,51 @@ Example:
EQMP
{
+ .name = "blockdev-remove-medium",
+ .args_type = "device:s",
+ .mhandler.cmd_new = qmp_marshal_input_blockdev_remove_medium,
+ },
+
+SQMP
+blockdev-remove-medium
+----------------------
+
+Removes a medium (a block driver state tree) from a block device. That block
+device's tray must currently be open.
+
+If the tray is open and there is no medium inserted, this will be a no-op.
+
+Arguments:
+
+- "device": block device name (json-string)
+
+Example:
+
+-> { "execute": "blockdev-remove-medium",
+ "arguments": { "device": "ide1-cd0" } }
+
+<- { "error": { "class": "GenericError",
+ "desc": "Tray of device 'ide1-cd0' is not open" } }
+
+-> { "execute": "blockdev-open-tray",
+ "arguments": { "device": "ide1-cd0" } }
+
+<- { "timestamp": { "seconds": 1418751627,
+ "microseconds": 549958 },
+ "event": "DEVICE_TRAY_MOVED",
+ "data": { "device": "ide1-cd0",
+ "tray-open": true } }
+
+<- { "return": {} }
+
+-> { "execute": "blockdev-remove-medium",
+ "arguments": { "device": "ide1-cd0" } }
+
+<- { "return": {} }
+
+EQMP
+
+ {
.name = "query-named-block-nodes",
.args_type = "",
.mhandler.cmd_new = qmp_marshal_input_query_named_block_nodes,
--
2.4.1
- [Qemu-devel] [PATCH v3 20/38] block: Add blk_insert_bs(), (continued)
- [Qemu-devel] [PATCH v3 20/38] block: Add blk_insert_bs(), Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 19/38] block: Prepare remaining BB functions for NULL BDS, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 21/38] block: Prepare for NULL BDS, Max Reitz, 2015/06/03
- [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 <=
- [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, 2015/06/03
- [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