101 lines
4.5 KiB
Diff
101 lines
4.5 KiB
Diff
From d4f6cfe194df3236bf53b1093e0a7f98f0a5da0e Mon Sep 17 00:00:00 2001
|
|
From: John Snow <jsnow@redhat.com>
|
|
Date: Tue, 25 Sep 2018 22:34:17 +0100
|
|
Subject: block/mirror: add block job creation flags
|
|
|
|
RH-Author: John Snow <jsnow@redhat.com>
|
|
Message-id: <20180925223431.24791-12-jsnow@redhat.com>
|
|
Patchwork-id: 82268
|
|
O-Subject: [RHEL8/rhel qemu-kvm PATCH 11/25] block/mirror: add block job creation flags
|
|
Bugzilla: 1632939
|
|
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
|
Add support for taking and passing forward job creation flags.
|
|
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
Reviewed-by: Jeff Cody <jcody@redhat.com>
|
|
Message-id: 20180906130225.5118-3-jsnow@redhat.com
|
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
(cherry picked from commit a1999b33488daba68a1bcd7c6fdf314ddeacc6a2)
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
block/mirror.c | 5 +++--
|
|
blockdev.c | 3 ++-
|
|
include/block/block_int.h | 5 ++++-
|
|
3 files changed, 9 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/block/mirror.c b/block/mirror.c
|
|
index 4a9558d..cd13835 100644
|
|
--- a/block/mirror.c
|
|
+++ b/block/mirror.c
|
|
@@ -1639,7 +1639,8 @@ fail:
|
|
|
|
void mirror_start(const char *job_id, BlockDriverState *bs,
|
|
BlockDriverState *target, const char *replaces,
|
|
- int64_t speed, uint32_t granularity, int64_t buf_size,
|
|
+ int creation_flags, int64_t speed,
|
|
+ uint32_t granularity, int64_t buf_size,
|
|
MirrorSyncMode mode, BlockMirrorBackingMode backing_mode,
|
|
BlockdevOnError on_source_error,
|
|
BlockdevOnError on_target_error,
|
|
@@ -1655,7 +1656,7 @@ void mirror_start(const char *job_id, BlockDriverState *bs,
|
|
}
|
|
is_none_mode = mode == MIRROR_SYNC_MODE_NONE;
|
|
base = mode == MIRROR_SYNC_MODE_TOP ? backing_bs(bs) : NULL;
|
|
- mirror_start_job(job_id, bs, JOB_DEFAULT, target, replaces,
|
|
+ mirror_start_job(job_id, bs, creation_flags, target, replaces,
|
|
speed, granularity, buf_size, backing_mode,
|
|
on_source_error, on_target_error, unmap, NULL, NULL,
|
|
&mirror_job_driver, is_none_mode, base, false,
|
|
diff --git a/blockdev.c b/blockdev.c
|
|
index 88ad8d9..d31750b 100644
|
|
--- a/blockdev.c
|
|
+++ b/blockdev.c
|
|
@@ -3700,6 +3700,7 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
|
|
bool has_copy_mode, MirrorCopyMode copy_mode,
|
|
Error **errp)
|
|
{
|
|
+ int job_flags = JOB_DEFAULT;
|
|
|
|
if (!has_speed) {
|
|
speed = 0;
|
|
@@ -3752,7 +3753,7 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
|
|
* and will allow to check whether the node still exist at mirror completion
|
|
*/
|
|
mirror_start(job_id, bs, target,
|
|
- has_replaces ? replaces : NULL,
|
|
+ has_replaces ? replaces : NULL, job_flags,
|
|
speed, granularity, buf_size, sync, backing_mode,
|
|
on_source_error, on_target_error, unmap, filter_node_name,
|
|
copy_mode, errp);
|
|
diff --git a/include/block/block_int.h b/include/block/block_int.h
|
|
index ffab0b4..b40f0bf 100644
|
|
--- a/include/block/block_int.h
|
|
+++ b/include/block/block_int.h
|
|
@@ -1029,6 +1029,8 @@ void commit_active_start(const char *job_id, BlockDriverState *bs,
|
|
* @target: Block device to write to.
|
|
* @replaces: Block graph node name to replace once the mirror is done. Can
|
|
* only be used when full mirroring is selected.
|
|
+ * @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.
|
|
* @granularity: The chosen granularity for the dirty bitmap.
|
|
* @buf_size: The amount of data that can be in flight at one time.
|
|
@@ -1050,7 +1052,8 @@ void commit_active_start(const char *job_id, BlockDriverState *bs,
|
|
*/
|
|
void mirror_start(const char *job_id, BlockDriverState *bs,
|
|
BlockDriverState *target, const char *replaces,
|
|
- int64_t speed, uint32_t granularity, int64_t buf_size,
|
|
+ int creation_flags, int64_t speed,
|
|
+ uint32_t granularity, int64_t buf_size,
|
|
MirrorSyncMode mode, BlockMirrorBackingMode backing_mode,
|
|
BlockdevOnError on_source_error,
|
|
BlockdevOnError on_target_error,
|
|
--
|
|
1.8.3.1
|
|
|