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 1a417e46 ). However, since
'debug-level' was visible in 2.7, that means that we should
document that 'debug' was not available until 2.8.
The change was intentional because 'blockdev-add' itself
underwent incompatible changes (such as commit 0153d2f ) for
the same release; our intent is that after 2.8, these
interfaces will now be stable. [In hindsight, we should have
used the name x-blockdev-add when we first introduced it]
Signed-off-by: Eric Blake <eblake@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
4d5c8bc42f
qapi: fix various symbols mismatch in documentation
...
There are various mismatch:
- invalid symbols
- section and member symbols mismatch
- enum or union values vs 'type'
The documentation parser catches all these cases.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Message-Id: <20161117155504.21843-7-marcandre.lureau@redhat.com >
Reviewed-by: Markus Armbruster <armbru@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2016-12-05 17:41:37 +01:00
c5927e7abf
qapi: fix missing symbol @prefix
...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Reviewed-by: Eric Blake <eblake@redhat.com >
Message-Id: <20161117155504.21843-6-marcandre.lureau@redhat.com >
Reviewed-by: Markus Armbruster <armbru@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2016-12-05 17:41:37 +01:00
49687ace02
qapi: fix schema symbol sections
...
According to docs/qapi-code-gen.txt, there needs to be '##' to start a
and end a symbol section, that's also what the documentation parser
expects.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com >
Reviewed-by: Eric Blake <eblake@redhat.com >
Message-Id: <20161117155504.21843-5-marcandre.lureau@redhat.com >
Reviewed-by: Markus Armbruster <armbru@redhat.com >
Signed-off-by: Markus Armbruster <armbru@redhat.com >
2016-12-05 17:41:37 +01:00
23dce3873f
block/curl: Drop TFTP "support"
...
Because TFTP does not support byte ranges, it was never usable with our
curl block driver. Since apparently nobody has ever complained loudly
enough for someone to take care of the issue until now, it seems
reasonable to assume that nobody has ever actually used it.
Therefore, it should be safe to just drop it from curl's protocol list.
[Jeff Cody: Below is additional summary pulled, with some rewording,
from followup emails between Max and Markus, to explain what
worked and what didn't]
TFTP would sometimes work, to a limited extent, for images <= the curl
"readahead" size, so long as reads started at offset zero. By default,
that readahead size is 256KB.
Reads starting at a non-zero offset would also have returned data from a
zero offset. It can become more complicated still, with mixed reads at
zero offset and non-zero offsets, due to data buffering.
In short, TFTP could only have worked before in very specific scenarios
with unrealistic expectations and constraints.
Signed-off-by: Max Reitz <mreitz@redhat.com >
Reviewed-by: Kevin Wolf <kwolf@redhat.com >
Reviewed-by: Jeff Cody <jcody@redhat.com >
Message-id: 20161102175539.4375-4-mreitz@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com >
2016-11-14 22:47:34 -05:00
05fce20d6d
qapi: add release designator to gluster logfile option
...
The "logfile" option to BlockdevOptionsGluster will not be in
QEMU until 2.8. Update comment to indicate this.
Reported-by: Eric Blake <eblake@redhat.com >
Signed-off-by: Jeff Cody <jcody@redhat.com >
2016-11-01 07:55:57 -04:00
aa2623d817
qapi: allow blockdev-add for NFS
...
Introduce new object 'BlockdevOptionsNFS' in qapi/block-core.json to
support blockdev-add for NFS network protocol driver. Also make a new
struct NFSServer to support tcp connection.
Signed-off-by: Ashijeet Acharya <ashijeetacharya@gmail.com >
Signed-off-by: Kevin Wolf <kwolf@redhat.com >
2016-10-31 16:52:39 +01:00