summary refs log tree commit diff stats
path: root/hw/arm/virt.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-10-13 14:27:58 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-10-13 14:27:58 +0100
commit6aa5a3679449cdf0b6fe5a6829b22e642ded57fd (patch)
treefca8e8a96ad2b9aa5a6bf10ce6295d636c87a467 /hw/arm/virt.c
parent692d88b4085559f1254d0e04d64a849ce8ab5932 (diff)
parent2a57c55f26f7ba6dcea6d01ef74bae7069150f6f (diff)
downloadfocaccia-qemu-6aa5a3679449cdf0b6fe5a6829b22e642ded57fd.tar.gz
focaccia-qemu-6aa5a3679449cdf0b6fe5a6829b22e642ded57fd.zip
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) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# 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 <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/virt.c')
0 files changed, 0 insertions, 0 deletions