From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 21 Mar 2019 09:33:11 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/berrange/tags/qio-next-pull-request' into staging
X-Git-Tag: v4.0.0-rc1~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6532dcebb6160f94b6b278af5e73784164c669f6;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/berrange/tags/qio-next-pull-request' into staging

Merge I/O patch queue

Fix problem with end of file handling with websock channels

# gpg: Signature made Wed 20 Mar 2019 16:57:15 GMT
# gpg:                using RSA key BE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" [full]
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>" [full]
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/qio-next-pull-request:
  io: fix handling of EOF / error conditions in websock GSource

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

6532dcebb6160f94b6b278af5e73784164c669f6