summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2022-04-14 19:37:10 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-15 17:30:34 +0100
commitd3f246413b205ea2004b826723e0b5581ecf202a (patch)
treef5c506e550d3bedf94f0bf199e3a9dd22e766210
parent24c743fe66cd78ecf8facaf6de8584d7513a03ee (diff)
downloadpoky-d3f246413b205ea2004b826723e0b5581ecf202a.tar.gz
runqemu: Do not auto detect graphics if publicvnc is specified
The graphics option auto detection logic added in 7f78bb7a was not checking if the publicvnc option had been specified, meaning that it would be ignored and the auto detection result used instead. Add setting a flag variable in the argument parsing and check it along with the ones for the other graphics backend options. (From OE-Core rev: 4b73b55c2d258768cda2bf7262ebb36bcb7fed5b) Signed-off-by: Scott Murray <scott.murray@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/runqemu4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 36af764b1b..6e1f073ed2 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -182,6 +182,7 @@ class BaseConfig(object):
182 self.gl = False 182 self.gl = False
183 self.gl_es = False 183 self.gl_es = False
184 self.egl_headless = False 184 self.egl_headless = False
185 self.publicvnc = False
185 self.novga = False 186 self.novga = False
186 self.cleantap = False 187 self.cleantap = False
187 self.saved_stty = '' 188 self.saved_stty = ''
@@ -521,6 +522,7 @@ class BaseConfig(object):
521 elif arg == 'snapshot': 522 elif arg == 'snapshot':
522 self.snapshot = True 523 self.snapshot = True
523 elif arg == 'publicvnc': 524 elif arg == 'publicvnc':
525 self.publicvnc = True
524 self.qemu_opt_script += ' -vnc :0' 526 self.qemu_opt_script += ' -vnc :0'
525 elif arg.startswith('tcpserial='): 527 elif arg.startswith('tcpserial='):
526 self.tcpserial_portnum = '%s' % arg[len('tcpserial='):] 528 self.tcpserial_portnum = '%s' % arg[len('tcpserial='):]
@@ -1366,7 +1368,7 @@ class BaseConfig(object):
1366 # If we have no display option, we autodetect based upon what qemu supports. We 1368 # If we have no display option, we autodetect based upon what qemu supports. We
1367 # need our font setup and show-cusor below so we need to see what qemu --help says 1369 # need our font setup and show-cusor below so we need to see what qemu --help says
1368 # is supported so we can pass our correct config in. 1370 # is supported so we can pass our correct config in.
1369 if not self.nographic and not self.sdl and not self.gtk and not self.egl_headless == True: 1371 if not self.nographic and not self.sdl and not self.gtk and not self.publicvnc and not self.egl_headless == True:
1370 output = subprocess.check_output([self.qemu_bin, "--help"], universal_newlines=True) 1372 output = subprocess.check_output([self.qemu_bin, "--help"], universal_newlines=True)
1371 if "-display gtk" in output: 1373 if "-display gtk" in output:
1372 self.gtk = True 1374 self.gtk = True