Commit fd62c609 authored by Alberto Garcia's avatar Alberto Garcia Committed by Kevin Wolf
Browse files

commit: Add 'job-id' parameter to 'block-commit' 



This patch adds a new optional 'job-id' parameter to 'block-commit',
allowing the user to specify the ID of the block job to be created.

Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 2323322e

block/commit.c

+4 −3
Original line number Diff line number Diff line
@@ -211,8 +211,8 @@ static const BlockJobDriver commit_job_driver = { 
    .set_speed     = commit_set_speed,

};



void commit_start(BlockDriverState *bs, BlockDriverState *base,

                  BlockDriverState *top, int64_t speed,

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

                  BlockDriverState *base, BlockDriverState *top, int64_t speed,

                  BlockdevOnError on_error, BlockCompletionFunc *cb,

                  void *opaque, const char *backing_file_str, Error **errp)

{
@@ -236,7 +236,8 @@ void commit_start(BlockDriverState *bs, BlockDriverState *base, 
        return;

    }



    s = block_job_create(NULL, &commit_job_driver, bs, speed, cb, opaque, errp);

    s = block_job_create(job_id, &commit_job_driver, bs, speed,

                         cb, opaque, errp);

    if (!s) {

        return;

    }

block/mirror.c

+3 −3
Original line number Diff line number Diff line
@@ -931,8 +931,8 @@ void mirror_start(const char *job_id, BlockDriverState *bs, 
                     &mirror_job_driver, is_none_mode, base);

}



void commit_active_start(BlockDriverState *bs, BlockDriverState *base,

                         int64_t speed,

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

                         BlockDriverState *base, int64_t speed,

                         BlockdevOnError on_error,

                         BlockCompletionFunc *cb,

                         void *opaque, Error **errp)
@@ -973,7 +973,7 @@ void commit_active_start(BlockDriverState *bs, BlockDriverState *base, 
        }

    }



    mirror_start_job(NULL, bs, base, NULL, speed, 0, 0,

    mirror_start_job(job_id, bs, base, NULL, speed, 0, 0,

                     MIRROR_LEAVE_BACKING_CHAIN,

                     on_error, on_error, false, cb, opaque, &local_err,

                     &commit_active_job_driver, false, base);

blockdev.c

+5 −4
Original line number Diff line number Diff line
@@ -3077,7 +3077,7 @@ out: 
    aio_context_release(aio_context);

}



void qmp_block_commit(const char *device,

void qmp_block_commit(bool has_job_id, const char *job_id, const char *device,

                      bool has_base, const char *base,

                      bool has_top, const char *top,

                      bool has_backing_file, const char *backing_file,
@@ -3168,10 +3168,11 @@ void qmp_block_commit(const char *device, 
                             " but 'top' is the active layer");

            goto out;

        }

        commit_active_start(bs, base_bs, speed, on_error, block_job_cb,

                            bs, &local_err);

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

                            on_error, block_job_cb, bs, &local_err);

    } else {

        commit_start(bs, base_bs, top_bs, speed, on_error, block_job_cb, bs,

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

                     on_error, block_job_cb, bs,

                     has_backing_file ? backing_file : NULL, &local_err);

    }

    if (local_err != NULL) {

include/block/block_int.h

+10 −6
Original line number Diff line number Diff line
@@ -666,6 +666,8 @@ void stream_start(const char *job_id, BlockDriverState *bs, 


/**

 * commit_start:

 * @job_id: The id of the newly-created job, or %NULL to use the

 * device name of @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.
@@ -677,12 +679,14 @@ void stream_start(const char *job_id, BlockDriverState *bs, 
 * @errp: Error object.

 *

 */

void commit_start(BlockDriverState *bs, BlockDriverState *base,

                 BlockDriverState *top, int64_t speed,

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

                  BlockDriverState *base, BlockDriverState *top, int64_t speed,

                  BlockdevOnError on_error, BlockCompletionFunc *cb,

                  void *opaque, const char *backing_file_str, Error **errp);

/**

 * commit_active_start:

 * @job_id: The id of the newly-created job, or %NULL to use the

 * device name of @bs.

 * @bs: Active block device to be committed.

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

 * @speed: The maximum speed, in bytes per second, or 0 for unlimited.
@@ -692,8 +696,8 @@ void commit_start(BlockDriverState *bs, BlockDriverState *base, 
 * @errp: Error object.

 *

 */

void commit_active_start(BlockDriverState *bs, BlockDriverState *base,

                         int64_t speed,

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

                         BlockDriverState *base, int64_t speed,

                         BlockdevOnError on_error,

                         BlockCompletionFunc *cb,

                         void *opaque, Error **errp);

qapi/block-core.json

+4 −1
Original line number Diff line number Diff line
@@ -1010,6 +1010,9 @@ 
# Live commit of data from overlay image nodes into backing nodes - i.e.,

# writes data between 'top' and 'base' into 'base'.

#

# @job-id: #optional identifier for the newly-created block job. If

#          omitted, the device name will be used. (Since 2.7)

#

# @device:  the name of the device

#

# @base:   #optional The file name of the backing image to write data into.
@@ -1061,7 +1064,7 @@ 
#

##

{ 'command': 'block-commit',

  'data': { 'device': 'str', '*base': 'str', '*top': 'str',

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

            '*backing-file': 'str', '*speed': 'int' } }



##