Changes in tools/ew.py [06f10ac:c35cc8b] in mainline

File:

• tools/ew.py (modified) (7 diffs)

tools/ew.py

@@ -76 +76 @@
 
 def termemu_detect():
-        emus = ['gnome-terminal', 'xfce4-terminal', 'xterm']
+        emus = ['gnome-terminal', 'foot', 'xfce4-terminal', 'xterm']
+
+        if 'TERMINAL' in os.environ:
+                emus.insert(0, os.environ['TERMINAL'])
+
         for termemu in emus:
                 try:
-                        subprocess.check_output('which ' + termemu, shell = True)
+                        subprocess.check_output('which ' + termemu, shell = True, stderr = subprocess.STDOUT)
                         return termemu
                 except:
@@ -89 +93 @@
 def run_in_console(cmd, title):
         temu = termemu_detect()
-        if temu == 'gnome-terminal':
+
+        if os.path.basename(temu.split(' ')[0]) in ['gnome-terminal', 'foot']:
                 cmdline = temu + ' -- ' + cmd
         else:
@@ -173 +178 @@
                         raise Exception
                 if processor == 'us':
-                        return 'system-sparc64', '-M sun4u --prom-env boot-args="console=devices/\\hw\\pci0\\01:01.0\\com1\\a"'
+                        cmdline = '-M sun4u'
+                        if is_override('nographic'):
+                            cmdline += ' --prom-env boot-args="console=devices/\\hw\\pci0\\01:01.0\\com1\\a"'
+                        return 'system-sparc64', cmdline
 
                 # processor = 'sun4v'
@@ -285 +293 @@
         if (is_override('nographic')):
                 cmdline += ' -nographic'
+                console = True
 
         if (not console and (not is_override('nographic')) and not is_override('noserial')):
@@ -327 +336 @@
 def msim_run(platform, machine, processor):
         hdisk_mk()
-        run_in_console('msim -c ' + TOOLS_DIR + '/conf/msim.conf', 'HelenOS/mips32 on msim')
+        run_in_console('msim -n -c ' + TOOLS_DIR + '/conf/msim.conf', 'HelenOS/mips32 on msim')
 
 def spike_run(platform, machine, processor):
@@ -410 +419 @@
                                 'image' : 'image.iso',
                                 'audio' : False,
-                                'console' : True,
+                                'console' : False,
                                 'net' : False,
                                 'usb' : False,
@@ -418 +427 @@
                         'sun4v' : {
                                 'run' : qemu_run,
-                                'image' : '-drive if=pflash,readonly=on,file=image.iso',
+                                # QEMU 8.0.0 ignores the 'file' argument and instead uses 'id',
+                                # which defaults to 'pflash0', but can be changed to the same value
+                                # as 'file'
+                                'image' : '-drive if=pflash,id=image.iso,readonly=on,file=image.iso',
                                 'audio' : False,
                                 'console' : True,