diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-29 11:49:50 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-29 11:49:50 +0000 |
| commit | 1da90c34c9e76e0f4fa9faaa670518443b9bda9c (patch) | |
| tree | b7395db1b80ce9eb9634f77e0b3807545e54e0a6 | |
| parent | 3ff430aa91f33388cce88d81edcad8b2ac5a7a9f (diff) | |
| parent | e220656ce1bd98b482d12ef51344aa46aca4e098 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160229-1' into staging
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>
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | include/ui/spice-display.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index caa5260e7c..09cc19cf47 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1087,6 +1087,7 @@ SPICE M: Gerd Hoffmann <kraxel@redhat.com> S: Supported F: include/ui/qemu-spice.h +F: include/ui/spice-display.h F: ui/spice-*.c F: audio/spiceaudio.c F: hw/display/qxl* @@ -1095,6 +1096,7 @@ Graphics M: Gerd Hoffmann <kraxel@redhat.com> S: Odd Fixes F: ui/ +F: include/ui/ Cocoa graphics M: Andreas Färber <andreas.faerber@web.de> diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h index 69a222b543..30ccfe3dab 100644 --- a/include/ui/spice-display.h +++ b/include/ui/spice-display.h @@ -25,7 +25,7 @@ #include "sysemu/sysemu.h" #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 # include "ui/egl-helpers.h" # include "ui/egl-context.h" |