diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-01-19 13:37:05 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-01-19 13:37:05 +0000 |
| commit | 74acb99737dbedd86654d660c0c20815139a873c (patch) | |
| tree | fc448d083e2ae57d7d3b7d8e361a2b052fabd2f3 /ui/vnc.c | |
| parent | 1e42c353469cb58ca4f3b450eea4211af7d0b147 (diff) | |
| parent | 877417d9ae6846bea4744b198131a5fe5117d7a5 (diff) | |
| download | focaccia-qemu-74acb99737dbedd86654d660c0c20815139a873c.tar.gz focaccia-qemu-74acb99737dbedd86654d660c0c20815139a873c.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20150119-1' into staging
ui: add shared surface format negotiation. # gpg: Signature made Mon 19 Jan 2015 12:47:36 GMT using RSA key ID D3E87138 # 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>" * remotes/kraxel/tags/pull-console-20150119-1: ui/sdl2: Support shared surface for more pixman formats ui/sdl: Support shared surface for more pixman formats ui/gtk: Support shared surface for most pixman formats ui/spice: Support shared surface for most pixman formats ui/vnc: Support shared surface for most pixman formats ui/pixman: add qemu_pixman_check_format ui: Add dpy_gfx_check_format() to check backend shared surface support ui: Make qemu_default_pixman_format() return 0 on unsupported formats Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/vnc.c')
| -rw-r--r-- | ui/vnc.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ui/vnc.c b/ui/vnc.c index 57070150d4..0385160a8b 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -2942,13 +2942,14 @@ static void vnc_listen_websocket_read(void *opaque) #endif /* CONFIG_VNC_WS */ static const DisplayChangeListenerOps dcl_ops = { - .dpy_name = "vnc", - .dpy_refresh = vnc_refresh, - .dpy_gfx_copy = vnc_dpy_copy, - .dpy_gfx_update = vnc_dpy_update, - .dpy_gfx_switch = vnc_dpy_switch, - .dpy_mouse_set = vnc_mouse_set, - .dpy_cursor_define = vnc_dpy_cursor_define, + .dpy_name = "vnc", + .dpy_refresh = vnc_refresh, + .dpy_gfx_copy = vnc_dpy_copy, + .dpy_gfx_update = vnc_dpy_update, + .dpy_gfx_switch = vnc_dpy_switch, + .dpy_gfx_check_format = qemu_pixman_check_format, + .dpy_mouse_set = vnc_mouse_set, + .dpy_cursor_define = vnc_dpy_cursor_define, }; void vnc_display_init(DisplayState *ds) |