[Qemu-devel] [PULL 0/1] ui: egl-headless requires dmabuf support

[Qemu-devel] [PULL 0/1] ui: egl-headless requires dmabuf support

[Gerd Hoffmann]

  Hi,

Little single-patch pull request to fix a build issue.

please pull,
  Gerd

The following changes since commit 56821559f0ba682fe6b367815572e6f974d329ab:

  Merge remote-tracking branch 'dgilbert/tags/pull-hmp-20170517' into staging (2017-05-18 13:36:15 +0100)

are available in the git repository at:

  git://git.kraxel.org/qemu tags/pull-ui-20170519-1

for you to fetch changes up to 371ec54e9f8415cd74af45acdcf67b413f50cce5:

  ui: egl-headless requires dmabuf support (2017-05-19 10:46:00 +0200)

----------------------------------------------------------------
ui: egl-headless requires dmabuf support

----------------------------------------------------------------
Gerd Hoffmann (1):
      ui: egl-headless requires dmabuf support

 vl.c             | 4 ++--
 ui/Makefile.objs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

[Qemu-devel] [PULL 1/1] ui: egl-headless requires dmabuf support

[Gerd Hoffmann]

Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20170517122744.3541-1-kraxel@redhat.com
---
 vl.c             | 4 ++--
 ui/Makefile.objs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vl.c b/vl.c
index 1512df6e9e..ca4a5d679c 100644
--- a/vl.c
+++ b/vl.c
@@ -2129,7 +2129,7 @@ static DisplayType select_display(const char *p)
             exit(1);
         }
     } else if (strstart(p, "egl-headless", &opts)) {
-#ifdef CONFIG_OPENGL
+#ifdef CONFIG_OPENGL_DMABUF
         request_opengl = 1;
         display_opengl = 1;
         display = DT_EGL;
@@ -4668,7 +4668,7 @@ int main(int argc, char **argv, char **envp)
         qemu_spice_display_init();
     }
 
-#ifdef CONFIG_OPENGL
+#ifdef CONFIG_OPENGL_DMABUF
     if (display_type == DT_EGL) {
         egl_headless_init();
     }
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index aac6ae8bef..3369451285 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -33,7 +33,7 @@ common-obj-y += shader.o
 common-obj-y += console-gl.o
 common-obj-y += egl-helpers.o
 common-obj-y += egl-context.o
-common-obj-y += egl-headless.o
+common-obj-$(CONFIG_OPENGL_DMABUF) += egl-headless.o
 ifeq ($(CONFIG_GTK_GL),y)
 common-obj-$(CONFIG_GTK) += gtk-gl-area.o
 else
-- 
2.9.3

Re: [Qemu-devel] [PULL 0/1] ui: egl-headless requires dmabuf support

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 1104 bytes --]

On Fri, May 19, 2017 at 10:48:29AM +0200, Gerd Hoffmann wrote:
>   Hi,
> 
> Little single-patch pull request to fix a build issue.
> 
> please pull,
>   Gerd
> 
> The following changes since commit 56821559f0ba682fe6b367815572e6f974d329ab:
> 
>   Merge remote-tracking branch 'dgilbert/tags/pull-hmp-20170517' into staging (2017-05-18 13:36:15 +0100)
> 
> are available in the git repository at:
> 
>   git://git.kraxel.org/qemu tags/pull-ui-20170519-1
> 
> for you to fetch changes up to 371ec54e9f8415cd74af45acdcf67b413f50cce5:
> 
>   ui: egl-headless requires dmabuf support (2017-05-19 10:46:00 +0200)
> 
> ----------------------------------------------------------------
> ui: egl-headless requires dmabuf support
> 
> ----------------------------------------------------------------
> Gerd Hoffmann (1):
>       ui: egl-headless requires dmabuf support
> 
>  vl.c             | 4 ++--
>  ui/Makefile.objs | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 

Thanks, applied to my staging tree:
https://github.com/stefanha/qemu/commits/staging

Stefan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]