diff options
author | Peter Maydell | 2016-04-07 13:15:33 +0200 |
---|---|---|
committer | Peter Maydell | 2016-04-07 13:15:33 +0200 |
commit | e380023898479b57d38c0569c02f7bd41090181b (patch) | |
tree | 69074146889b2d4d05d871fde0fbfd43c63c383d /hw/misc/mips_itu.c | |
parent | Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into st... (diff) | |
parent | slirp: handle deferred ECONNREFUSED on non-blocking TCP sockets (diff) | |
download | qemu-e380023898479b57d38c0569c02f7bd41090181b.tar.gz qemu-e380023898479b57d38c0569c02f7bd41090181b.tar.xz qemu-e380023898479b57d38c0569c02f7bd41090181b.zip |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
slirp updates
# gpg: Signature made Thu 07 Apr 2016 12:02:23 BST using RSA key ID FB6B2F1D
# gpg: Good signature from "Samuel Thibault <samuel.thibault@gnu.org>"
# gpg: aka "Samuel Thibault <sthibault@debian.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: 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: F632 74CD C630 0873 CB3D 29D9 E3E5 1CE8 FB6B 2F1D
* remotes/thibault/tags/samuel-thibault:
slirp: handle deferred ECONNREFUSED on non-blocking TCP sockets
slirp: Propagate host TCP RST to the guest.
slirp: avoid use-after-free in slirp_pollfds_poll() if soread() returns an error
slirp: don't crash when tcp_sockclosed() is called with a NULL tp
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/mips_itu.c')
0 files changed, 0 insertions, 0 deletions