On 02/27/2017 12:58 PM, Jeff Cody wrote: > Signed-off-by: Jeff Cody <jc...@redhat.com> > --- > qapi/block-core.json | 34 +++++++++++++++++++++++++++++++--- > 1 file changed, 31 insertions(+), 3 deletions(-) > > diff --git a/qapi/block-core.json b/qapi/block-core.json > index 5f82d35..5b311ff 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -2111,6 +2111,7 @@ > # @replication: Since 2.8 > # @ssh: Since 2.8 > # @iscsi: Since 2.9 > +# @rbd: Since 2.9 > # > # Since: 2.0 > ## > @@ -2120,7 +2121,7 @@ > 'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs', > 'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed', > 'quorum', 'raw', 'replication', 'ssh', 'vdi', 'vhdx', 'vmdk', > - 'vpc', 'vvfat' ] } > + 'vpc', 'vvfat', 'rbd' ] }
Please keep the list alphabetical.
>
> ##
> # @BlockdevOptionsFile:
> @@ -2376,7 +2377,6 @@
> 'path': 'str',
> '*user': 'str' } }
>
> -
> ##
> # @BlkdebugEvent:
> #
Spurious hunk?
> @@ -2666,6 +2666,34 @@
> '*timeout': 'int' } }
>
> ##
> +# @BlockdevOptionsRbd:
> +#
> +# @pool: Ceph pool name.
> +#
> +# @image: Image name in the Ceph pool.
> +#
> +# @conf: # optional path to Ceph configuration file. Values
No space between # and optional
> +# in the configuration file will be overridden by
> +# options specified via QAPI.
> +#
> +# @snapshot: #optional Ceph snapshot name.
> +#
> +# @user: #optional Ceph id name.
> +#
> +# @password-secret: #optional The ID of a QCryptoSecret object providing
> +# the password for the login.
Indentation off?
> +#
> +# Since: 2.9
> +##
> +{ 'struct': 'BlockdevOptionsRbd',
> + 'data': { 'pool': 'str',
> + 'image': 'str',
> + '*conf': 'str',
> + '*snapshot': 'str',
> + '*user': 'str',
> + '*password-secret': 'str' } }
> +
> +##
> # @ReplicationMode:
> #
> # An enumeration of replication modes.
> @@ -2863,7 +2891,7 @@
> 'qed': 'BlockdevOptionsGenericCOWFormat',
> 'quorum': 'BlockdevOptionsQuorum',
> 'raw': 'BlockdevOptionsRaw',
> -# TODO rbd: Wait for structured options
> + 'rbd': 'BlockdevOptionsRbd',
> 'replication':'BlockdevOptionsReplication',
> # TODO sheepdog: Wait for structured options
> 'ssh': 'BlockdevOptionsSsh',
>
Omits the problematic keyvalue-pairs, and otherwise matches the previous
patches. With the nits fixed,
Reviewed-by: Eric Blake <ebl...@redhat.com>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
