diff options
| author | Peter Maydell | 2019-03-21 10:33:11 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-03-21 10:33:11 +0100 |
| commit | 6532dcebb6160f94b6b278af5e73784164c669f6 (patch) | |
| tree | 631956f639cfeb4def77abda251511f9ee5e500a /hw/timer/lm32_timer.c | |
| parent | Update version for v4.0.0-rc0 release (diff) | |
| parent | io: fix handling of EOF / error conditions in websock GSource (diff) | |
| download | qemu-6532dcebb6160f94b6b278af5e73784164c669f6.tar.gz qemu-6532dcebb6160f94b6b278af5e73784164c669f6.tar.xz qemu-6532dcebb6160f94b6b278af5e73784164c669f6.zip | |
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>
Diffstat (limited to 'hw/timer/lm32_timer.c')
0 files changed, 0 insertions, 0 deletions