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 <[email protected]> --- 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
