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

File:

• tools/ew.py (modified) (14 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:
@@ -139 +144 @@
                 return 'system-x86_64', pc_options(64)
         elif platform == 'arm32':
-                return 'system-arm', '-M integratorcp'
+                if machine == 'integratorcp':
+                        return 'system-arm', '-M integratorcp'
+                elif machine == 'raspberrypi':
+                        return 'system-arm', '-M raspi1ap'
         elif platform == 'arm64':
-                # Search for the EDK2 firmware image
-                default_paths = (
-                        '/usr/local/qemu-efi-aarch64/QEMU_EFI.fd', # Custom
-                        '/usr/share/edk2/aarch64/QEMU_EFI.fd',     # Fedora
-                        '/usr/share/qemu-efi-aarch64/QEMU_EFI.fd', # Ubuntu
-                )
-                extra_info = ("Pre-compiled binary can be obtained from "
-                    "http://snapshots.linaro.org/components/kernel/leg-virt-tianocore-edk2-upstream/latest/QEMU-AARCH64/RELEASE_GCC5/QEMU_EFI.fd.\n")
-                efi_path = find_firmware(
-                    "EDK2", 'EW_QEMU_EFI_AARCH64', default_paths, extra_info)
-                if efi_path is None:
-                        raise Exception
-
-                return 'system-aarch64', \
-                    '-M virt -cpu cortex-a57 -m 1024 -bios %s' % efi_path
+                if machine == 'virt':
+                        # Search for the EDK2 firmware image
+                        default_paths = (
+                                '/usr/local/qemu-efi-aarch64/QEMU_EFI.fd', # Custom
+                                '/usr/share/edk2/aarch64/QEMU_EFI.fd',     # Fedora
+                                '/usr/share/qemu-efi-aarch64/QEMU_EFI.fd', # Ubuntu
+                        )
+                        extra_info = ("Pre-compiled binary can be obtained from "
+                            "http://snapshots.linaro.org/components/kernel/leg-virt-tianocore-edk2-upstream/latest/QEMU-AARCH64/RELEASE_GCC5/QEMU_EFI.fd.\n")
+                        efi_path = find_firmware(
+                            "EDK2", 'EW_QEMU_EFI_AARCH64', default_paths, extra_info)
+                        if efi_path is None:
+                                raise Exception
+
+                        return 'system-aarch64', \
+                            '-M virt -cpu cortex-a57 -m 1024 -bios %s' % efi_path
         elif platform == 'ia32':
                 return 'system-i386', pc_options(32)
@@ -169 +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'
@@ -256 +268 @@
         suffix, options = platform_to_qemu_options(platform, machine, processor)
         cmd = 'qemu-' + suffix
-
-        if cpus:
-        cmd += ' -smp cpus=' + cpus + ' '
 
         cmdline = cmd
@@ -284 +293 @@
         if (is_override('nographic')):
                 cmdline += ' -nographic'
+                console = True
 
         if (not console and (not is_override('nographic')) and not is_override('noserial')):
@@ -302 +312 @@
         elif cfg['image'] == 'image.boot':
                 cmdline += ' -kernel image.boot'
+        elif cfg['image'] == 'kernel.img@rpi':
+                cmdline += ' -bios boot/image.boot.bin'
         else:
                 cmdline += ' ' + cfg['image']
@@ -324 +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):
@@ -342 +354 @@
                         'xhci' : False,
                         'tablet' : False
-                }
+                },
+                'raspberrypi' : {
+                        'run' : qemu_run,
+                        'image' : 'kernel.img@rpi',
+                        'audio' : False,
+                        'console' : True,
+                        'hdd' : False,
+                        'net' : False,
+                        'tablet' : False,
+                        'usb' : False,
+                        'xhci' : False
+                },
         },
         'arm64' : {
@@ -396 +419 @@
                                 'image' : 'image.iso',
                                 'audio' : False,
-                                'console' : True,
+                                'console' : False,
                                 'net' : False,
                                 'usb' : False,
@@ -404 +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,
@@ -422 +448 @@
 def usage():
         print("%s - emulator wrapper for running HelenOS\n" % os.path.basename(sys.argv[0]))
-        print("%s [$] [-d] [-h] [-net e1k|rtl8139|ne2k|virtio-net] [-hdd ata|virtio-blk] [-nohdd] [-nokvm] [-nonet] [-nosnd] [-nousb] [-noxhci] [-notablet]\n" %
+        print("%s [-d] [-h] [-net e1k|rtl8139|ne2k|virtio-net] [-hdd ata|virtio-blk] [-nohdd] [-nokvm] [-nonet] [-nosnd] [-nousb] [-noxhci] [-notablet]\n" %
             os.path.basename(sys.argv[0]))
-        print("$\t to run multiple($) cpus")
         print("-d\tDry run: do not run the emulation, just print the command line.")
         print("-h\tPrint the usage information and exit.")
@@ -446 +471 @@
         expect_hdd = False
         expect_qemu = False
-        global cpus
-    cpus = ''
 
         for i in range(1, len(sys.argv)):
@@ -488 +511 @@
                         usage()
                         exit()
-                elif sys.argv[i].isdigit():
-            cpus = sys.argv[i]
                 elif sys.argv[i] == '-d':
                         overrides['dryrun'] = True