On Tue, 09/16 15:24, Stefan Hajnoczi wrote:
> diff --git a/qapi/block-core.json b/qapi/block-core.json
> index a685d02..56302c7 100644
> --- a/qapi/block-core.json
> +++ b/qapi/block-core.json
> @@ -197,7 +197,7 @@
> # 'file', 'file', 'ftp', 'ftps', 'host_cdrom', 'host_device',
> # 'host_floppy', 'http', 'https', 'nbd', 'parallels', 'qcow',
> # 'qcow2', 'raw', 'tftp', 'vdi', 'vmdk', 'vpc', 'vvfat'
> -# 2.2: 'archipelago'
> +# 2.2: 'archipelago' added, 'cow' dropped
> #
> # @backing_file: #optional the name of the backing file (for copy-on-write)
> #
> @@ -1149,7 +1149,7 @@
> { 'enum': 'BlockdevDriver',
> 'data': [ 'archipelago', 'file', 'host_device', 'host_cdrom',
> 'host_floppy',
> 'http', 'https', 'ftp', 'ftps', 'tftp', 'vvfat', 'blkdebug',
> - 'blkverify', 'bochs', 'cloop', 'cow', 'dmg', 'parallels', 'qcow',
> + 'blkverify', 'bochs', 'cloop', 'dmg', 'parallels', 'qcow',
> 'qcow2', 'qed', 'raw', 'vdi', 'vhdx', 'vmdk', 'vpc', 'quorum' ] }
>
> ##
> @@ -1491,7 +1491,6 @@
> 'blkverify': 'BlockdevOptionsBlkverify',
> 'bochs': 'BlockdevOptionsGenericFormat',
> 'cloop': 'BlockdevOptionsGenericFormat',
> - 'cow': 'BlockdevOptionsGenericCOWFormat',
> 'dmg': 'BlockdevOptionsGenericFormat',
> 'parallels': 'BlockdevOptionsGenericFormat',
> 'qcow': 'BlockdevOptionsGenericCOWFormat',
Have a conflict with "[PATCH v7 0/3] block: Introduce "null" drivers" which you
applied, where these lists are sorted alphabetically.
Otherwise looks good to me.
Thanks,
Fam
