mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

runqemu: decouple gtk and gl options

Browse Source 
This will allow not having to multiply these options for the sdl
frontend, instead combining them as needed.

(From OE-Core rev: 922eb5012364b1603338cfa617712b941e892bbf)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2019-09-12 17:36:42 +02:00
committed by Richard Purdie
parent f461ae8b4d
commit 63f08ef496
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/selftest/cases/runtime_test.py
+1 -1
View File
@@ -191,7 +191,7 @@ class TestImage(OESelftestTestCase):
features += 'TEST_SUITES = "ping ssh virgl"\n' features += 'TEST_SUITES = "ping ssh virgl"\n'
features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n' features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
features += 'IMAGE_INSTALL_append = " kmscube"\n' features += 'IMAGE_INSTALL_append = " kmscube"\n'
features += 'TEST_RUNQEMUPARAMS = "gtk-gl"\n' features += 'TEST_RUNQEMUPARAMS = "gtk gl"\n'
self.write_config(features) self.write_config(features)
bitbake('core-image-minimal') bitbake('core-image-minimal')
bitbake('-c testimage core-image-minimal') bitbake('-c testimage core-image-minimal')
scripts/runqemu
+14 -7
View File
@@ -65,9 +65,10 @@ of the following environment variables (in any order):
MACHINE - the machine name (optional, autodetected from KERNEL filename if unspecified) MACHINE - the machine name (optional, autodetected from KERNEL filename if unspecified)
Simplified QEMU command-line options can be passed with: Simplified QEMU command-line options can be passed with:
nographic - disable video console nographic - disable video console
sdl - choose the SDL frontend instead of the Gtk+ default sdl - choose the SDL UI frontend
gtk-gl - enable virgl-based GL acceleration using Gtk+ frontend gtk - choose the Gtk UI frontend
gtk-gl-es - enable virgl-based GL acceleration, using OpenGL ES and Gtk+ frontend gl - enable virgl-based GL acceleration (also needs gtk option)
gl-es - enable virgl-based GL acceleration, using OpenGL ES (also needs gtk option)
egl-headless - enable headless EGL output; use vnc or spice to see it egl-headless - enable headless EGL output; use vnc or spice to see it
serial - enable a serial console on /dev/ttyS0 serial - enable a serial console on /dev/ttyS0
serialstdio - enable a serial console on the console (regardless of graphics mode) serialstdio - enable a serial console on the console (regardless of graphics mode)
@@ -436,10 +437,16 @@ class BaseConfig(object):
self.kernel_cmdline_script += ' console=ttyS0' self.kernel_cmdline_script += ' console=ttyS0'
elif arg == 'sdl': elif arg == 'sdl':
self.qemu_opt_script += ' -display sdl' self.qemu_opt_script += ' -display sdl'
elif arg == 'gtk-gl': elif arg == 'gtk':
self.qemu_opt_script += ' -vga virtio -display gtk,gl=on' if 'gl' in sys.argv[1:]:
elif arg == 'gtk-gl-es': self.qemu_opt_script += ' -vga virtio -display gtk,gl=on'
self.qemu_opt_script += ' -vga virtio -display gtk,gl=es' elif 'gl-es' in sys.argv[1:]:
self.qemu_opt_script += ' -vga virtio -display gtk,gl=es'
else:
self.qemu_opt_script += ' -display gtk'
elif arg == 'gl' or arg == 'gl-es':
# These args are handled inside sdl or gtk blocks above
pass
elif arg == 'egl-headless': elif arg == 'egl-headless':
self.qemu_opt_script += ' -vga virtio -display egl-headless' self.qemu_opt_script += ' -vga virtio -display egl-headless'
# As runqemu can be run within bitbake (when using testimage, for example), # As runqemu can be run within bitbake (when using testimage, for example),