]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-201712151' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 15 Dec 2017 17:05:26 +0000 (17:05 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 15 Dec 2017 17:05:26 +0000 (17:05 +0000)
commit38d1b31e0501f938db39c5b2e508328530410246
treecdded47ccc82fdeecf7c0a6913c949385deb2118
parent57d1f6d7ce23e79a8ebe4a57bd2363b269b4664b
parent530473924d57fd26ba9779c8702574db4df829d3
Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-201712151' into staging

Merge qio 2017/12/15 v1

# gpg: Signature made Fri 15 Dec 2017 15:07:34 GMT
# 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-201712151:
  io: introduce a network socket listener API

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