[Qemu-commits] [qemu/qemu] dd154c: io: fix handling of EOF / error conditions in webs...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: dd154c4d9f48a44ad24e13f46033d0f10a05c923
      
https://github.com/qemu/qemu/commit/dd154c4d9f48a44ad24e13f46033d0f10a05c923
  Author: Daniel P. Berrangé <address@hidden>
  Date:   2019-03-20 (Wed, 20 Mar 2019)

  Changed paths:
    M io/channel-websock.c

  Log Message:
  -----------
  io: fix handling of EOF / error conditions in websock GSource

We were never reporting the G_IO_HUP event when an end of file was hit
on the websocket channel.

We also didn't report G_IO_ERR when we hit a fatal error processing the
websocket protocol.

The latter in particular meant that the chardev code would not notice
when an eof/error was encountered on the websocket channel, unless the
guest OS happened to trigger a write operation.

This meant that once the first client had quit, the chardev would never
listen to accept a new client.

Fixes launchpad bug 1816819
Acked-by: Stefano Garzarella <address@hidden>
Signed-off-by: Daniel P. Berrangé <address@hidden>


  Commit: 6532dcebb6160f94b6b278af5e73784164c669f6
      
https://github.com/qemu/qemu/commit/6532dcebb6160f94b6b278af5e73784164c669f6
  Author: Peter Maydell <address@hidden>
  Date:   2019-03-21 (Thu, 21 Mar 2019)

  Changed paths:
    M io/channel-websock.c

  Log Message:
  -----------
  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 <address@hidden>" [full]
# gpg:                 aka "Daniel P. Berrange <address@hidden>" [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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/62a172e6a77d...6532dcebb616