aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberto Garcia <berto@igalia.com>2016-11-04 15:44:43 +0200
committerKevin Wolf <kwolf@redhat.com>2016-11-11 15:54:55 +0100
commit11d6fbe05fd67610a7735e5350e4299f93bf7655 (patch)
treeb8ca74f964c0884280400fcf1acb21e6d6207efb
parent9a80832abff65044a18405f4eb22c94eba341ff6 (diff)
hmp: Make block_stream set an explicit job ID
A job ID is always required in order to create a block job on a non-root node. The default ID (obtained with bdrv_get_device_name()) is otherwise empty in this scenario and the job cannot be created. The HMP block_stream command doesn't set a job ID and therefore it doesn't allow streaming to intermediate nodes. One solution is to add an extra parameter to set a job ID. The other solution is to simply use the node name passed to block_stream as job ID. This won't work if it's automatically generated (because it contains a '#') but is otherwise simple enough for all other cases. This way 'block_stream node3' will create a job with the ID 'node3' and the good old 'block_stream virtio0' will keep the previous behaviour and use 'virtio0' for the job ID. Signed-off-by: Alberto Garcia <berto@igalia.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--hmp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hmp.c b/hmp.c
index b5e3f54534..819166d423 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1570,7 +1570,7 @@ void hmp_block_stream(Monitor *mon, const QDict *qdict)
const char *base = qdict_get_try_str(qdict, "base");
int64_t speed = qdict_get_try_int(qdict, "speed", 0);
- qmp_block_stream(false, NULL, device, base != NULL, base, false, NULL,
+ qmp_block_stream(true, device, device, base != NULL, base, false, NULL,
false, NULL, qdict_haskey(qdict, "speed"), speed,
true, BLOCKDEV_ON_ERROR_REPORT, &error);