qapi: add filter-node-name to block-stream

Provide the possibility to pass the 'filter-node-name' parameter to the
block-stream job as it is done for the commit block job.

Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  [vsementsov: comment indentation, s/Since: 5.2/Since: 6.0/]
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20201216061703.70908-5-vsementsov@virtuozzo.com>
[mreitz: s/commit/stream/]
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Andrey Shinkevich 2020-12-16 09:16:54 +03:00 committed by Max Reitz
parent 16e09a21af
commit 880747a887
5 changed files with 20 additions and 5 deletions

View File

@ -508,8 +508,8 @@ void hmp_block_stream(Monitor *mon, const QDict *qdict)
qmp_block_stream(true, device, 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, false, NULL, qdict_haskey(qdict, "speed"), speed, true,
BLOCKDEV_ON_ERROR_REPORT, false, false, false, false, BLOCKDEV_ON_ERROR_REPORT, false, NULL, false, false, false,
&error); false, &error);
hmp_handle_error(mon, error); hmp_handle_error(mon, error);
} }

View File

@ -221,7 +221,9 @@ static const BlockJobDriver stream_job_driver = {
void stream_start(const char *job_id, BlockDriverState *bs, void stream_start(const char *job_id, BlockDriverState *bs,
BlockDriverState *base, const char *backing_file_str, BlockDriverState *base, const char *backing_file_str,
int creation_flags, int64_t speed, int creation_flags, int64_t speed,
BlockdevOnError on_error, Error **errp) BlockdevOnError on_error,
const char *filter_node_name,
Error **errp)
{ {
StreamBlockJob *s; StreamBlockJob *s;
BlockDriverState *iter; BlockDriverState *iter;

View File

@ -2502,6 +2502,7 @@ void qmp_block_stream(bool has_job_id, const char *job_id, const char *device,
bool has_backing_file, const char *backing_file, bool has_backing_file, const char *backing_file,
bool has_speed, int64_t speed, bool has_speed, int64_t speed,
bool has_on_error, BlockdevOnError on_error, bool has_on_error, BlockdevOnError on_error,
bool has_filter_node_name, const char *filter_node_name,
bool has_auto_finalize, bool auto_finalize, bool has_auto_finalize, bool auto_finalize,
bool has_auto_dismiss, bool auto_dismiss, bool has_auto_dismiss, bool auto_dismiss,
Error **errp) Error **errp)
@ -2584,7 +2585,8 @@ void qmp_block_stream(bool has_job_id, const char *job_id, const char *device,
} }
stream_start(has_job_id ? job_id : NULL, bs, base_bs, base_name, stream_start(has_job_id ? job_id : NULL, bs, base_bs, base_name,
job_flags, has_speed ? speed : 0, on_error, &local_err); job_flags, has_speed ? speed : 0, on_error,
filter_node_name, &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
goto out; goto out;

View File

@ -1143,6 +1143,9 @@ int is_windows_drive(const char *filename);
* See @BlockJobCreateFlags * See @BlockJobCreateFlags
* @speed: The maximum speed, in bytes per second, or 0 for unlimited. * @speed: The maximum speed, in bytes per second, or 0 for unlimited.
* @on_error: The action to take upon error. * @on_error: The action to take upon error.
* @filter_node_name: The node name that should be assigned to the filter
* driver that the stream job inserts into the graph above
* @bs. NULL means that a node name should be autogenerated.
* @errp: Error object. * @errp: Error object.
* *
* Start a streaming operation on @bs. Clusters that are unallocated * Start a streaming operation on @bs. Clusters that are unallocated
@ -1155,7 +1158,9 @@ int is_windows_drive(const char *filename);
void stream_start(const char *job_id, BlockDriverState *bs, void stream_start(const char *job_id, BlockDriverState *bs,
BlockDriverState *base, const char *backing_file_str, BlockDriverState *base, const char *backing_file_str,
int creation_flags, int64_t speed, int creation_flags, int64_t speed,
BlockdevOnError on_error, Error **errp); BlockdevOnError on_error,
const char *filter_node_name,
Error **errp);
/** /**
* commit_start: * commit_start:

View File

@ -2543,6 +2543,11 @@
# 'stop' and 'enospc' can only be used if the block device # 'stop' and 'enospc' can only be used if the block device
# supports io-status (see BlockInfo). Since 1.3. # supports io-status (see BlockInfo). Since 1.3.
# #
# @filter-node-name: the node name that should be assigned to the
# filter driver that the stream job inserts into the graph
# above @device. If this option is not given, a node name is
# autogenerated. (Since: 6.0)
#
# @auto-finalize: When false, this job will wait in a PENDING state after it has # @auto-finalize: When false, this job will wait in a PENDING state after it has
# finished its work, waiting for @block-job-finalize before # finished its work, waiting for @block-job-finalize before
# making any block graph changes. # making any block graph changes.
@ -2573,6 +2578,7 @@
'data': { '*job-id': 'str', 'device': 'str', '*base': 'str', 'data': { '*job-id': 'str', 'device': 'str', '*base': 'str',
'*base-node': 'str', '*backing-file': 'str', '*speed': 'int', '*base-node': 'str', '*backing-file': 'str', '*speed': 'int',
'*on-error': 'BlockdevOnError', '*on-error': 'BlockdevOnError',
'*filter-node-name': 'str',
'*auto-finalize': 'bool', '*auto-dismiss': 'bool' } } '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }
## ##