On 10/01/2013 07:20 AM, Kevin Wolf wrote: > For examples see the changes to qmp-commands.hx. > > Signed-off-by: Kevin Wolf <kw...@redhat.com> > --- > blockdev.c | 57 ++++++++++++++ > qapi-schema.json | 236 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++ > qmp-commands.hx | 59 ++++++++++++++ > 3 files changed, 352 insertions(+) >
> +# @BlockdevOptionsVVFAT
> +#
> +# Driver specific block device options for the vvfat protocol.
> +#
> +# @dir: directory to be exported as FAT image
> +# @fat-type: #optional FAT type: 12, 16 or 32
> +# @floppy: #optional whether to export a floppy image (true) or
> +# partitioned hard disk (false; default)
> +# @rw: #optional whether to allow write operations (default: false)
Aligned across multiple options...
> +# @BlockdevOptionsGenericFormat
> +#
> +# Driver specific block device options for image format that have no option
> +# besides their data source.
> +#
> +# @file: reference to or definition of the data source block device
...nothing to compare to here (but aligned with other commands)...
> +# @BlockdevOptionsGenericCOWFormat
> +#
> +# Driver specific block device options for image format that have no option
> +# besides their data source and an optional backing file.
> +#
> +# @backing: #optional reference to or definition of the backing file
> block
> +# device (if missing, taken from the image file content). It is
> +# allowed to pass an empty string here in order to disable the
> +# default backing file.
...and again...
> +# Driver specific block device options for qcow2.
> +#
> +# @lazy-refcounts: #optional whether to enable the lazy refcounts feature
> +# (default is taken from the image file)
> +#
> +# @pass-discard-request: #optional whether discard requests to the qcow2
> device
> +# should be forwarded to the data source
...but here, using exactly one space (different alignment per option).
I honestly don't care which style you use. And while it looks odd
having two different styles in the same patch, it really doesn't matter
to me, so I'm not asking for a respin just for this (then again, you
already have a fix needed in the C code).
> +SQMP
> +blockdev-add
> +------------
> +
> +Add a block device.
> +
> +Arguments:
> +
> +- "options": block driver options
> +
> +Example (1):
> +
> +-> { "execute": "blockdev-add",
> + "arguments": { "options" : { "driver": "qcow2",
> + "file": { "driver": "file",
> + "filename": "test.qcow2" } } } }
> +<- { "return": {} }
> +
> +Example (2):
> +
> +-> { "execute": "blockdev-add",
> + "arguments": {
> + "options": {
> + "driver": "qcow2",
> + "id": "my_disk",
> + "discard": "unmap",
> + "throttling": {
> + "bps-total": 1234567,
> + "iops-write": 100
> + },
Drop throttling, as it is no longer in the qapi.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
