[Qemu-commits] [qemu/qemu] c64e1e: io/channel-websock: treat 'binary' and no sub-prot...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: c64e1e75381d0cb53f9fc8f93245a933b12c68a6
      
https://github.com/qemu/qemu/commit/c64e1e75381d0cb53f9fc8f93245a933b12c68a6
  Author: Yu-Chen Lin <address@hidden>
  Date:   2020-02-07 (Fri, 07 Feb 2020)

  Changed paths:
    M io/channel-websock.c

  Log Message:
  -----------
  io/channel-websock: treat 'binary' and no sub-protocol as the same

noVNC doesn't use 'binary' protocol by default after
commit c912230309806aacbae4295faf7ad6406da97617.

It will cause qemu return 400 when handshaking.

To overcome this problem and remain compatibility of
older noVNC client.

We treat 'binary' and no sub-protocol as the same
so that we can support different version of noVNC
client.

Tested on noVNC before c912230 and after c912230.

Buglink: https://bugs.launchpad.net/qemu/+bug/1849644

Signed-off-by: Yu-Chen Lin <address@hidden>
Signed-off-by: Daniel P. Berrangé <address@hidden>


  Commit: 834e8bf17c067bbc00e4034b10cec98eef363431
      
https://github.com/qemu/qemu/commit/834e8bf17c067bbc00e4034b10cec98eef363431
  Author: Jafar Abdi <address@hidden>
  Date:   2020-02-07 (Fri, 07 Feb 2020)

  Changed paths:
    M authz/listfile.c

  Log Message:
  -----------
  authz: fix usage of bool in listfile.c

Clean up wrong usage of FALSE and TRUE in places that use "bool" from stdbool.h.

FALSE and TRUE (with capital letters) are the constants defined by glib for
being used with the "gboolean" type of glib. But some parts of the code also use
TRUE and FALSE for variables that are declared as "bool" (the type from 
<stdbool.h>).

Signed-off-by: Jafar Abdi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrangé <address@hidden>


  Commit: 416b71906edfcf280ef31d0e5e607898330b6271
      
https://github.com/qemu/qemu/commit/416b71906edfcf280ef31d0e5e607898330b6271
  Author: Daniel P. Berrangé <address@hidden>
  Date:   2020-02-07 (Fri, 07 Feb 2020)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  docs: stop documenting the e1000 NIC model as the default

The default NIC model for QEMU varies per machine type, and is liable to
change across machine type versions. Documenting e1000 NIC as the
default for PC/i386 is thus misleading to users at best. In particular
the PC q35 machine type switched to use e1000e, but only in machine
type versions after 2.11.

Rather than try to explain which NIC model is used for each machine
type version, remove mention of e1000 as the default, and steer users
towards always specifying their desired model.

Reviewed-by: Thomas Huth <address@hidden>
Reviewed by: Aleksandar Markovic <address@hidden>
Signed-off-by: Daniel P. Berrangé <address@hidden>


  Commit: 42ccca1bd9456568f996d5646b2001faac96944b
      
https://github.com/qemu/qemu/commit/42ccca1bd9456568f996d5646b2001faac96944b
  Author: Peter Maydell <address@hidden>
  Date:   2020-02-07 (Fri, 07 Feb 2020)

  Changed paths:
    M authz/listfile.c
    M io/channel-websock.c
    M qemu-options.hx

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/berrange/tags/misc-fixes-pull-request' 
into staging

Misc fixes

* Use correct constants for 'bool' type
* Fix compatibility with noVNC in websocket impl
* Remove inaccurate docs aout default NIC model

# gpg: Signature made Fri 07 Feb 2020 12:23:53 GMT
# gpg:                using RSA key DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF
# 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/misc-fixes-pull-request:
  docs: stop documenting the e1000 NIC model as the default
  authz: fix usage of bool in listfile.c
  io/channel-websock: treat 'binary' and no sub-protocol as the same

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/b6bef1147f0f...42ccca1bd945