[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 04/11] block: Accept node-name for blockdev-mirro
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v3 04/11] block: Accept node-name for blockdev-mirror |
Date: |
Thu, 7 Jul 2016 14:11:30 +0200 |
In order to remove the necessity to use BlockBackend names in the
external API, we want to allow node-names everywhere. This converts
blockdev-mirror to accept a node-name without lifting the restriction
that we're operating at a root node.
Signed-off-by: Kevin Wolf <address@hidden>
---
blockdev.c | 10 +---------
qapi/block-core.json | 3 ++-
qmp-commands.hx | 3 ++-
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index d9909d0..7e9c7a4 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3654,21 +3654,13 @@ void qmp_blockdev_mirror(const char *device, const char
*target,
Error **errp)
{
BlockDriverState *bs;
- BlockBackend *blk;
BlockDriverState *target_bs;
AioContext *aio_context;
BlockMirrorBackingMode backing_mode = MIRROR_LEAVE_BACKING_CHAIN;
Error *local_err = NULL;
- blk = blk_by_name(device);
- if (!blk) {
- error_setg(errp, "Device '%s' not found", device);
- return;
- }
- bs = blk_bs(blk);
-
+ bs = qmp_get_root_bs(device, errp);
if (!bs) {
- error_setg(errp, "Device '%s' has no media", device);
return;
}
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 98bbd49..a64b598 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1242,7 +1242,8 @@
#
# Start mirroring a block device's writes to a new destination.
#
-# @device: the name of the device whose writes should be mirrored.
+# @device: The device name or node-name of a root node whose writes should be
+# mirrored.
#
# @target: the id or node-name of the block device to mirror to. This mustn't
be
# attached to guest.
diff --git a/qmp-commands.hx b/qmp-commands.hx
index e24d573..45b445f 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -1735,7 +1735,8 @@ specifies the target of mirror operation.
Arguments:
-- "device": device name to operate on (json-string)
+- "device": The device name or node-name of a root node whose writes should be
+ mirrored (json-string)
- "target": device name to mirror to (json-string)
- "replaces": the block driver node name to replace when finished
(json-string, optional)
--
1.8.3.1
- [Qemu-devel] [PATCH v3 00/11] block: Accept node-name in all node level QMP commands, Kevin Wolf, 2016/07/07
- [Qemu-devel] [PATCH v3 01/11] block: Accept node-name for block-stream, Kevin Wolf, 2016/07/07
- [Qemu-devel] [PATCH v3 02/11] block: Accept node-name for block-commit, Kevin Wolf, 2016/07/07
- [Qemu-devel] [PATCH v3 03/11] block: Accept node-name for blockdev-backup, Kevin Wolf, 2016/07/07
- [Qemu-devel] [PATCH v3 04/11] block: Accept node-name for blockdev-mirror,
Kevin Wolf <=
- [Qemu-devel] [PATCH v3 05/11] block: Accept node-name for blockdev-snapshot-delete-internal-sync, Kevin Wolf, 2016/07/07
- [Qemu-devel] [PATCH v3 06/11] block: Accept node-name for blockdev-snapshot-internal-sync, Kevin Wolf, 2016/07/07
- [Qemu-devel] [PATCH v3 07/11] block: Accept node-name for change-backing-file, Kevin Wolf, 2016/07/07
- [Qemu-devel] [PATCH v3 09/11] block: Accept node-name for drive-mirror, Kevin Wolf, 2016/07/07
- [Qemu-devel] [PATCH v3 08/11] block: Accept node-name for drive-backup, Kevin Wolf, 2016/07/07
- [Qemu-devel] [PATCH v3 10/11] nbd-server: Use a separate BlockBackend, Kevin Wolf, 2016/07/07
- [Qemu-devel] [PATCH v3 11/11] nbd-server: Allow node name for nbd-server-add, Kevin Wolf, 2016/07/07