54639aed97
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
...
# gpg: Signature made Thu 02 Mar 2017 03:42:59 GMT
# gpg: using RSA key 0xBDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com >"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org >"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com >"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
block/rbd: add support for 'mon_host', 'auth_supported' via QAPI
block/rbd: add blockdev-add support
block/rbd: parse all options via bdrv_parse_filename
block/rbd: add all the currently supported runtime_opts
block/rbd: don't copy strings in qemu_rbd_next_tok()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org >
2017-03-02 23:20:37 +00:00
0a55679b4a
block/rbd: add support for 'mon_host', 'auth_supported' via QAPI
...
This adds support for three additional options that may be specified
by QAPI in blockdev-add:
server: host, port
auth method: either 'cephx' or 'none'
The "server" and "auth-supported" QAPI parameters are arrays. To conform
with the rados API, the array items are join as a single string with a ';'
character as a delimiter when setting the configuration values.
Reviewed-by: Markus Armbruster <armbru@redhat.com >
Signed-off-by: Jeff Cody <jcody@redhat.com >
2017-03-01 22:39:25 -05:00
0db832f42e
commit: Add filter-node-name to block-commit
...
Management tools need to be able to know about every node in the graph
and need a way to address them. Changing the graph structure was okay
because libvirt doesn't really manage the node level yet, but future
libvirt versions need to deal with both new and old version of qemu.
This new option to blockdev-commit allows the client to set a node-name
for the automatically inserted filter driver, and at the same time
serves as a witness for a future libvirt that this version of qemu does
automatically insert a filter driver.
Signed-off-by: Kevin Wolf <kwolf@redhat.com >
Acked-by: Fam Zheng <famz@redhat.com >
Reviewed-by: Max Reitz <mreitz@redhat.com >
2017-02-28 20:47:50 +01:00
6cdbceb12c
mirror: Add filter-node-name to blockdev-mirror
...
Management tools need to be able to know about every node in the graph
and need a way to address them. Changing the graph structure was okay
because libvirt doesn't really manage the node level yet, but future
libvirt versions need to deal with both new and old version of qemu.
This new option to blockdev-mirror allows the client to set a node-name
for the automatically inserted filter driver, and at the same time
serves as a witness for a future libvirt that this version of qemu does
automatically insert a filter driver.
Signed-off-by: Kevin Wolf <kwolf@redhat.com >
Reviewed-by: Max Reitz <mreitz@redhat.com >
Acked-by: Fam Zheng <famz@redhat.com >
2017-02-28 20:47:50 +01:00
8a47e8eb59
block/rbd: add blockdev-add support
...
Reviewed-by: Eric Blake <eblake@redhat.com >
Signed-off-by: Jeff Cody <jcody@redhat.com >
2017-02-28 11:32:40 -05:00
51654aa52a
iscsi: add missing colons to the qapi docs
...
The missing colons make the iscsi part of the documentation not render
quite as nicely, so add those in.
Signed-off-by: Jeff Cody <jcody@redhat.com >
2017-02-27 23:33:41 -05:00
b166099712
QAPI: Fix blockdev-add example documentation
...
Signed-off-by: Jeff Cody <jcody@redhat.com >
2017-02-21 10:37:46 -05:00
31eb1202d3
iscsi: Add blockdev-add support
...
This adds blockdev-add support for iscsi devices.
Reviewed-by: Daniel P. Berrange <berrange@redhat.com >
Reviewed-by: Fam Zheng <famz@redhat.com >
Signed-off-by: Kevin Wolf <kwolf@redhat.com >
Signed-off-by: Jeff Cody <jcody@redhat.com >
2017-02-21 10:37:34 -05:00
5d0c7f4f9e
qapi: Remove unwanted commas after #optional keyword
...
We don't want that commas to be part of the generated documentation,
so remove them.
Signed-off-by: Stefan Weil <sw@weilnetz.de >
Message-Id: <20170122145407.27476-1-sw@weilnetz.de >
Reviewed-by: Markus Armbruster <armbru@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-27 08:23:06 +01:00
11a3dee1b9
qmp-events: move 'BLOCK_JOB_READY' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:48 +01:00
af0e09106c
qmp-events: move 'BLOCK_JOB_ERROR' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:48 +01:00
e161df3939
qmp-events: move 'BLOCK_JOB_CANCELLED' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:48 +01:00
e21e65b212
qmp-events: move 'BLOCK_JOB_COMPLETED' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:48 +01:00
07c9f583d5
qmp-events: move 'BLOCK_IO_ERROR' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:48 +01:00
370d4eba7d
qmp-events: move 'BLOCK_IMAGE_CORRUPTED' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:48 +01:00
f6235a256f
qmp-commands: move 'blockdev-mirror' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:47 +01:00
bd77ea2e5a
qmp-commands: move 'x-blockdev-change' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:47 +01:00
e817862b17
qmp-commands: move 'block-set-write-threshold' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:46 +01:00
be3e83cb8a
qmp-commands: move 'blockdev-change-medium' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:46 +01:00
b480abf3b8
qmp-commands: move 'x-blockdev-insert-medium' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:46 +01:00
8e1c14295c
qmp-commands: move 'x-blockdev-remove-medium' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:46 +01:00
7f3c6f22da
qmp-commands: move 'blockdev-close-tray' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:46 +01:00
1133b1d674
qmp-commands: move 'blockdev-open-tray' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:46 +01:00
915a213f7a
qmp-commands: move 'x-blockdev-del' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:46 +01:00
b4749948c1
qmp-commands: move 'blockdev-add' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:46 +01:00
49b37c23c7
qmp-commands: move 'block-stream' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:46 +01:00
b4a0ac14e8
qmp-commands: move 'block_set_io_throttle' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:46 +01:00
73dffdc89f
qmp-commands: move 'block-dirty-bitmap-clear' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:46 +01:00
4bbca422a5
qmp-commands: move 'block-dirty-bitmap-remove' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:46 +01:00
2258a5dbbe
qmp-commands: move 'block-dirty-bitmap-add' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:46 +01:00
12a21b73cb
qmp-commands: move 'drive-mirror' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:46 +01:00
e1f34cb209
qmp-commands: move 'query-named-block-nodes' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:45 +01:00
1cf75113f8
qmp-commands: move 'blockdev-backup' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:45 +01:00
b03364126c
qmp-commands: move 'drive-backup' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:45 +01:00
f44fb58f35
qmp-commands: move 'block-commit' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:45 +01:00
280c4b3cf2
qmp-commands: move 'change-backing-file' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:45 +01:00
3282eca4ae
qmp-commands: move 'blockdev-snapshot' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:45 +01:00
b4039d8d23
qmp-commands: move 'blockdev-snapshot-sync' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:45 +01:00
0dc869cf70
qmp-commands: move 'block_resize' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:45 +01:00
91f96b643c
qmp-commands: move 'block_passwd' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:45 +01:00
f2eaea1884
qmp-commands: move 'query-blockstats' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:45 +01:00
978cceab03
qmp-commands: move 'query-block' doc to schema
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:19:45 +01:00
d3a48372a4
qapi: add some sections in docs
...
Add some more section titles to organize the documentation we're going
to generate.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Reviewed-by: Markus Armbruster <armbru@redhat.com >
Message-Id: <20170113144135.5150-10-marcandre.lureau@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:15:25 +01:00
7a305384e8
qapi: Move "command is experimental" notes down
...
Move these notes down and prefix with "Note:", to please the doc
generator we're going to add.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Message-Id: <20170113144135.5150-9-marcandre.lureau@redhat.com >
Reviewed-by: Markus Armbruster <armbru@redhat.com >
[Commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2017-01-16 09:15:25 +01:00
4230e5d128
qapi: Document introduction of gluster's 'debug' option
...
We intentionally renamed 'debug-level' to 'debug' in the QMP
schema for 'blockdev-add' related to gluster, in order to
match the command line (commit 1a417e460153d2feblake@redhat.com >
Message-id: 20161206182020.25736-1-eblake@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com >
2016-12-06 20:22:03 +00:00
8a04c80f9f
Merge remote-tracking branch 'jtc/tags/block-pull-request' into staging
...
# gpg: Signature made Mon 05 Dec 2016 09:30:45 PM GMT
# gpg: using RSA key 0xBDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com >"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org >"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com >"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* jtc/tags/block-pull-request:
qemu-doc: update gluster protocol usage guide
block/nfs: fix QMP to match debug option
block/gluster: fix QMP to match debug option
Message-id: 1480973521-28945-1-git-send-email-jcody@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com >
2016-12-06 09:55:57 +00:00
7103d9165b
block/nfs: fix QMP to match debug option
...
The QMP definition of BlockdevOptionsNfs:
{ 'struct': 'BlockdevOptionsNfs',
'data': { 'server': 'NFSServer',
'path': 'str',
'*user': 'int',
'*group': 'int',
'*tcp-syn-count': 'int',
'*readahead-size': 'int',
'*page-cache-size': 'int',
'*debug-level': 'int' } }
To make this consistent with other block protocols like gluster, lets
change s/debug-level/debug/
Suggested-by: Eric Blake <eblake@redhat.com >
Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com >
Reviewed-by: Eric Blake <eblake@redhat.com >
Signed-off-by: Jeff Cody <jcody@redhat.com >
2016-12-05 16:30:21 -05:00
1a417e46ae
block/gluster: fix QMP to match debug option
...
The QMP definition of BlockdevOptionsGluster:
{ 'struct': 'BlockdevOptionsGluster',
'data': { 'volume': 'str',
'path': 'str',
'server': ['GlusterServer'],
'*debug-level': 'int',
'*logfile': 'str' } }
But instead of 'debug-level we have exported 'debug' as the option for choosing
debug level of gluster protocol driver.
This patch fix QMP definition BlockdevOptionsGluster
s/debug-level/debug/
Suggested-by: Eric Blake <eblake@redhat.com >
Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com >
Reviewed-by: Eric Blake <eblake@redhat.com >
Signed-off-by: Jeff Cody <jcody@redhat.com >
2016-12-05 16:30:15 -05:00
5072f7b38b
qapi: add missing colon-ending for section name
...
The documentation parser we are going to add expects a section name to
end with ':', otherwise the comment is treated as free-form text body.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Message-Id: <20161117155504.21843-9-marcandre.lureau@redhat.com >
Reviewed-by: Markus Armbruster <armbru@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2016-12-05 17:41:38 +01:00
9f2a70e465
qapi: use one symbol per line
...
The documentation parser we are going to add only handles a single
symbol per line.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Message-Id: <20161117155504.21843-8-marcandre.lureau@redhat.com >
Reviewed-by: Markus Armbruster <armbru@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2016-12-05 17:41:38 +01:00
