diff options
| author | Peter Maydell | 2017-02-26 17:38:40 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-02-26 17:38:40 +0100 |
| commit | 685783c5b69c83c942d1fc21679311eeb8f79ab9 (patch) | |
| tree | 04700b926fcc7db734a9a046f961af22c70ec1fd /include/hw/virtio | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | slirp: tcp_listen(): Don't try to close() an fd we never opened (diff) | |
| download | qemu-685783c5b69c83c942d1fc21679311eeb8f79ab9.tar.gz qemu-685783c5b69c83c942d1fc21679311eeb8f79ab9.tar.xz qemu-685783c5b69c83c942d1fc21679311eeb8f79ab9.zip | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
slirp updates
# gpg: Signature made Sun 26 Feb 2017 14:40:00 GMT
# gpg: using RSA key 0xB0A51BF58C9179C5
# gpg: Good signature from "Samuel Thibault <samuel.thibault@aquilenet.fr>"
# gpg: aka "Samuel Thibault <sthibault@debian.org>"
# gpg: aka "Samuel Thibault <samuel.thibault@gnu.org>"
# gpg: aka "Samuel Thibault <samuel.thibault@inria.fr>"
# gpg: aka "Samuel Thibault <samuel.thibault@labri.fr>"
# gpg: aka "Samuel Thibault <samuel.thibault@ens-lyon.org>"
# gpg: aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82 304B D017 8C76 7D06 9EE6
# Subkey fingerprint: AEBF 7448 FAB9 453A 4552 390E B0A5 1BF5 8C91 79C5
* remotes/thibault/tags/samuel-thibault:
slirp: tcp_listen(): Don't try to close() an fd we never opened
slirp: Convert mbufs to use g_malloc() and g_free()
slirp: Check qemu_socket() return value in udp_listen()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/virtio')
0 files changed, 0 insertions, 0 deletions