From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 4 Apr 2017 15:25:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-04-04-1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fa902c8ca0f3b83e0e3dda1e9e00f0b1d28e718a;p=qemu.git

Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-04-04-1' into staging

Merge qio 2017/04/04 v1

# gpg: Signature made Tue 04 Apr 2017 16:17:56 BST
# gpg:                using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/pull-qio-2017-04-04-1:
  io: fix FD socket handling in DNS lookup
  io: fix incoming client socket initialization

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

fa902c8ca0f3b83e0e3dda1e9e00f0b1d28e718a