runqemu: Check gtk or sdl option is passed together with gl or gl-es options.

runqemu help reports that gtk or sdl option is needed with gl or gl-es
option. But if user forgot to add gtk or sdl option, then gl or gl-es
options were silently skipped.

Signed-off-by: Vasyl Vavrychuk <vvavrychuk@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 4d1e93d4bf013bb0c48032bfda43f77c5aba9ecf)
Signed-off-by: Steve Sakoman <steve@sakoman.com>

diff --git a/scripts/runqemu b/scripts/runqemu
index 310d79fdc5a8c2cb18f1bf804f29204b397b6ab0..398f0a0910a44972896d4f55a0f0f1ab215cd5a3 100755 (executable)
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -454,7 +454,8 @@ class BaseConfig(object):
                     self.qemu_opt_script += ' -display gtk'
             elif arg == 'gl' or arg == 'gl-es':
                 # These args are handled inside sdl or gtk blocks above
-                pass
+                if ('gtk' not in sys.argv) and ('sdl' not in sys.argv):
+                    raise RunQemuError('Option %s also needs gtk or sdl option.' % (arg))
             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),