[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/21] block/commit: add block job creation flags
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH 13/21] block/commit: add block job creation flags |
Date: |
Tue, 7 Aug 2018 00:33:41 -0400 |
Add support for taking and passing forward job creation flags.
Signed-off-by: John Snow <address@hidden>
---
block/commit.c | 5 +++--
blockdev.c | 7 ++++---
include/block/block_int.h | 5 ++++-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/block/commit.c b/block/commit.c
index 22712cac2d..1a4a56795f 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -256,7 +256,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)
{
@@ -274,7 +275,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;
}
diff --git a/blockdev.c b/blockdev.c
index dcf8c8d2ab..88ad8d96e5 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3324,6 +3324,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;
@@ -3405,15 +3406,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) {
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 903b9c1034..ffab0b4d3e 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -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);
/**
--
2.14.4
- Re: [Qemu-devel] [PATCH 04/21] block/commit: utilize job_exit shim, (continued)
[Qemu-devel] [PATCH 01/21] jobs: canonize Error object, John Snow, 2018/08/07
[Qemu-devel] [PATCH 11/21] jobs: remove job_defer_to_main_loop, John Snow, 2018/08/07
[Qemu-devel] [PATCH 09/21] tests/test-blockjob: utilize job_exit shim, John Snow, 2018/08/07
[Qemu-devel] [PATCH 08/21] tests/test-blockjob-txn: utilize job_exit shim, John Snow, 2018/08/07
[Qemu-devel] [PATCH 13/21] block/commit: add block job creation flags,
John Snow <=
[Qemu-devel] [PATCH 05/21] block/mirror: utilize job_exit shim, John Snow, 2018/08/07
[Qemu-devel] [PATCH 17/21] block/mirror: conservative mirror_exit refactor, John Snow, 2018/08/07
[Qemu-devel] [PATCH 16/21] block/commit: refactor commit to use job callbacks, John Snow, 2018/08/07
[Qemu-devel] [PATCH 21/21] qapi/block-stream: expose new job properties, John Snow, 2018/08/07
Re: [Qemu-devel] [Qemu-block] [PATCH 00/21] jobs: defer graph changes until finalize, Peter Krempa, 2018/08/15