On Thu, Sep 06, 2018 at 09:02:21AM -0400, John Snow wrote:
> Signed-off-by: John Snow <js...@redhat.com>
> Reviewed-by: Max Reitz <mre...@redhat.com>
Reviewed-by: Jeff Cody <jc...@redhat.com>
> ---
> blockdev.c | 8 ++++++++
> qapi/block-core.json | 16 +++++++++++++++-
> 2 files changed, 23 insertions(+), 1 deletion(-)
>
> diff --git a/blockdev.c b/blockdev.c
> index ec90eb1cf9..98b91e75a7 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -3204,6 +3204,8 @@ void qmp_block_commit(bool has_job_id, const char
> *job_id, const char *device,
> bool has_backing_file, const char *backing_file,
> bool has_speed, int64_t speed,
> bool has_filter_node_name, const char
> *filter_node_name,
> + bool has_auto_finalize, bool auto_finalize,
> + bool has_auto_dismiss, bool auto_dismiss,
> Error **errp)
> {
> BlockDriverState *bs;
> @@ -3223,6 +3225,12 @@ void qmp_block_commit(bool has_job_id, const char
> *job_id, const char *device,
> if (!has_filter_node_name) {
> filter_node_name = NULL;
> }
> + if (has_auto_finalize && !auto_finalize) {
> + job_flags |= JOB_MANUAL_FINALIZE;
> + }
> + if (has_auto_dismiss && !auto_dismiss) {
> + job_flags |= JOB_MANUAL_DISMISS;
> + }
>
> /* Important Note:
> * libvirt relies on the DeviceNotFound error class in order to probe
> for
> diff --git a/qapi/block-core.json b/qapi/block-core.json
> index 4c7a37afdc..d5b62e50d7 100644
> --- a/qapi/block-core.json
> +++ b/qapi/block-core.json
> @@ -1498,6 +1498,19 @@
> # above @top. If this option is not given, a node name is
> # autogenerated. (Since: 2.9)
> #
> +# @auto-finalize: When false, this job will wait in a PENDING state after it
> has
> +# finished its work, waiting for @block-job-finalize before
> +# making any block graph changes.
> +# When true, this job will automatically
> +# perform its abort or commit actions.
> +# Defaults to true. (Since 3.1)
> +#
> +# @auto-dismiss: When false, this job will wait in a CONCLUDED state after it
> +# has completely ceased all work, and awaits
> @block-job-dismiss.
> +# When true, this job will automatically disappear from the
> query
> +# list without user intervention.
> +# Defaults to true. (Since 3.1)
> +#
> # Returns: Nothing on success
> # If @device does not exist, DeviceNotFound
> # Any other error returns a GenericError.
> @@ -1515,7 +1528,8 @@
> { 'command': 'block-commit',
> 'data': { '*job-id': 'str', 'device': 'str', '*base': 'str', '*top': 'str',
> '*backing-file': 'str', '*speed': 'int',
> - '*filter-node-name': 'str' } }
> + '*filter-node-name': 'str',
> + '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }
>
> ##
> # @drive-backup:
> --
> 2.14.4
>
