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

block/stream: add block job creation flags 



Add support for taking and passing forward job creation flags.

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

block/stream.c

+3 −2
Original line number Diff line number Diff line
@@ -214,7 +214,8 @@ static const BlockJobDriver stream_job_driver = { 


void stream_start(const char *job_id, BlockDriverState *bs,

                  BlockDriverState *base, const char *backing_file_str,

                  int64_t speed, BlockdevOnError on_error, Error **errp)

                  int creation_flags, int64_t speed,

                  BlockdevOnError on_error, Error **errp)

{

    StreamBlockJob *s;

    BlockDriverState *iter;
@@ -236,7 +237,7 @@ void stream_start(const char *job_id, BlockDriverState *bs, 
                         BLK_PERM_GRAPH_MOD,

                         BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE_UNCHANGED |

                         BLK_PERM_WRITE,

                         speed, JOB_DEFAULT, NULL, NULL, errp);

                         speed, creation_flags, NULL, NULL, errp);

    if (!s) {

        goto fail;

    }

blockdev.c

+2 −1
Original line number Diff line number Diff line
@@ -3123,6 +3123,7 @@ void qmp_block_stream(bool has_job_id, const char *job_id, const char *device, 
    AioContext *aio_context;

    Error *local_err = NULL;

    const char *base_name = NULL;

    int job_flags = JOB_DEFAULT;



    if (!has_on_error) {

        on_error = BLOCKDEV_ON_ERROR_REPORT;
@@ -3185,7 +3186,7 @@ void qmp_block_stream(bool has_job_id, const char *job_id, const char *device, 
    base_name = has_backing_file ? backing_file : base_name;



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

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

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

    if (local_err) {

        error_propagate(errp, local_err);

        goto out;

include/block/block_int.h

+4 −1
Original line number Diff line number Diff line
@@ -958,6 +958,8 @@ int is_windows_drive(const char *filename); 
 * flatten the whole backing file chain onto @bs.

 * @backing_file_str: The file name that will be written to @bs as the

 * the new backing file if the job completes. Ignored if @base is %NULL.

 * @creation_flags: Flags that control the behavior of the Job lifetime.

 *                  See @BlockJobCreateFlags

 * @speed: The maximum speed, in bytes per second, or 0 for unlimited.

 * @on_error: The action to take upon error.

 * @errp: Error object.
@@ -971,7 +973,8 @@ int is_windows_drive(const char *filename); 
 */

void stream_start(const char *job_id, BlockDriverState *bs,

                  BlockDriverState *base, const char *backing_file_str,

                  int64_t speed, BlockdevOnError on_error, Error **errp);

                  int creation_flags, int64_t speed,

                  BlockdevOnError on_error, Error **errp);



/**

 * commit_start: