Signed-off-by: John Snow <jsnow@redhat.com>
---
 blockdev.c           | 8 ++++++++
 qapi/block-core.json | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/blockdev.c b/blockdev.c
index c2e6402a66..8efc47e178 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 5b9084a394..4ee58cfb28 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1518,7 +1518,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:
-- 
2.14.4

On 08/06/2018 11:33 PM, John Snow wrote:
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>   blockdev.c           | 8 ++++++++
>   qapi/block-core.json | 3 ++-
>   2 files changed, 10 insertions(+), 1 deletion(-)
> 

> +++ b/qapi/block-core.json
> @@ -1518,7 +1518,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' } }

Missing documentation, including a 'since 3.1' tag.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

On 08/07/2018 10:52 AM, Eric Blake wrote:
> On 08/06/2018 11:33 PM, John Snow wrote:
>> Signed-off-by: John Snow <jsnow@redhat.com>
>> ---
>>   blockdev.c           | 8 ++++++++
>>   qapi/block-core.json | 3 ++-
>>   2 files changed, 10 insertions(+), 1 deletion(-)
>>
> 
>> +++ b/qapi/block-core.json
>> @@ -1518,7 +1518,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' } }
> 
> Missing documentation, including a 'since 3.1' tag.
> 

OK, will fix for V2 but I won't respin until I get more feedback.

--js

Am 07.08.2018 um 16:52 hat Eric Blake geschrieben:
> On 08/06/2018 11:33 PM, John Snow wrote:
> > Signed-off-by: John Snow <jsnow@redhat.com>
> > ---
> >   blockdev.c           | 8 ++++++++
> >   qapi/block-core.json | 3 ++-
> >   2 files changed, 10 insertions(+), 1 deletion(-)
> > 
> 
> > +++ b/qapi/block-core.json
> > @@ -1518,7 +1518,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' } }
> 
> Missing documentation, including a 'since 3.1' tag.

And the same for the other two commands.

Kevin