From: Peter Maydell Date: Thu, 13 Oct 2016 13:27:58 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20161013-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6aa5a3679449cdf0b6fe5a6829b22e642ded57fd;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20161013-1' into staging ui: vnc cleanups, input-linux kbd fix. # gpg: Signature made Thu 13 Oct 2016 09:47:43 BST # gpg: using RSA key 0x4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/pull-ui-20161013-1: input-linux: initialize key state ui: rename vnc_init_state to vnc_start_protocol ui: move some initialization out of vnc_init_state ui: remove bogus call to reset_keys() in vnc_init_state ui: remove bogus call to graphic_hw_update() in vnc_listen_io ui: refactor method for setting up VncDisplay auth types ui: rename misleading 'VncDisplay' variables ui: remove 'ws_tls' field from VncState ui: remove 'enabled' and 'ws_enabled' fields from VncState ui: remove misleading comment from vnc_init_state Signed-off-by: Peter Maydell --- 6aa5a3679449cdf0b6fe5a6829b22e642ded57fd