mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-12-12 05:18:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160229-1' into staging

Browse Source 
ui: spice dmabuf fix, MAINTAINERS updates.

# gpg: Signature made Mon 29 Feb 2016 10:41:15 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-ui-20160229-1:
  MAINTAINERS: Add an entry for the include/ui/ folder
  MAINTAINERS: Add spice-display.h to the SPICE section
  spice/gl: Enable dmabuf only for spice >= 0.13.1

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
2016-02-29 11:49:50 +00:00
parent 3ff430aa91 e220656ce1
commit 1da90c34c9
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@@ -1087,6 +1087,7 @@ SPICE
M: Gerd Hoffmann <kraxel@redhat.com> M: Gerd Hoffmann <kraxel@redhat.com>
S: Supported S: Supported
F: include/ui/qemu-spice.h F: include/ui/qemu-spice.h
F: include/ui/spice-display.h
F: ui/spice-*.c F: ui/spice-*.c
F: audio/spiceaudio.c F: audio/spiceaudio.c
F: hw/display/qxl* F: hw/display/qxl*
@@ -1095,6 +1096,7 @@ Graphics
M: Gerd Hoffmann <kraxel@redhat.com> M: Gerd Hoffmann <kraxel@redhat.com>
S: Odd Fixes S: Odd Fixes
F: ui/ F: ui/
F: include/ui/
Cocoa graphics Cocoa graphics
M: Andreas Färber <andreas.faerber@web.de> M: Andreas Färber <andreas.faerber@web.de>

2
include/ui/spice-display.h
View File

@@ -25,7 +25,7 @@
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#if defined(CONFIG_OPENGL_DMABUF) #if defined(CONFIG_OPENGL_DMABUF)
# if SPICE_SERVER_VERSION >= 0x000d00 /* release 0.13.0 */ # if SPICE_SERVER_VERSION >= 0x000d01 /* release 0.13.1 */
# define HAVE_SPICE_GL 1 # define HAVE_SPICE_GL 1
# include "ui/egl-helpers.h" # include "ui/egl-helpers.h"
# include "ui/egl-context.h" # include "ui/egl-context.h"