| Message ID | 20180906130225.5118-16-jsnow@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | jobs: Job Exit Refactoring Pt 2 | expand |
On Thu, Sep 06, 2018 at 09:02:24AM -0400, John Snow wrote: > Fix documentation to match the other jobs amended for 3.1. > > Signed-off-by: John Snow <jsnow@redhat.com> > Reviewed-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Jeff Cody <jcody@redhat.com> > --- > qapi/block-core.json | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > > diff --git a/qapi/block-core.json b/qapi/block-core.json > index f877e9e414..c0b3d33dbb 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -1272,13 +1272,14 @@ > # a different block device than @device). > # > # @auto-finalize: When false, this job will wait in a PENDING state after it has > -# finished its work, waiting for @block-job-finalize. > -# When true, this job will automatically perform its abort or > -# commit actions. > +# 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 2.12) > # > # @auto-dismiss: When false, this job will wait in a CONCLUDED state after it > -# has completed ceased all work, and wait for @block-job-dismiss. > +# 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 2.12) > @@ -1327,13 +1328,14 @@ > # a different block device than @device). > # > # @auto-finalize: When false, this job will wait in a PENDING state after it has > -# finished its work, waiting for @block-job-finalize. > -# When true, this job will automatically perform its abort or > -# commit actions. > +# 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 2.12) > # > # @auto-dismiss: When false, this job will wait in a CONCLUDED state after it > -# has completed ceased all work, and wait for @block-job-dismiss. > +# 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 2.12) > -- > 2.14.4 >
diff --git a/qapi/block-core.json b/qapi/block-core.json index f877e9e414..c0b3d33dbb 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1272,13 +1272,14 @@ # a different block device than @device). # # @auto-finalize: When false, this job will wait in a PENDING state after it has -# finished its work, waiting for @block-job-finalize. -# When true, this job will automatically perform its abort or -# commit actions. +# 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 2.12) # # @auto-dismiss: When false, this job will wait in a CONCLUDED state after it -# has completed ceased all work, and wait for @block-job-dismiss. +# 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 2.12) @@ -1327,13 +1328,14 @@ # a different block device than @device). # # @auto-finalize: When false, this job will wait in a PENDING state after it has -# finished its work, waiting for @block-job-finalize. -# When true, this job will automatically perform its abort or -# commit actions. +# 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 2.12) # # @auto-dismiss: When false, this job will wait in a CONCLUDED state after it -# has completed ceased all work, and wait for @block-job-dismiss. +# 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 2.12)