On 11/03/2015 10:23 AM, Eric Blake wrote: > On 10/23/2015 05:56 PM, John Snow wrote: >> Add both transactional properties to the QMP transactional interface, >> and add the BlockJobTxn that we create as a result of the err-cancel >> property to the BlkActionState structure. >> >> [split up from a patch originally by Stefan and Fam. --js] >> Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com> >> Signed-off-by: Fam Zheng <f...@redhat.com> >> Signed-off-by: John Snow <js...@redhat.com> >> >> Signed-off-by: John Snow <js...@redhat.com> > > Double S-o-b looks odd. > >> --- >> blockdev.c | 78 >> +++++++++++++++++++++++++++++++++++++++++++++++++++++--- >> qapi-schema.json | 48 +++++++++++++++++++++++++++++++--- >> qmp-commands.hx | 2 +- >> 3 files changed, 120 insertions(+), 8 deletions(-) >> > > >> +## >> # @transaction >> # >> # Executes a number of transactionable QMP commands atomically. If any >> # operation fails, then the entire set of actions will be abandoned and the >> # appropriate error returned. >> # >> -# List of: >> -# @TransactionAction: information needed for the respective operation >> +# @actions: List of @TransactionAction; >> +# information needed for the respective operations. >> +# >> +# @properties: Optional structure of additional options to control the > > Elsewhere, we've spelled it '#optional'; Marc-Andre has patches that > rely on that spelling to turn it .json into documentation. > > But otherwise, looks good on first glance. >
Do you mean: "# @properties: #optional structure of "... ? --js
