[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 20/21] qapi/block-mirror: expose new job properties
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH 20/21] qapi/block-mirror: expose new job properties |
Date: |
Tue, 7 Aug 2018 00:33:48 -0400 |
Signed-off-by: John Snow <address@hidden>
---
blockdev.c | 14 ++++++++++++++
qapi/block-core.json | 6 ++++--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 8efc47e178..bbb3279020 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3707,6 +3707,8 @@ static void blockdev_mirror_common(const char *job_id,
BlockDriverState *bs,
bool has_filter_node_name,
const char *filter_node_name,
bool has_copy_mode, MirrorCopyMode
copy_mode,
+ bool has_auto_finalize, bool auto_finalize,
+ bool has_auto_dismiss, bool auto_dismiss,
Error **errp)
{
int job_flags = JOB_DEFAULT;
@@ -3735,6 +3737,12 @@ static void blockdev_mirror_common(const char *job_id,
BlockDriverState *bs,
if (!has_copy_mode) {
copy_mode = MIRROR_COPY_MODE_BACKGROUND;
}
+ if (has_auto_finalize && !auto_finalize) {
+ job_flags |= JOB_MANUAL_FINALIZE;
+ }
+ if (has_auto_dismiss && !auto_dismiss) {
+ job_flags |= JOB_MANUAL_DISMISS;
+ }
if (granularity != 0 && (granularity < 512 || granularity > 1048576 * 64))
{
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "granularity",
@@ -3912,6 +3920,8 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)
arg->has_unmap, arg->unmap,
false, NULL,
arg->has_copy_mode, arg->copy_mode,
+ arg->has_auto_finalize, arg->auto_finalize,
+ arg->has_auto_dismiss, arg->auto_dismiss,
&local_err);
bdrv_unref(target_bs);
error_propagate(errp, local_err);
@@ -3933,6 +3943,8 @@ void qmp_blockdev_mirror(bool has_job_id, const char
*job_id,
bool has_filter_node_name,
const char *filter_node_name,
bool has_copy_mode, MirrorCopyMode copy_mode,
+ bool has_auto_finalize, bool auto_finalize,
+ bool has_auto_dismiss, bool auto_dismiss,
Error **errp)
{
BlockDriverState *bs;
@@ -3966,6 +3978,8 @@ void qmp_blockdev_mirror(bool has_job_id, const char
*job_id,
true, true,
has_filter_node_name, filter_node_name,
has_copy_mode, copy_mode,
+ has_auto_finalize, auto_finalize,
+ has_auto_dismiss, auto_dismiss,
&local_err);
error_propagate(errp, local_err);
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 4ee58cfb28..bc53eaf2c0 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1728,7 +1728,8 @@
'*speed': 'int', '*granularity': 'uint32',
'*buf-size': 'int', '*on-source-error': 'BlockdevOnError',
'*on-target-error': 'BlockdevOnError',
- '*unmap': 'bool', '*copy-mode': 'MirrorCopyMode' } }
+ '*unmap': 'bool', '*copy-mode': 'MirrorCopyMode',
+ '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }
##
# @BlockDirtyBitmap:
@@ -2015,7 +2016,8 @@
'*buf-size': 'int', '*on-source-error': 'BlockdevOnError',
'*on-target-error': 'BlockdevOnError',
'*filter-node-name': 'str',
- '*copy-mode': 'MirrorCopyMode' } }
+ '*copy-mode': 'MirrorCopyMode',
+ '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }
##
# @block_set_io_throttle:
--
2.14.4
- Re: [Qemu-devel] [PATCH 02/21] jobs: add exit shim, (continued)
- [Qemu-devel] [PATCH 18/21] block/commit: refactor stream to use job callbacks, John Snow, 2018/08/07
- [Qemu-devel] [PATCH 15/21] block/stream: add block job creation flags, John Snow, 2018/08/07
- [Qemu-devel] [PATCH 03/21] block/backup: utilize job_exit shim, John Snow, 2018/08/07
- [Qemu-devel] [PATCH 14/21] block/mirror: add block job creation flags, John Snow, 2018/08/07
- [Qemu-devel] [PATCH 10/21] tests/test-bdrv-drain: utilize job_exit shim, John Snow, 2018/08/07
- [Qemu-devel] [PATCH 19/21] qapi/block-commit: expose new job properties, John Snow, 2018/08/07
- [Qemu-devel] [PATCH 20/21] qapi/block-mirror: expose new job properties,
John Snow <=
- [Qemu-devel] [PATCH 12/21] jobs: allow entrypoints to return status code, John Snow, 2018/08/07
- [Qemu-devel] [PATCH 07/21] block/create: utilize job_exit shim, John Snow, 2018/08/07
- [Qemu-devel] [PATCH 06/21] block/stream: utilize job_exit shim, John Snow, 2018/08/07
- [Qemu-devel] [PATCH 04/21] block/commit: utilize job_exit shim, John Snow, 2018/08/07