John Snow <js...@redhat.com> writes: > On 7/5/19 10:14 AM, Markus Armbruster wrote: >> John Snow <js...@redhat.com> writes: >> >>> drive-backup and blockdev-backup have an awful lot of things in common >>> that are the same. Let's fix that. >>> >>> I don't deduplicate 'target', because the semantics actually did change >>> between each structure. Leave that one alone so it can be documented >>> separately. >>> >>> Signed-off-by: John Snow <js...@redhat.com> >>> --- >>> qapi/block-core.json | 103 ++++++++++++++----------------------------- >>> 1 file changed, 33 insertions(+), 70 deletions(-) >>> >>> diff --git a/qapi/block-core.json b/qapi/block-core.json >>> index 0d43d4f37c..7b23efcf13 100644 >>> --- a/qapi/block-core.json >>> +++ b/qapi/block-core.json >>> @@ -1315,32 +1315,23 @@ >>> 'data': { 'node': 'str', 'overlay': 'str' } } >>> >>> ## >>> -# @DriveBackup: >>> +# @BackupCommon: >>> # >>> # @job-id: identifier for the newly-created block job. If >>> # omitted, the device name will be used. (Since 2.7) >>> # >>> # @device: the device name or node-name of a root node which should be >>> copied. >>> # >>> -# @target: the target of the new image. If the file exists, or if it >>> -# is a device, the existing file/device will be used as the new >>> -# destination. If it does not exist, a new file will be created. >>> -# >>> -# @format: the format of the new destination, default is to >>> -# probe if @mode is 'existing', else the format of the source >>> -# >>> # @sync: what parts of the disk image should be copied to the destination >>> # (all the disk, only the sectors allocated in the topmost image, >>> from a >>> # dirty bitmap, or only new I/O). >> >> This is DriveBackup's wording. Blockdev lacks "from a dirty bitmap, ". >> Is this a doc fix? > > Yes.
Worth mentioning in the commit message? >>> # >>> -# @mode: whether and how QEMU should create a new image, default is >>> -# 'absolute-paths'. >>> -# >>> -# @speed: the maximum speed, in bytes per second >>> +# @speed: the maximum speed, in bytes per second. The default is 0, >>> +# for unlimited. >> >> This is Blockdev's wording. DriveBackup lacks "the default is 0, for >> unlimited." Is this a doc fix? > > Yes. Worth mentioning in the commit message? [...]