|
 |
357786 |
From 64f2d8be8a97b47baa7c51cceaa29b60d6b969a5 Mon Sep 17 00:00:00 2001
|
|
|
357786 |
From: John Snow <jsnow@redhat.com>
|
|
|
357786 |
Date: Mon, 10 Sep 2018 18:17:59 +0200
|
|
|
357786 |
Subject: [PATCH 21/25] qapi/block-commit: expose new job properties
|
|
|
357786 |
|
|
|
357786 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
357786 |
Message-id: <20180910181803.11781-22-jsnow@redhat.com>
|
|
|
357786 |
Patchwork-id: 82100
|
|
|
357786 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 21/25] qapi/block-commit: expose new job properties
|
|
|
357786 |
Bugzilla: 1626061
|
|
|
357786 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
357786 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
357786 |
|
|
|
357786 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
357786 |
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
Message-id: 20180906130225.5118-13-jsnow@redhat.com
|
|
|
357786 |
Reviewed-by: Jeff Cody <jcody@redhat.com>
|
|
|
357786 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
(cherry picked from commit 7c91d440488214e953f8cc76e5d5fa477dc0376f)
|
|
|
357786 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
357786 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
357786 |
---
|
|
|
357786 |
blockdev.c | 8 ++++++++
|
|
|
357786 |
qapi/block-core.json | 16 +++++++++++++++-
|
|
|
357786 |
2 files changed, 23 insertions(+), 1 deletion(-)
|
|
|
357786 |
|
|
|
357786 |
diff --git a/blockdev.c b/blockdev.c
|
|
|
357786 |
index c4a1801..1d0cbb1 100644
|
|
|
357786 |
--- a/blockdev.c
|
|
|
357786 |
+++ b/blockdev.c
|
|
|
357786 |
@@ -3361,6 +3361,8 @@ void qmp_block_commit(bool has_job_id, const char *job_id, const char *device,
|
|
|
357786 |
bool has_backing_file, const char *backing_file,
|
|
|
357786 |
bool has_speed, int64_t speed,
|
|
|
357786 |
bool has_filter_node_name, const char *filter_node_name,
|
|
|
357786 |
+ bool has_auto_finalize, bool auto_finalize,
|
|
|
357786 |
+ bool has_auto_dismiss, bool auto_dismiss,
|
|
|
357786 |
Error **errp)
|
|
|
357786 |
{
|
|
|
357786 |
BlockDriverState *bs;
|
|
|
357786 |
@@ -3380,6 +3382,12 @@ void qmp_block_commit(bool has_job_id, const char *job_id, const char *device,
|
|
|
357786 |
if (!has_filter_node_name) {
|
|
|
357786 |
filter_node_name = NULL;
|
|
|
357786 |
}
|
|
|
357786 |
+ if (has_auto_finalize && !auto_finalize) {
|
|
|
357786 |
+ job_flags |= JOB_MANUAL_FINALIZE;
|
|
|
357786 |
+ }
|
|
|
357786 |
+ if (has_auto_dismiss && !auto_dismiss) {
|
|
|
357786 |
+ job_flags |= JOB_MANUAL_DISMISS;
|
|
|
357786 |
+ }
|
|
|
357786 |
|
|
|
357786 |
/* Important Note:
|
|
|
357786 |
* libvirt relies on the DeviceNotFound error class in order to probe for
|
|
|
357786 |
diff --git a/qapi/block-core.json b/qapi/block-core.json
|
|
|
357786 |
index c6b42eb..af453c5 100644
|
|
|
357786 |
--- a/qapi/block-core.json
|
|
|
357786 |
+++ b/qapi/block-core.json
|
|
|
357786 |
@@ -1481,6 +1481,19 @@
|
|
|
357786 |
# above @top. If this option is not given, a node name is
|
|
|
357786 |
# autogenerated. (Since: 2.9)
|
|
|
357786 |
#
|
|
|
357786 |
+# @auto-finalize: When false, this job will wait in a PENDING state after it has
|
|
|
357786 |
+# finished its work, waiting for @block-job-finalize before
|
|
|
357786 |
+# making any block graph changes.
|
|
|
357786 |
+# When true, this job will automatically
|
|
|
357786 |
+# perform its abort or commit actions.
|
|
|
357786 |
+# Defaults to true. (Since 3.1)
|
|
|
357786 |
+#
|
|
|
357786 |
+# @auto-dismiss: When false, this job will wait in a CONCLUDED state after it
|
|
|
357786 |
+# has completely ceased all work, and awaits @block-job-dismiss.
|
|
|
357786 |
+# When true, this job will automatically disappear from the query
|
|
|
357786 |
+# list without user intervention.
|
|
|
357786 |
+# Defaults to true. (Since 3.1)
|
|
|
357786 |
+#
|
|
|
357786 |
# Returns: Nothing on success
|
|
|
357786 |
# If commit or stream is already active on this device, DeviceInUse
|
|
|
357786 |
# If @device does not exist, DeviceNotFound
|
|
|
357786 |
@@ -1501,7 +1514,8 @@
|
|
|
357786 |
{ 'command': 'block-commit',
|
|
|
357786 |
'data': { '*job-id': 'str', 'device': 'str', '*base': 'str', '*top': 'str',
|
|
|
357786 |
'*backing-file': 'str', '*speed': 'int',
|
|
|
357786 |
- '*filter-node-name': 'str' } }
|
|
|
357786 |
+ '*filter-node-name': 'str',
|
|
|
357786 |
+ '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }
|
|
|
357786 |
|
|
|
357786 |
##
|
|
|
357786 |
# @drive-backup:
|
|
|
357786 |
--
|
|
|
357786 |
1.8.3.1
|
|
|
357786 |
|