runqemu: Show an error for conflicting graphics options

The autobuilder managed to pass the nographic option with "sdl gl" due
to a problem elsewhere. It would have been useful for runqemu to have
errored rather than passing conflicting options to qemu. Add an
error for this invalid usecase.

(From OE-Core rev: 377a6ffbcba0d3c5ede470c989756c4d1636873f)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2020-08-26 08:57:50 +01:00
parent 5713f5d7c8
commit ee98c6ab03

View File

@ -456,6 +456,10 @@ class BaseConfig(object):
if arg in self.fstypes + self.vmtypes + self.wictypes:
self.check_arg_fstype(arg)
elif arg == 'nographic':
if ('sdl' in sys.argv):
raise RunQemuError('Option nographic makes no sense alongside the sdl option.' % (arg))
if ('gtk' in sys.argv):
raise RunQemuError('Option nographic makes no sense alongside the gtk option.' % (arg))
self.qemu_opt_script += ' -nographic'
self.kernel_cmdline_script += ' console=ttyS0'
elif arg == 'sdl':