diff options
| author | Peter Maydell | 2017-07-14 17:13:29 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-07-14 17:13:30 +0200 |
| commit | 23f87b9973b3755f0e8acd38be7087b7cc601cbe (patch) | |
| tree | cfb6712059dac606006356618d91d951356b7fe1 /tests/display-vga-test.c | |
| parent | Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20170714' into s... (diff) | |
| parent | io: preserve ipv4/ipv6 flags when resolving InetSocketAddress (diff) | |
| download | qemu-23f87b9973b3755f0e8acd38be7087b7cc601cbe.tar.gz qemu-23f87b9973b3755f0e8acd38be7087b7cc601cbe.tar.xz qemu-23f87b9973b3755f0e8acd38be7087b7cc601cbe.zip | |
Merge remote-tracking branch 'remotes/berrange/tags/pull-sockets-2017-07-11-3' into staging
Merge sockets 2017/07/11 v3
# gpg: Signature made Fri 14 Jul 2017 16:09:03 BST
# gpg: using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/pull-sockets-2017-07-11-3:
io: preserve ipv4/ipv6 flags when resolving InetSocketAddress
sockets: ensure we don't accept IPv4 clients when IPv4 is disabled
sockets: don't block IPv4 clients when listening on "::"
sockets: ensure we can bind to both ipv4 & ipv6 separately
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/display-vga-test.c')
0 files changed, 0 insertions, 0 deletions