virglrenderer: add a recipe
PATCH 1/13 virglrenderer: add a recipe
This component enables hardware-accelerated GL inside QEMU guests. For more information, see here:
https://lwn.net/Articles/767970/
https://www.collabora.com/news-and-blog/blog/2018/02/12/virtualizing-gpu-access/
https://www.collabora.com/news-and-blog/blog/2018/05/09/gpu-virtualization-update/
--- meta/conf/distro/include/maintainers.inc | 1 + .../0001-vtest-add-missing-includes.patch | 38 +++++++++++++++++++ .../virglrenderer/virglrenderer_git.bb | 19 ++++++++++ 3 files changed, 58 insertions(+) create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer_git.bb
meta/conf/distro/include/maintainers.inc +1 -0
@@ -700,6 +700,7 @@ RECIPE_MAINTAINER_pn-util-macros = "Armin Kuster <[email protected]>" RECIPE_MAINTAINER_pn-v86d = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-vala = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-valgrind = "Alexander Kanavin <[email protected]>" +RECIPE_MAINTAINER_pn-virglrenderer = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-volatile-binds = "Chen Qi <[email protected]>" RECIPE_MAINTAINER_pn-vte = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER_pn-vulkan = "Ross Burton <[email protected]>"
meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 05c5c5f43fbffb3317bd9da27d414890d2ef493c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 18 Jan 2019 13:47:23 +0100 +Subject: [PATCH] vtest: add missing includes + +This fixes build failures with musl C library + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/virgl/virglrenderer/merge_requests/125] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + vtest/util.c | 1 + + vtest/vtest_server.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/vtest/util.c b/vtest/util.c +index 0d3c78f..c605253 100644 +--- a/vtest/util.c ++++ b/vtest/util.c +@@ -26,6 +26,7 @@ + #include <stdio.h> + #include <string.h> + #include <unistd.h> ++#include <sys/select.h> + + int vtest_wait_for_fd_read(int fd) + { +diff --git a/vtest/vtest_server.c b/vtest/vtest_server.c +index bc6c95f..010721f 100644 +--- a/vtest/vtest_server.c ++++ b/vtest/vtest_server.c +@@ -31,6 +31,7 @@ + #include <netinet/in.h> + #include <sys/un.h> + #include <fcntl.h> ++#include <string.h> + + #include "util.h" + #include "vtest.h"
meta/recipes-graphics/virglrenderer/virglrenderer_git.bb new file +19 -0
@@ -0,0 +1,19 @@ +SUMMARY = "VirGL virtual OpenGL renderer" +HOMEPAGE = "https://virgil3d.github.io/" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" + +DEPENDS = "libdrm mesa libepoxy" +PV = "0.7.0" +SRCREV = "402c228861c9893f64cffbbcb4cb23044b8c721c" +SRC_URI = "git://anongit.freedesktop.org/virglrenderer \ + file://0001-vtest-add-missing-includes.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native nativesdk" +
Signature · 1 line
2.17.1
PATCH 2/13 qemu: enable virglrenderer and glx options for native/nativesdk builds
Except for ming32/darwin, which do not support them.
--- meta/recipes-devtools/qemu/qemu.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta/recipes-devtools/qemu/qemu.inc +5 -5
@@ -74,15 +74,15 @@ PACKAGECONFIG ??= " \ fdt sdl kvm \ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ " -PACKAGECONFIG_class-native ??= "fdt alsa kvm" -PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm" +PACKAGECONFIG_class-native ??= "fdt alsa kvm virglrenderer glx" +PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm virglrenderer glx" # Handle distros such as CentOS 5 32-bit that do not have kvm support PACKAGECONFIG_class-native_remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" -# Disable kvm on targets that do not support it -PACKAGECONFIG_remove_darwin = "kvm" -PACKAGECONFIG_remove_mingw32 = "kvm" +# Disable kvm/virgl/mesa on targets that do not support it +PACKAGECONFIG_remove_darwin = "kvm virglrenderer glx gtk+" +PACKAGECONFIG_remove_mingw32 = "kvm virglrenderer glx gtk+" PACKAGECONFIG[sdl] = "--enable-sdl --with-sdlabi=2.0,--disable-sdl,libsdl2" PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr,--disable-virtfs,libcap attr,"
Signature · 1 line
2.17.1
PATCH 3/13 qemu: drop --with-gtkabi option, as it is no longer supported
In reply to Alexander KanavinRecent qemu versions support gtk+3 only.
--- meta/recipes-devtools/qemu/qemu.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/qemu/qemu.inc +1 -1
@@ -95,7 +95,7 @@ PACKAGECONFIG[vnc-png] = "--enable-vnc --enable-vnc-png,--disable-vnc-png,libpng PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,libcurl," PACKAGECONFIG[nss] = "--enable-smartcard,--disable-smartcard,nss," PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses," -PACKAGECONFIG[gtk+] = "--enable-gtk --with-gtkabi=3.0 --enable-vte,--disable-gtk --disable-vte,gtk+3 vte" +PACKAGECONFIG[gtk+] = "--enable-gtk --enable-vte,--disable-gtk --disable-vte,gtk+3 vte" PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng," PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2," PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt,"
Signature · 1 line
2.17.1
PATCH 4/13 local.conf.sample: adjust the qemu config to enable gtk+ instead of sdl
In reply to Alexander Kanavin--- meta-poky/conf/local.conf.sample | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
meta-poky/conf/local.conf.sample +3 -6
@@ -236,12 +236,9 @@ BB_DISKMON_DIRS ??= "\ # Qemu configuration # # By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. By default libsdl2-native will -# be built, if you want to use your host's libSDL instead of the minimal libsdl built -# by libsdl2-native then uncomment the ASSUME_PROVIDED line below. -PACKAGECONFIG_append_pn-qemu-native = " sdl" -PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" -#ASSUME_PROVIDED += "libsdl2-native" +# seen. The two lines below enable the Gtk UI frontend. +PACKAGECONFIG_append_pn-qemu-native = " gtk+" +PACKAGECONFIG_append_pn-nativesdk-qemu = " gtk+" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if
Signature · 1 line
2.17.1
PATCH 5/13 qemu: build target variant with gtk+, and nativesdk variant without sdl
In reply to Alexander KanavinAs sdl is deprecated in favor of gtk+, it should not be the default.
--- meta/recipes-devtools/qemu/qemu.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/qemu/qemu.inc +2 -2
@@ -71,11 +71,11 @@ do_install_append() { # END of qemu-mips workaround PACKAGECONFIG ??= " \ - fdt sdl kvm \ + fdt gtk+ kvm \ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ " PACKAGECONFIG_class-native ??= "fdt alsa kvm virglrenderer glx" -PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm virglrenderer glx" +PACKAGECONFIG_class-nativesdk ??= "fdt kvm virglrenderer glx" # Handle distros such as CentOS 5 32-bit that do not have kvm support PACKAGECONFIG_class-native_remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
Signature · 1 line
2.17.1
PATCH 6/13 qemu: remove support for building against host sdl
In reply to Alexander KanavinThis hasn't been the default for a long time (as some distros don't support it), and with gtk+ being the new default shouldn't be needed at all.
--- meta/recipes-devtools/qemu/qemu.inc | 8 -------- 1 file changed, 8 deletions(-)
meta/recipes-devtools/qemu/qemu.inc +0 -8
@@ -39,14 +39,6 @@ export LIBTOOL="${HOST_SYS}-libtool" B = "${WORKDIR}/build" -do_configure_prepend_class-native() { - # Append build host pkg-config paths for native target since the host may provide sdl - BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "") - if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then - export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH - fi -} - do_configure() { ${S}/configure ${EXTRA_OECONF} }
Signature · 1 line
2.17.1
PATCH 7/13 qemu: add a gettext-native dependency to gtk option
In reply to Alexander Kanavinxgettext/msgmerge is used during do_install() when gtk is enabled:
https://github.com/qemu/qemu/blob/master/Makefile#L743
--- meta/recipes-devtools/qemu/qemu.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/qemu/qemu.inc +1 -1
@@ -87,7 +87,7 @@ PACKAGECONFIG[vnc-png] = "--enable-vnc --enable-vnc-png,--disable-vnc-png,libpng PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,libcurl," PACKAGECONFIG[nss] = "--enable-smartcard,--disable-smartcard,nss," PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses," -PACKAGECONFIG[gtk+] = "--enable-gtk --enable-vte,--disable-gtk --disable-vte,gtk+3 vte" +PACKAGECONFIG[gtk+] = "--enable-gtk --enable-vte,--disable-gtk --disable-vte,gtk+3 vte gettext-native" PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng," PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2," PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt,"
Signature · 1 line
2.17.1
PATCH 8/13 qemu: add a patch to avoid a missing definition error
In reply to Alexander Kanavin| In file included from /home/alexander/development/poky/build-virgl-gtk-64/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-qemu/3.1.0-r0/qemu-3.1.0/include/ui/egl-context.h:5, | from /home/alexander/development/poky/build-virgl-gtk-64/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-qemu/3.1.0-r0/qemu-3.1.0/ui/egl-context.c:3: | /home/alexander/development/poky/build-virgl-gtk-64/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-qemu/3.1.0-r0/qemu-3.1.0/include/ui/egl-helpers.h:46:55: error: unknown type name 'Window'; did you mean 'minor'? | EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win); | ^~~~~~ | minor
--- .../qemu/0001-Add-a-missing-X11-include.patch | 65 +++++++++++++++++++ ...x-libcap-header-issue-on-some-distro.patch | 2 +- ...-messages-when-qemi_cpu_kick_thread-.patch | 2 +- meta/recipes-devtools/qemu/qemu_3.1.0.bb | 1 + 4 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/qemu/qemu/0001-Add-a-missing-X11-include.patch
meta/recipes-devtools/qemu/qemu/0001-Add-a-missing-X11-include.patch new file +65 -0
@@ -0,0 +1,65 @@ +From eb1a215a4f86dde4493c3e22ad9f6d698850915e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Thu, 20 Dec 2018 18:06:29 +0100 +Subject: [PATCH] egl-helpers.h: do not depend on X11 Window type, use + EGLNativeWindowType + +It was assumed that mesa provides the necessary X11 includes, +but it is not always the case, as it can be configured without x11 support. + +Upstream-Status: Submitted [http://lists.nongnu.org/archive/html/qemu-devel/2019-01/msg03706.html] +Signed-off-by: Alexander Kanavin <[email protected]> + +--- + include/ui/egl-helpers.h | 2 +- + ui/egl-helpers.c | 4 ++-- + ui/gtk-egl.c | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h +index 9db7293b..3fc656a7 100644 +--- a/include/ui/egl-helpers.h ++++ b/include/ui/egl-helpers.h +@@ -43,7 +43,7 @@ void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf); + + #endif + +-EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win); ++EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, EGLNativeWindowType win); + + int qemu_egl_init_dpy_x11(EGLNativeDisplayType dpy, DisplayGLMode mode); + int qemu_egl_init_dpy_mesa(EGLNativeDisplayType dpy, DisplayGLMode mode); +diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c +index 4f475142..5e115b3f 100644 +--- a/ui/egl-helpers.c ++++ b/ui/egl-helpers.c +@@ -273,14 +273,14 @@ void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf) + + /* ---------------------------------------------------------------------- */ + +-EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win) ++EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, EGLNativeWindowType win) + { + EGLSurface esurface; + EGLBoolean b; + + esurface = eglCreateWindowSurface(qemu_egl_display, + qemu_egl_config, +- (EGLNativeWindowType)win, NULL); ++ win, NULL); + if (esurface == EGL_NO_SURFACE) { + error_report("egl: eglCreateWindowSurface failed"); + return NULL; +diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c +index 5420c236..1f941162 100644 +--- a/ui/gtk-egl.c ++++ b/ui/gtk-egl.c +@@ -54,7 +54,7 @@ void gd_egl_init(VirtualConsole *vc) + } + + vc->gfx.ectx = qemu_egl_init_ctx(); +- vc->gfx.esurface = qemu_egl_init_surface_x11(vc->gfx.ectx, x11_window); ++ vc->gfx.esurface = qemu_egl_init_surface_x11(vc->gfx.ectx, (EGLNativeWindowType)x11_window); + + assert(vc->gfx.esurface); + }
meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch +1 -1
@@ -1,4 +1,4 @@ -From 091a16100a7e1e9e6493663392c5ba2884b99723 Mon Sep 17 00:00:00 2001 +From d3e0b8dac7c2eb20d7fcff747bc98b981f4398ef Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Tue, 12 Mar 2013 09:54:06 +0800 Subject: [PATCH] fix libcap header issue on some distro
meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch +1 -1
@@ -1,4 +1,4 @@ -From 3eeeaa45dd12c9f3942cfc8647a08c93fffe19ea Mon Sep 17 00:00:00 2001 +From 861c522df7791d7e93743d5641f3ef2a5a3c4632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <[email protected]> Date: Wed, 12 Aug 2015 15:11:30 -0500 Subject: [PATCH] cpus.c: Add error messages when qemi_cpu_kick_thread fails.
meta/recipes-devtools/qemu/qemu_3.1.0.bb +1 -0
@@ -21,6 +21,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0009-apic-fixup-fallthrough-to-PIC.patch \ file://0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch \ + file://0001-Add-a-missing-X11-include.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
Signature · 1 line
2.17.1
PATCH 9/13 qemu: add environment variable wrappers to make qemu look good with gtk frontend
In reply to Alexander KanavinGTK_THEME instructs gtk to use its built-in theme. Otherwise gtk attempts to use the theme from the host, which may be from a totally mismatching gtk version.
On the other hand FONTCONFIG_PATH tells it to use the host fonts, as providing fonts in the native sysroot and instructing the components to use them is a lot more tricky.
GDK_PIXBUF_MODULE_FILE is set, because otherwise qemu works but fills stdout with error messages, which eventually fill the pipe they go into. That pipe is read from only when qemu exits (to collect any error messages) by runqemu script. The pipe fill-up causes the qemu process to lock up.
--- meta/recipes-devtools/qemu/qemu.inc | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
meta/recipes-devtools/qemu/qemu.inc +19 -0
@@ -48,6 +48,25 @@ do_install () { oe_runmake 'DESTDIR=${D}' install } +make_qemu_wrapper() { + gdk_pixbuf_module_file=`pkg-config --variable=gdk_pixbuf_cache_file gdk-pixbuf-2.0` + + for tool in `ls ${D}${bindir}/qemu-system-*`; do + create_wrapper $tool \ + GDK_PIXBUF_MODULE_FILE=$gdk_pixbuf_module_file \ + FONTCONFIG_PATH=/etc/fonts \ + GTK_THEME=Adwaita + done +} + +do_install_append_class-native() { + ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)} +} + +do_install_append_class-nativesdk() { + ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)} +} + # The following fragment will create a wrapper for qemu-mips user emulation # binary in order to work around a segmentation fault issue. Basically, by # default, the reserved virtual address space for 32-on-64 bit is set to 4GB.
Signature · 1 line
2.17.1
PATCH 10/13 qemu: add a backported patch to fix egl-headless support
In reply to Alexander Kanavin--- ...-egl-headless-add-egl_create_context.patch | 50 +++++++++++++++++++ meta/recipes-devtools/qemu/qemu_3.1.0.bb | 1 + 2 files changed, 51 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/0001-egl-headless-add-egl_create_context.patch
meta/recipes-devtools/qemu/qemu/0001-egl-headless-add-egl_create_context.patch new file +50 -0
@@ -0,0 +1,50 @@ +From 952e5d584f5aabe41298c278065fe628f3f7aa7a Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann <[email protected]> +Date: Thu, 29 Nov 2018 13:35:02 +0100 +Subject: [PATCH] egl-headless: add egl_create_context + +We must set the correct context (via eglMakeCurrent) before +calling qemu_egl_create_context, so we need a thin wrapper and can't +hook qemu_egl_create_context directly as ->dpy_gl_ctx_create callback. + +Reported-by: Frederik Carlier <[email protected]> +Signed-off-by: Gerd Hoffmann <[email protected]> +Message-id: [email protected] + +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=952e5d584f5aabe41298c278065fe628f3f7aa7a] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + ui/egl-headless.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/ui/egl-headless.c b/ui/egl-headless.c +index 4cf3bbc0e4..519e7bad32 100644 +--- a/ui/egl-headless.c ++++ b/ui/egl-headless.c +@@ -38,6 +38,14 @@ static void egl_gfx_switch(DisplayChangeListener *dcl, + edpy->ds = new_surface; + } + ++static QEMUGLContext egl_create_context(DisplayChangeListener *dcl, ++ QEMUGLParams *params) ++{ ++ eglMakeCurrent(qemu_egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, ++ qemu_egl_rn_ctx); ++ return qemu_egl_create_context(dcl, params); ++} ++ + static void egl_scanout_disable(DisplayChangeListener *dcl) + { + egl_dpy *edpy = container_of(dcl, egl_dpy, dcl); +@@ -150,7 +158,7 @@ static const DisplayChangeListenerOps egl_ops = { + .dpy_gfx_update = egl_gfx_update, + .dpy_gfx_switch = egl_gfx_switch, + +- .dpy_gl_ctx_create = qemu_egl_create_context, ++ .dpy_gl_ctx_create = egl_create_context, + .dpy_gl_ctx_destroy = qemu_egl_destroy_context, + .dpy_gl_ctx_make_current = qemu_egl_make_context_current, + .dpy_gl_ctx_get_current = qemu_egl_get_current_context, +-- +2.17.1 +
meta/recipes-devtools/qemu/qemu_3.1.0.bb +1 -0
@@ -22,6 +22,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch \ file://0001-Add-a-missing-X11-include.patch \ + file://0001-egl-headless-add-egl_create_context.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
Signature · 1 line
2.17.1
PATCH 11/13 runqemu: add options for enabling virgl GL acceleration
In reply to Alexander Kanavin--- scripts/runqemu | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
scripts/runqemu +23 -0
@@ -74,6 +74,9 @@ of the following environment variables (in any order): MACHINE - the machine name (optional, autodetected from KERNEL filename if unspecified) Simplified QEMU command-line options can be passed with: nographic - disable video console + gl - enable virgl-based GL acceleration + gl-es - enable virgl-based GL acceleration, using OpenGL ES + egl-headless - enable headless EGL output; use vnc or spice to see it serial - enable a serial console on /dev/ttyS0 serialstdio - enable a serial console on the console (regardless of graphics mode) slirp - enable user networking, no root privileges is required
@@ -433,6 +436,26 @@ class BaseConfig(object): elif arg == 'nographic': self.qemu_opt_script += ' -nographic' self.kernel_cmdline_script += ' console=ttyS0' + elif arg == 'gl': + self.qemu_opt_script += ' -vga virtio -display gtk,gl=on' + elif arg == 'gl-es': + self.qemu_opt_script += ' -vga virtio -display gtk,gl=es' + elif arg == 'egl-headless': + self.qemu_opt_script += ' -vga virtio -display egl-headless' + # As runqemu can be run within bitbake (when using testimage, for example), + # we need to ensure that we run host pkg-config, and that it does not + # get mis-directed to native build paths set by bitbake. + try: + del os.environ['PKG_CONFIG_PATH'] + del os.environ['PKG_CONFIG_DIR'] + del os.environ['PKG_CONFIG_LIBDIR'] + except KeyError: + pass + try: + dripath = subprocess.check_output("PATH=/bin:/usr/bin:$PATH pkg-config --variable=dridriverdir dri", shell=True) + except subprocess.CalledProcessError as e: + raise RunQemuError("Could not determine the path to dri drivers on the host via pkg-config.\nPlease install Mesa development files (particularly, dri.pc) on the host machine.") + os.environ['LIBGL_DRIVERS_PATH'] = dripath.decode('utf-8').strip() elif arg == 'serial': self.kernel_cmdline_script += ' console=ttyS0' self.serialconsole = True
Signature · 1 line
2.17.1
PATCH 12/13 runqemu: do not check for GL libraries
In reply to Alexander Kanavinqemu has been using libepoxy for a long time, and libepoxy loads GL via dlopen() only when instructed to.
--- scripts/runqemu | 35 ----------------------------------- 1 file changed, 35 deletions(-)
scripts/runqemu +0 -35
@@ -118,39 +118,6 @@ def check_tun(): if not os.access(dev_tun, os.W_OK): raise RunQemuError("TUN control device %s is not writable, please fix (e.g. sudo chmod 666 %s)" % (dev_tun, dev_tun)) -def check_libgl(qemu_bin): - cmd = ('ldd', qemu_bin) - logger.debug('Running %s...' % str(cmd)) - need_gl = subprocess.check_output(cmd).decode('utf-8') - if re.search('libGLU', need_gl): - # We can't run without a libGL.so - libgl = False - check_files = (('/usr/lib/libGL.so', '/usr/lib/libGLU.so'), \ - ('/usr/lib64/libGL.so', '/usr/lib64/libGLU.so'), \ - ('/usr/lib/*-linux-gnu/libGL.so', '/usr/lib/*-linux-gnu/libGLU.so')) - - for (f1, f2) in check_files: - if re.search('\*', f1): - for g1 in glob.glob(f1): - if libgl: - break - if os.path.exists(g1): - for g2 in glob.glob(f2): - if os.path.exists(g2): - libgl = True - break - if libgl: - break - else: - if os.path.exists(f1) and os.path.exists(f2): - libgl = True - break - if not libgl: - logger.error("You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator.") - logger.error("Ubuntu package names are: libgl1-mesa-dev and libglu1-mesa-dev.") - logger.error("Fedora package names are: mesa-libGL-devel mesa-libGLU-devel.") - raise RunQemuError('%s requires libGLU, but not found' % qemu_bin) - def get_first_file(cmds): """Return first file found in wildcard cmds""" for cmd in cmds:
@@ -1178,8 +1145,6 @@ class BaseConfig(object): if not os.access(qemu_bin, os.X_OK): raise OEPathError("No QEMU binary '%s' could be found" % qemu_bin) - check_libgl(qemu_bin) - self.qemu_opt = "%s %s %s %s" % (qemu_bin, self.get('NETWORK_CMD'), self.get('ROOTFS_OPTIONS'), self.get('QB_OPT_APPEND')) for ovmf in self.ovmf_bios:
Signature · 1 line
2.17.1
PATCH 13/13 selftest: add tests for virgl GL acceleration
In reply to Alexander KanavinNote that the tests require that the host machine has a X display, has mesa development files installed and is able to create OpenGL contexts.
--- meta-selftest/lib/oeqa/runtime/cases/virgl.py | 28 +++++++++++ meta/lib/oeqa/selftest/cases/runtime_test.py | 50 +++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 meta-selftest/lib/oeqa/runtime/cases/virgl.py
meta-selftest/lib/oeqa/runtime/cases/virgl.py new file +28 -0
@@ -0,0 +1,28 @@ +from oeqa.runtime.case import OERuntimeTestCase +from oeqa.core.decorator.depends import OETestDepends +import subprocess +import oe + +class VirglTest(OERuntimeTestCase): + + @OETestDepends(['ssh.SSHTest.test_ssh']) + def test_kernel_driver(self): + status, output = self.target.run('dmesg|grep virgl') + self.assertEqual(status, 0, "Checking for virgl driver in dmesg returned non-zero: %d\n%s" % (status, output)) + self.assertIn("virgl 3d acceleration enabled", output, "virgl acceleration seems to be disabled:\n%s" %(output)) + + @OETestDepends(['virgl.VirglTest.test_kernel_driver']) + def test_kmscube(self): + from fnmatch import fnmatch + + try: + distro = oe.lsb.distro_identifier() + except Exception: + distro = None + + if distro and fnmatch(distro, 'centos-7'): + self.skipTest('kmscube is not working when centos 7 is the host OS') + + status, output = self.target.run('kmscube', timeout=30) + self.assertEqual(status, 0, "kmscube exited with non-zero status %d and output:\n%s" %(status, output)) + self.assertIn('renderer: "virgl"', output, "kmscube does not seem to use virgl:\n%s" %(output))
meta/lib/oeqa/selftest/cases/runtime_test.py +50 -0
56 lines not on this page · raw message
Signature · 1 line
2.17.1