From 377a6ffbcba0d3c5ede470c989756c4d1636873f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 26 Aug 2020 08:57:50 +0100 Subject: 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. Signed-off-by: Richard Purdie --- scripts/runqemu | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scripts') diff --git a/scripts/runqemu b/scripts/runqemu index 7fb5f7db57..c71f3c4df5 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -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': -- cgit 1.2.3-korg