91 lines
3.6 KiB
Diff
91 lines
3.6 KiB
Diff
From 756c3ccf83d5612ca2b326a8fed8fdf1f7958adb Mon Sep 17 00:00:00 2001
|
|
From: John Snow <jsnow@redhat.com>
|
|
Date: Tue, 25 Sep 2018 22:34:27 +0100
|
|
Subject: qapi/block-commit: expose new job properties
|
|
|
|
RH-Author: John Snow <jsnow@redhat.com>
|
|
Message-id: <20180925223431.24791-22-jsnow@redhat.com>
|
|
Patchwork-id: 82285
|
|
O-Subject: [RHEL8/rhel qemu-kvm PATCH 21/25] qapi/block-commit: expose new job properties
|
|
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>
|
|
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
Message-id: 20180906130225.5118-13-jsnow@redhat.com
|
|
Reviewed-by: Jeff Cody <jcody@redhat.com>
|
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
(cherry picked from commit 96fbf5345f60a87fab8e7ea79a2406f381027db9)
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
blockdev.c | 8 ++++++++
|
|
qapi/block-core.json | 16 +++++++++++++++-
|
|
2 files changed, 23 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/blockdev.c b/blockdev.c
|
|
index c2e6402..8efc47e 100644
|
|
--- a/blockdev.c
|
|
+++ b/blockdev.c
|
|
@@ -3314,6 +3314,8 @@ void qmp_block_commit(bool has_job_id, const char *job_id, const char *device,
|
|
bool has_backing_file, const char *backing_file,
|
|
bool has_speed, int64_t speed,
|
|
bool has_filter_node_name, const char *filter_node_name,
|
|
+ bool has_auto_finalize, bool auto_finalize,
|
|
+ bool has_auto_dismiss, bool auto_dismiss,
|
|
Error **errp)
|
|
{
|
|
BlockDriverState *bs;
|
|
@@ -3333,6 +3335,12 @@ void qmp_block_commit(bool has_job_id, const char *job_id, const char *device,
|
|
if (!has_filter_node_name) {
|
|
filter_node_name = NULL;
|
|
}
|
|
+ if (has_auto_finalize && !auto_finalize) {
|
|
+ job_flags |= JOB_MANUAL_FINALIZE;
|
|
+ }
|
|
+ if (has_auto_dismiss && !auto_dismiss) {
|
|
+ job_flags |= JOB_MANUAL_DISMISS;
|
|
+ }
|
|
|
|
/* Important Note:
|
|
* libvirt relies on the DeviceNotFound error class in order to probe for
|
|
diff --git a/qapi/block-core.json b/qapi/block-core.json
|
|
index 5b9084a..ca7d1b3 100644
|
|
--- a/qapi/block-core.json
|
|
+++ b/qapi/block-core.json
|
|
@@ -1498,6 +1498,19 @@
|
|
# above @top. If this option is not given, a node name is
|
|
# autogenerated. (Since: 2.9)
|
|
#
|
|
+# @auto-finalize: When false, this job will wait in a PENDING state after it has
|
|
+# finished its work, waiting for @block-job-finalize before
|
|
+# making any block graph changes.
|
|
+# When true, this job will automatically
|
|
+# perform its abort or commit actions.
|
|
+# Defaults to true. (Since 3.1)
|
|
+#
|
|
+# @auto-dismiss: When false, this job will wait in a CONCLUDED state after it
|
|
+# has completely ceased all work, and awaits @block-job-dismiss.
|
|
+# When true, this job will automatically disappear from the query
|
|
+# list without user intervention.
|
|
+# Defaults to true. (Since 3.1)
|
|
+#
|
|
# Returns: Nothing on success
|
|
# If commit or stream is already active on this device, DeviceInUse
|
|
# If @device does not exist, DeviceNotFound
|
|
@@ -1518,7 +1531,8 @@
|
|
{ 'command': 'block-commit',
|
|
'data': { '*job-id': 'str', 'device': 'str', '*base': 'str', '*top': 'str',
|
|
'*backing-file': 'str', '*speed': 'int',
|
|
- '*filter-node-name': 'str' } }
|
|
+ '*filter-node-name': 'str',
|
|
+ '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }
|
|
|
|
##
|
|
# @drive-backup:
|
|
--
|
|
1.8.3.1
|
|
|