diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-01-21 12:09:41 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-01-21 12:09:41 +0000 |
| commit | a953853ebab4b42506099156275525fc757f6c30 (patch) | |
| tree | a1152ada1a5baf777884f5e0a7ff5689f569924b /MAINTAINERS | |
| parent | 1cf81ea2e2ecfd2ec046e2b409e75e87808ac4d0 (diff) | |
| parent | 3f0230e926b45905efb597824f59fdf5a4f3da08 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-socket-20160120-1' into staging
Convert qemu-socket to use QAPI exclusively, update MAINTAINERS.
# gpg: Signature made Wed 20 Jan 2016 06:49:07 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-socket-20160120-1:
vnc: distiguish between ipv4/ipv6 omitted vs set to off
sockets: remove use of QemuOpts from socket_dgram
sockets: remove use of QemuOpts from socket_connect
sockets: remove use of QemuOpts from socket_listen
sockets: remove use of QemuOpts from header file
add MAINTAINERS entry for qemu socket code
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4030e2749d..7865145ea2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1260,6 +1260,14 @@ F: io/ F: include/io/ F: tests/test-io-* +Sockets +M: Daniel P. Berrange <berrange@redhat.com> +M: Gerd Hoffmann <kraxel@redhat.com> +M: Paolo Bonzini <pbonzini@redhat.com> +S: Maintained +F: include/qemu/sockets.h +F: util/qemu-sockets.c + Usermode Emulation ------------------ Overall |