summary refs log tree commit diff stats
path: root/include/hw/acpi/tpm.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-02-20 14:05:00 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-02-20 14:05:00 +0000
commita6e0344fa0e09413324835ae122c4cadd7890231 (patch)
tree29c7a1a860a9d8e5f30a4fc92fa86a448b13ca74 /include/hw/acpi/tpm.h
parentb487e2b2ff6e9fff8a45a9600d6de3a7bf82666a (diff)
parent63ad932567df012ff4bf820a9ed0e2affd9dc5af (diff)
downloadfocaccia-qemu-a6e0344fa0e09413324835ae122c4cadd7890231.tar.gz
focaccia-qemu-a6e0344fa0e09413324835ae122c4cadd7890231.zip
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180220-pull-request' into staging
ui: reorganize and cleanup display command line parsing.
gtk: fix gtk3 warnings.

# gpg: Signature made Tue 20 Feb 2018 13:46:53 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# 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/ui-20180220-pull-request:
  ui: Reorder vte terminal packing to avoid gtk3 warnings
  vl: drop display_type variable
  vl: drop request_opengl variable
  vl: drop full_screen variable
  cocoa: use DisplayOptions
  curses: use DisplayOptions
  egl-headless: use DisplayOptions
  vl: drop no_quit variable
  sdl: use DisplayOptions
  gtk: add and use DisplayOptions + DisplayGTK
  vl: rename DisplayType to LegacyDisplayType
  vl: deprecate -no-frame

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/acpi/tpm.h')
0 files changed, 0 insertions, 0 deletions