diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-02-25 09:05:41 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-02-25 09:05:41 +0000 |
| commit | 8a4c08b16187c238f05aa783c8deedb8099e940d (patch) | |
| tree | e9c9dda4a5f38ecaedaff289893d4e16bfb05c7d /qapi | |
| parent | 8eb29f1bf5a974dc4c11d2d1f5e7c7f7a62be116 (diff) | |
| parent | d8aec9d9f129e6879ae0669623981892deff86f2 (diff) | |
| download | qemu-8a4c08b16187c238f05aa783c8deedb8099e940d.zip qemu-8a4c08b16187c238f05aa783c8deedb8099e940d.tar.gz qemu-8a4c08b16187c238f05aa783c8deedb8099e940d.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190222-pull-request' into staging
ui: add support for -display spice-app
ui: gtk+sdl bugfixes.
# gpg: Signature made Fri 22 Feb 2019 07:53:13 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20190222-pull-request:
display: add -display spice-app launching a Spice client
spice: use a default name for the server
qapi: document DisplayType enum
build-sys: add gio-2.0 check
char: register spice ports after spice started
char: move SpiceChardev and open_spice_port() to spice.h header
spice: do not stop spice if VM is paused
spice: merge options lists
spice: avoid spice runtime assert
char/spice: discard write() if backend is disconnected
char/spice: trigger HUP event
ui/gtk: Fix the license information
sdl2: drop qemu_input_event_send_key_qcode call
spice: set device address and device display ID in QXL interface
kbd-state: don't block auto-repeat events
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/ui.json | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/qapi/ui.json b/qapi/ui.json index 7d9c4bd..c5d1d7f 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -1085,12 +1085,42 @@ # # Display (user interface) type. # +# @default: The default user interface, selecting from the first available +# of gtk, sdl, cocoa, and vnc. +# +# @none: No user interface or video output display. The guest will +# still see an emulated graphics card, but its output will not +# be displayed to the QEMU user. +# +# @gtk: The GTK user interface. +# +# @sdl: The SDL user interface. +# +# @egl-headless: No user interface, offload GL operations to a local +# DRI device. Graphical display need to be paired with +# VNC or Spice. (Since 3.1) +# +# @curses: Display video output via curses. For graphics device +# models which support a text mode, QEMU can display this +# output using a curses/ncurses interface. Nothing is +# displayed when the graphics device is in graphical mode or +# if the graphics device does not support a text +# mode. Generally only the VGA device models support text +# mode. +# +# @cocoa: The Cocoa user interface. +# +# @spice-app: Set up a Spice server and run the default associated +# application to connect to it. The server will redirect +# the serial console and QEMU monitors. (Since 4.0) +# # Since: 2.12 # ## { 'enum' : 'DisplayType', 'data' : [ 'default', 'none', 'gtk', 'sdl', - 'egl-headless', 'curses', 'cocoa' ] } + 'egl-headless', 'curses', 'cocoa', + 'spice-app'] } ## # @DisplayOptions: |