diff options
| author | Peter Maydell | 2016-01-21 13:09:41 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-01-21 13:09:41 +0100 |
| commit | a953853ebab4b42506099156275525fc757f6c30 (patch) | |
| tree | a1152ada1a5baf777884f5e0a7ff5689f569924b /include/hw/arm/virt.h | |
| parent | Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20160119.0' i... (diff) | |
| parent | vnc: distiguish between ipv4/ipv6 omitted vs set to off (diff) | |
| download | qemu-a953853ebab4b42506099156275525fc757f6c30.tar.gz qemu-a953853ebab4b42506099156275525fc757f6c30.tar.xz qemu-a953853ebab4b42506099156275525fc757f6c30.zip | |
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 'include/hw/arm/virt.h')
0 files changed, 0 insertions, 0 deletions