Changes in tools/ew.py [ecf0a04b:13eecc4] in mainline

File:

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

tools/ew.py

@@ -57 +57 @@
 
 def termemu_detect():
-        emus = ['gnome-terminal', 'xfce4-terminal', 'xterm']
-        for termemu in emus:
+        for termemu in ['xfce4-terminal', 'xterm']:
                 try:
                         subprocess.check_output('which ' + termemu, shell = True)
@@ -65 +64 @@
                         pass
 
-        print('Could not find any of the terminal emulators %s.'%(emus))
-        sys.exit(1)
-
 def run_in_console(cmd, title):
-        temu = termemu_detect()
-        if temu == 'gnome-terminal':
-                cmdline = temu + ' -- ' + cmd
-        else:
-                ecmd = cmd.replace('"', '\\"')
-                cmdline = temu + ' -T ' + '"' + title + '"' + ' -e "' + ecmd + '"'
-
+        ecmd = cmd.replace('"', '\\"')
+        cmdline = termemu_detect() + ' -T ' + '"' + title + '"' + ' -e "' + ecmd + '"'
         print(cmdline)
         if not is_override('dryrun'):
@@ -96 +87 @@
 
 def malta_options():
-        return '-cpu 4Kc -append "console=devices/\\hw\\pci0\\00:0a.0\\com1\\a"'
-
-def find_firmware(name, environ_var, default_paths, extra_info=None):
-        """Find firmware image(s)."""
-
-        if environ_var in os.environ:
-                return os.environ[environ_var]
-
-        for path in default_paths:
-                if os.path.exists(path):
-                        return path
-
-        sys.stderr.write("Cannot find %s binary image(s)!\n" % name)
-        sys.stderr.write(
-            "Either set %s environment variable accordingly or place the image(s) in one of the default locations: %s.\n" %
-            (environ_var, ", ".join(default_paths)))
-        if extra_info is not None:
-                sys.stderr.write(extra_info)
-        return None
+        return '-cpu 4Kc'
 
 def platform_to_qemu_options(platform, machine, processor):
@@ -121 +94 @@
         elif platform == 'arm32':
                 return 'system-arm', '-M integratorcp'
-        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_GCC49/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)
@@ -151 +108 @@
                 if processor == 'us':
                         return 'system-sparc64', '-M sun4u --prom-env boot-args="console=devices/\\hw\\pci0\\01:01.0\\com1\\a"'
-
-                # processor = 'sun4v'
-                opensparc_bins = find_firmware(
-                    "OpenSPARC", 'OPENSPARC_BINARIES',
-                    ('/usr/local/opensparc/image/', ))
-                if opensparc_bins is None:
+                elif processor == 'sun4v':
+                        default_path = '/usr/local/opensparc/image/'
+                try:
+                        if os.path.exists(default_path):
+                                opensparc_bins = default_path
+                        elif os.path.exists(os.environ['OPENSPARC_BINARIES']):
+                                opensparc_bins = os.environ['OPENSPARC_BINARIES']
+                        else:
+                                raise Exception
+                except:
+                        print("Cannot find OpenSPARC binary images!")
+                        print("Either set OPENSPARC_BINARIES environment variable accordingly or place the images in %s." % (default_path))
                         raise Exception
 
@@ -245 +208 @@
                 cmdline += ' ' + options
 
-        if (not 'hdd' in cfg.keys() or cfg['hdd']):
-                cmdline += qemu_bd_options()
+        cmdline += qemu_bd_options()
+
         if (not 'net' in cfg.keys()) or cfg['net']:
                 cmdline += qemu_net_options()
@@ -271 +234 @@
         if cfg['image'] == 'image.iso':
                 cmdline += ' -boot d -cdrom image.iso'
-        elif cfg['image'] == 'image.iso@arm64':
-                # Define image.iso cdrom backend.
-                cmdline += ' -drive if=none,file=image.iso,id=cdrom,media=cdrom'
-                # Define scsi bus.
-                cmdline += ' -device virtio-scsi-device'
-                # Define cdrom frontend connected to this scsi bus.
-                cmdline += ' -device scsi-cd,drive=cdrom'
         elif cfg['image'] == 'image.boot':
                 cmdline += ' -kernel image.boot'
@@ -320 +276 @@
                         'xhci' : False,
                         'tablet' : False
-                }
-        },
-        'arm64' : {
-                'virt' : {
-                        'run' : qemu_run,
-                        'image' : 'image.iso@arm64',
-                        'audio' : False,
-                        'console' : True,
-                        'hdd' : False,
-                        'net' : False,
-                        'tablet' : False,
-                        'usb' : False,
-                        'xhci' : False
                 }
         },