diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-15 18:53:07 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-15 18:53:07 +0000 |
| commit | 58888f8cdd198affa454f9bf664a076f5f63a6a6 (patch) | |
| tree | 6ac4f771973b9fabff6cd147008fad248cc683c2 /qapi | |
| parent | 55901900ec69d6fd6f332003d8ab81b2f8a38529 (diff) | |
| parent | 0935700f8544033ebbd41e1f13cd528f8a58d24d (diff) | |
| download | qemu-58888f8cdd198affa454f9bf664a076f5f63a6a6.zip qemu-58888f8cdd198affa454f9bf664a076f5f63a6a6.tar.gz qemu-58888f8cdd198affa454f9bf664a076f5f63a6a6.tar.bz2 | |
Merge remote-tracking branch 'remotes/berrange/tags/socket-next-pull-request' into staging
# gpg: Signature made Tue 13 Mar 2018 18:12:14 GMT
# gpg: using RSA key BE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/socket-next-pull-request:
char: allow passing pre-opened socket file descriptor at startup
char: refactor parsing of socket address information
sockets: allow SocketAddress 'fd' to reference numeric file descriptors
sockets: check that the named file descriptor is a socket
sockets: move fd_is_socket() into common sockets code
sockets: strengthen test suite IP protocol availability checks
sockets: pull code for testing IP availability out of specific test
cutils: add qemu_strtoi & qemu_strtoui parsers for int/unsigned int types
char: don't silently skip tn3270 protocol init when TLS is enabled
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/sockets.json | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/qapi/sockets.json b/qapi/sockets.json index ac022c6..fc81d8d 100644 --- a/qapi/sockets.json +++ b/qapi/sockets.json @@ -123,6 +123,13 @@ # # @unix: Unix domain socket # +# @vsock: VMCI address +# +# @fd: decimal is for file descriptor number, otherwise a file descriptor name. +# Named file descriptors are permitted in monitor commands, in combination +# with the 'getfd' command. Decimal file descriptors are permitted at +# startup or other contexts where no monitor context is active. +# # Since: 2.9 ## { 'enum': 'SocketAddressType', |