diff options
| author | Peter Maydell | 2018-03-12 15:06:23 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-03-12 15:06:23 +0100 |
| commit | b16a54da0696efc5d91b6c3597a37a317abb5de7 (patch) | |
| tree | cea71804106622cb5031ce6f4ac463a1621352fc /include/ui/console.h | |
| parent | Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180309a'... (diff) | |
| parent | qapi: Add device ID and head parameters to screendump (diff) | |
| download | qemu-b16a54da0696efc5d91b6c3597a37a317abb5de7.tar.gz qemu-b16a54da0696efc5d91b6c3597a37a317abb5de7.tar.xz qemu-b16a54da0696efc5d91b6c3597a37a317abb5de7.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180312-pull-request' into staging
gtk,spice: add dmabuf support.
sdl,vnc,gtk: bugfixes.
ui/qapi: add device ID and head parameters to screendump.
build: try improve handling of clang warnings.
# gpg: Signature made Mon 12 Mar 2018 09:13:28 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-20180312-pull-request:
qapi: Add device ID and head parameters to screendump
spice: add cursor_dmabuf support
spice: add scanout_dmabuf support
spice: drop dprint() debug logging
vnc: deal with surface NULL pointers
ui/gtk-egl: add cursor_dmabuf support
ui/gtk-egl: add scanout_dmabuf support
ui/gtk: use GtkGlArea on wayland only
ui/opengl: Makefile cleanup
ui/gtk: group gtk.mo declarations in Makefile
ui/gtk: make GtkGlArea usage a runtime option
sdl: workaround bug in sdl 2.0.8 headers
make: switch language file build to be gtk module aware
build: try improve handling of clang warnings
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/ui/console.h')
| -rw-r--r-- | include/ui/console.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index aae9e44cb3..5fca9afcbc 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -260,6 +260,8 @@ DisplaySurface *qemu_create_displaysurface_guestmem(int width, int height, pixman_format_code_t format, int linesize, uint64_t addr); +DisplaySurface *qemu_create_message_surface(int w, int h, + const char *msg); PixelFormat qemu_default_pixelformat(int bpp); DisplaySurface *qemu_create_displaysurface(int width, int height); |