From: Peter Maydell Date: Fri, 7 Feb 2020 15:01:23 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/berrange/tags/misc-fixes-pull-request' into... X-Git-Tag: qemu-xen-4.14.0~155 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=42ccca1bd9456568f996d5646b2001faac96944b;p=qemu-xen.git 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 " [full] # gpg: aka "Daniel P. Berrange " [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 --- 42ccca1bd9456568f996d5646b2001faac96944b