From: Peter Maydell Date: Thu, 21 Jan 2016 12:09:41 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-socket-20160120-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a953853ebab4b42506099156275525fc757f6c30;p=qemu.git 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) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " * 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 --- a953853ebab4b42506099156275525fc757f6c30