From: Stefan Hajnoczi Date: Tue, 2 May 2017 14:16:20 +0000 (+0100) Subject: Merge remote-tracking branch 'sthibault/tags/samuel-thibault' into staging X-Git-Tag: v2.10.0-rc0~220 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e619b14746e5d8c0e53061661fd0e1da01fd4d60;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'sthibault/tags/samuel-thibault' into staging slirp updates # gpg: Signature made Sat 29 Apr 2017 05:45:24 PM BST # gpg: using RSA key 0xB0A51BF58C9179C5 # gpg: Good signature from "Samuel Thibault " # gpg: aka "Samuel Thibault " # gpg: aka "Samuel Thibault " # gpg: aka "Samuel Thibault " # gpg: aka "Samuel Thibault " # gpg: aka "Samuel Thibault " # gpg: aka "Samuel Thibault " # 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 * sthibault/tags/samuel-thibault: slirp: VMStatify remaining except for loop slirp: VMStatify socket level slirp: Common lhost/fhost union slirp: VMStatify sbuf slirp: VMState conversion; tcpcb slirp: fix pinging the virtual ipv4 DNS server slirp: tftp, copy sockaddr_size slirp/smb: Replace constant strings by glib string slirp: allow host port 0 for hostfwd Signed-off-by: Stefan Hajnoczi --- e619b14746e5d8c0e53061661fd0e1da01fd4d60