On 11/23/2015 01:58 PM, Marc-André Lureau wrote:
> Hi
>
> On Fri, Oct 2, 2015 at 2:12 PM, Kashyap Chamarthy <kcham...@redhat.com> wrote:
>> Although the canonical source of reference for QMP commands is
>> qapi-schema.json, for consistency's sake, update qmp-commands.hx to
>> state the list of supported transactionable operations, namely:
>>
>> drive-backup
>> blockdev-backup
>> blockdev-snapshot-internal-sync
>> abort
>> block-dirty-bitmap-add
>> block-dirty-bitmap-clear
>>
>> Also update the possible values for the "type" action array.
>
> Isn't the actions limited by the TransactionAction in qapi-schema.json?
>
> { 'union': 'TransactionAction',
> 'data': {
> 'blockdev-snapshot-sync': 'BlockdevSnapshot',
> 'drive-backup': 'DriveBackup',
> + 'blockdev-backup': 'BlockdevBackup',
> 'abort': 'Abort',
> 'blockdev-snapshot-internal-sync': 'BlockdevSnapshotInternal'
> } }
>
> It looks like block-dirty-bitmap-add/clear isn't in the list.
>
> Thanks
>
Maybe at the time. Your codebase is outdated.
##
# @TransactionAction
#
# A discriminated record of operations that can be performed with
# @transaction.
#
# Since 1.1
#
# drive-backup since 1.6
# abort since 1.6
# blockdev-snapshot-internal-sync since 1.7
# blockdev-backup since 2.3
# blockdev-snapshot since 2.5
# block-dirty-bitmap-add since 2.5
# block-dirty-bitmap-clear since 2.5
##
{ 'union': 'TransactionAction',
'data': {
'blockdev-snapshot': 'BlockdevSnapshot',
'blockdev-snapshot-sync': 'BlockdevSnapshotSync',
'drive-backup': 'DriveBackup',
'blockdev-backup': 'BlockdevBackup',
'abort': 'Abort',
'blockdev-snapshot-internal-sync': 'BlockdevSnapshotInternal',
'block-dirty-bitmap-add': 'BlockDirtyBitmapAdd',
'block-dirty-bitmap-clear': 'BlockDirtyBitmap'
} }
>>
>> Signed-off-by: Kashyap Chamarthy <kcham...@redhat.com>
>> Reviewed-by: Eric Blake <ebl...@redhat.com>
>> ---
>> In v8 ("v8" because Fam included this as part of a series that is
>> in its "v7" edition):
>> - Update the possible values for supported 'type' of operation
>> ---
>> qmp-commands.hx | 29 ++++++++++++++++++++++-------
>> 1 file changed, 22 insertions(+), 7 deletions(-)
>>
>> diff --git a/qmp-commands.hx b/qmp-commands.hx
>> index
>> d2ba800d5effaddcae4c437452ef1f67c0aaaaa9..2b52980cfc2f80904a3c7375a382b638e8a51161
>> 100644
>> --- a/qmp-commands.hx
>> +++ b/qmp-commands.hx
>> @@ -1270,11 +1270,22 @@ SQMP
>> transaction
>> -----------
>>
>> -Atomically operate on one or more block devices. The only supported
>> operations
>> -for now are drive-backup, internal and external snapshotting. A list of
>> -dictionaries is accepted, that contains the actions to be performed.
>> -If there is any failure performing any of the operations, all operations
>> -for the group are abandoned.
>> +Atomically operate on one or more block devices. Operations that are
>> +currently supported:
>> +
>> + - drive-backup
>> + - blockdev-backup
>> + - blockdev-snapshot-sync
>> + - blockdev-snapshot-internal-sync
>> + - abort
>> + - block-dirty-bitmap-add
>> + - block-dirty-bitmap-clear
>> +
>> +Refer to the qemu/qapi-schema.json file for minimum required QEMU
>> +versions for these operations. A list of dictionaries is accepted,
>> +that contains the actions to be performed. If there is any failure
>> +performing any of the operations, all operations for the group are
>> +abandoned.
>>
>> For external snapshots, the dictionary contains the device, the file to use
>> for
>> the new snapshot, and the format. The default format, if not specified, is
>> @@ -1301,8 +1312,12 @@ it later with qemu-img or other command.
>> Arguments:
>>
>> actions array:
>> - - "type": the operation to perform. The only supported
>> - value is "blockdev-snapshot-sync". (json-string)
>> + - "type": the operation to perform (json-string). Possible
>> + values: "drive-backup", "blockdev-backup",
>> + "blockdev-snapshot-sync",
>> + "blockdev-snapshot-internal-sync",
>> + "abort", "block-dirty-bitmap-add",
>> + "block-dirty-bitmap-clear"
>> - "data": a dictionary. The contents depend on the value
>> of "type". When "type" is "blockdev-snapshot-sync":
>> - "device": device name to snapshot (json-string)
>> --
>> 2.4.3
>>
>>
>
>
>
