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

block/commit: 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-2-jsnow@redhat.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 506e4a00

block/commit.c

+3 −2
Original line number Diff line number Diff line
@@ -249,7 +249,8 @@ static BlockDriver bdrv_commit_top = { 
};



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

                  BlockDriverState *base, BlockDriverState *top, int64_t speed,

                  BlockDriverState *base, BlockDriverState *top,

                  int creation_flags, int64_t speed,

                  BlockdevOnError on_error, const char *backing_file_str,

                  const char *filter_node_name, Error **errp)

{
@@ -267,7 +268,7 @@ void commit_start(const char *job_id, BlockDriverState *bs, 
    }



    s = block_job_create(job_id, &commit_job_driver, NULL, bs, 0, BLK_PERM_ALL,

                         speed, JOB_DEFAULT, NULL, NULL, errp);

                         speed, creation_flags, NULL, NULL, errp);

    if (!s) {

        return;

    }

blockdev.c

+4 −3
Original line number Diff line number Diff line
@@ -3214,6 +3214,7 @@ void qmp_block_commit(bool has_job_id, const char *job_id, const char *device, 
     * BlockdevOnError change for blkmirror makes it in

     */

    BlockdevOnError on_error = BLOCKDEV_ON_ERROR_REPORT;

    int job_flags = JOB_DEFAULT;



    if (!has_speed) {

        speed = 0;
@@ -3295,15 +3296,15 @@ void qmp_block_commit(bool has_job_id, const char *job_id, const char *device, 
            goto out;

        }

        commit_active_start(has_job_id ? job_id : NULL, bs, base_bs,

                            JOB_DEFAULT, speed, on_error,

                            job_flags, speed, on_error,

                            filter_node_name, NULL, NULL, false, &local_err);

    } else {

        BlockDriverState *overlay_bs = bdrv_find_overlay(bs, top_bs);

        if (bdrv_op_is_blocked(overlay_bs, BLOCK_OP_TYPE_COMMIT_TARGET, errp)) {

            goto out;

        }

        commit_start(has_job_id ? job_id : NULL, bs, base_bs, top_bs, speed,

                     on_error, has_backing_file ? backing_file : NULL,

        commit_start(has_job_id ? job_id : NULL, bs, base_bs, top_bs, job_flags,

                     speed, on_error, has_backing_file ? backing_file : NULL,

                     filter_node_name, &local_err);

    }

    if (local_err != NULL) {

include/block/block_int.h

+4 −1
Original line number Diff line number Diff line
@@ -980,6 +980,8 @@ void stream_start(const char *job_id, BlockDriverState *bs, 
 * @bs: Active block device.

 * @top: Top block device to be committed.

 * @base: Block device that will be written into, and become the new top.

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

 * @backing_file_str: String to use as the backing file in @top's overlay
@@ -990,7 +992,8 @@ void stream_start(const char *job_id, BlockDriverState *bs, 
 *

 */

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

                  BlockDriverState *base, BlockDriverState *top, int64_t speed,

                  BlockDriverState *base, BlockDriverState *top,

                  int creation_flags, int64_t speed,

                  BlockdevOnError on_error, const char *backing_file_str,

                  const char *filter_node_name, Error **errp);

/**