Commit 241ca1ab authored by John Snow's avatar John Snow Committed by Max Reitz
Browse files

qapi/block-stream: expose new job properties 



Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 20180906130225.5118-15-jsnow@redhat.com
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent a6b58ade

blockdev.c

+9 −0
Original line number Diff line number Diff line
@@ -3116,6 +3116,8 @@ 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_speed, int64_t speed,

                      bool has_on_error, BlockdevOnError on_error,

                      bool has_auto_finalize, bool auto_finalize,

                      bool has_auto_dismiss, bool auto_dismiss,

                      Error **errp)

{

    BlockDriverState *bs, *iter;
@@ -3185,6 +3187,13 @@ void qmp_block_stream(bool has_job_id, const char *job_id, const char *device, 
    /* backing_file string overrides base bs filename */

    base_name = has_backing_file ? backing_file : base_name;



    if (has_auto_finalize && !auto_finalize) {

        job_flags |= JOB_MANUAL_FINALIZE;

    }

    if (has_auto_dismiss && !auto_dismiss) {

        job_flags |= JOB_MANUAL_DISMISS;

    }



    stream_start(has_job_id ? job_id : NULL, bs, base_bs, base_name,

                 job_flags, has_speed ? speed : 0, on_error, &local_err);

    if (local_err) {

hmp.c

+3 −2
Original line number Diff line number Diff line
@@ -1905,8 +1905,9 @@ void hmp_block_stream(Monitor *mon, const QDict *qdict) 
    int64_t speed = qdict_get_try_int(qdict, "speed", 0);



    qmp_block_stream(true, device, device, base != NULL, base, false, NULL,

                     false, NULL, qdict_haskey(qdict, "speed"), speed,

                     true, BLOCKDEV_ON_ERROR_REPORT, &error);

                     false, NULL, qdict_haskey(qdict, "speed"), speed, true,

                     BLOCKDEV_ON_ERROR_REPORT, false, false, false, false,

                     &error);



    hmp_handle_error(mon, &error);

}

qapi/block-core.json

+15 −1
Original line number Diff line number Diff line
@@ -2317,6 +2317,19 @@ 
#            'stop' and 'enospc' can only be used if the block device

#            supports io-status (see BlockInfo).  Since 1.3.

#

# @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.

#

# Since: 1.1
@@ -2332,7 +2345,8 @@ 
{ 'command': 'block-stream',

  'data': { '*job-id': 'str', 'device': 'str', '*base': 'str',

            '*base-node': 'str', '*backing-file': 'str', '*speed': 'int',

            '*on-error': 'BlockdevOnError' } }

            '*on-error': 'BlockdevOnError',

            '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }



##

# @block-job-set-speed: