summary refs log tree commit diff stats
path: root/scripts/tracetool/format
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-07-14 16:13:29 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-14 16:13:30 +0100
commit23f87b9973b3755f0e8acd38be7087b7cc601cbe (patch)
treecfb6712059dac606006356618d91d951356b7fe1 /scripts/tracetool/format
parentfbc8ea1ed0704b0cd393e5dc429816a36cb5ed05 (diff)
parent563a3987b980a36e6941720a99d5cf36960f78ea (diff)
downloadfocaccia-qemu-23f87b9973b3755f0e8acd38be7087b7cc601cbe.tar.gz
focaccia-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 'scripts/tracetool/format')
0 files changed, 0 insertions, 0 deletions