Commit 1da90c34 authored Feb 29, 2016 by Peter Maydell

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>

parents 3ff430aa e220656c

MAINTAINERS

+2 −0

Original line number	Diff line number	Diff line
		@@ -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>

include/ui/spice-display.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"