diff options
| author | Stefan Hajnoczi | 2017-05-09 21:49:08 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi | 2017-05-09 21:49:14 +0200 |
| commit | 76d20ea0f1b26ebd5da2f5fb2fdf3250cde887bb (patch) | |
| tree | bcb0e4a8f29bdcfa0f5785a09608bff57a82107c /qapi/block-core.json | |
| parent | Merge remote-tracking branch 'aurel32/tags/pull-tcg-mips-20170506' into staging (diff) | |
| parent | qmp-shell: improve help (diff) | |
| download | qemu-76d20ea0f1b26ebd5da2f5fb2fdf3250cde887bb.tar.gz qemu-76d20ea0f1b26ebd5da2f5fb2fdf3250cde887bb.tar.xz qemu-76d20ea0f1b26ebd5da2f5fb2fdf3250cde887bb.zip | |
Merge remote-tracking branch 'armbru/tags/pull-qapi-2017-05-04-v3' into staging
QAPI patches for 2017-05-04
# gpg: Signature made Tue 09 May 2017 03:16:12 AM EDT
# gpg: using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* armbru/tags/pull-qapi-2017-05-04-v3: (28 commits)
qmp-shell: improve help
qmp-shell: don't show version greeting if unavailable
qmp-shell: Cope with query-commands error
qmp-shell: add -N option to skip negotiate
qmp-shell: add persistent command history
qobject-input-visitor: Catch misuse of end_struct vs. end_list
qapi: Document intended use of @name within alternate visits
qobject-input-visitor: Document full_name_nth()
qmp: Improve QMP dispatch error messages
sockets: Delete unused helper socket_address_crumple()
sockets: Limit SocketAddressLegacy to external interfaces
sockets: Rename SocketAddressFlat to SocketAddress
sockets: Rename SocketAddress to SocketAddressLegacy
qapi: New QAPI_CLONE_MEMBERS()
sockets: Prepare inet_parse() for flattened SocketAddress
sockets: Prepare vsock_parse() for flattened SocketAddress
test-qga: Actually test 0xff sync bytes
fdc-test: Avoid deprecated 'change' command
QemuOpts: Simplify qemu_opts_to_qdict()
block: Simplify bdrv_append_temp_snapshot() logic
...
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'qapi/block-core.json')
| -rw-r--r-- | qapi/block-core.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json index 87fb747ab6..614181b553 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2522,7 +2522,7 @@ { 'struct': 'BlockdevOptionsGluster', 'data': { 'volume': 'str', 'path': 'str', - 'server': ['SocketAddressFlat'], + 'server': ['SocketAddress'], '*debug': 'int', '*logfile': 'str' } } @@ -2634,7 +2634,7 @@ # Since: 2.9 ## { 'struct': 'BlockdevOptionsSheepdog', - 'data': { 'server': 'SocketAddressFlat', + 'data': { 'server': 'SocketAddress', 'vdi': 'str', '*snap-id': 'uint32', '*tag': 'str' } } @@ -2849,7 +2849,7 @@ # Since: 2.9 ## { 'struct': 'BlockdevOptionsNbd', - 'data': { 'server': 'SocketAddressFlat', + 'data': { 'server': 'SocketAddress', '*export': 'str', '*tls-creds': 'str' } } |