Changes in tools/ew.py [f5ceb18:8a26f82] in mainline

File:

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

tools/ew.py

@@ -34 +34 @@
 
 import os 
-import sys
 import subprocess 
 import autotool
 import platform
 
-overrides = {}
-
-def is_override(str):
-        if str in overrides.keys():
-                return overrides[str]
-        return False
-
-def cfg_get(platform, machine):
-        if machine == "":
-                return emulators[platform]
-        else:
-                return emulators[platform][machine]
-
 def run_in_console(cmd, title):
         cmdline = 'xterm -T ' + '"' + title + '"' + ' -e ' + cmd
         print(cmdline)
-        if not is_override('dryrun'):
-                subprocess.call(cmdline, shell = True);
+        subprocess.call(cmdline, shell = True);
 
 def get_host_native_width():
@@ -67 +52 @@
         # on 32 bits host
         host_width = get_host_native_width()
-        if guest_width <= host_width and not is_override('nokvm'):
+        if guest_width <= host_width:
                 opts = opts + ' -enable-kvm'
         
@@ -94 +79 @@
 
 def qemu_bd_options():
-        if is_override('nohdd'):
-                return ''
-
         if not os.path.exists('hdisk.img'):
                 subprocess.call('tools/mkfat.py 1048576 uspace/dist/data hdisk.img', shell = True)
-
         return ' -hda hdisk.img'
 
@@ -112 +93 @@
 
 def qemu_net_options():
-        if is_override('nonet'):
-                return ''
-
-        nic_options = ''
-        if 'net' in overrides.keys():
-                if 'e1k' in overrides['net'].keys():
-                        nic_options += qemu_nic_e1k_options()
-                if 'rtl8139' in overrides['net'].keys():
-                        nic_options += qemu_nic_rtl8139_options()
-                if 'ne2k' in overrides['net'].keys():
-                        nic_options += qemu_nic_ne2k_options()
-        else:
-                # Use the default NIC
-                nic_options += qemu_nic_e1k_options()
-
+        nic_options = qemu_nic_e1k_options()
         return nic_options + ' -net user -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -redir tcp:2223::2223'
 
 def qemu_usb_options():
-        if is_override('nousb'):
-                return ''
-        return ' -usb'
+        return ''
 
-def qemu_audio_options():
-        if is_override('nosnd'):
-                return ''
-        return ' -soundhw sb16' 
-
-def qemu_run(platform, machine):
-        cfg = cfg_get(platform, machine)
+def qemu_run(platform, machine, console, image, networking, storage, usb):
         suffix, options = platform_to_qemu_options(platform, machine)
         cmd = 'qemu-' + suffix
@@ -148 +107 @@
                 cmdline += ' ' + options
 
-        cmdline += qemu_bd_options()
-
-        if (not 'net' in cfg.keys()) or cfg['net']:
+        if storage:
+                cmdline += qemu_bd_options()
+        if networking:
                 cmdline += qemu_net_options()
-        if (not 'usb' in cfg.keys()) or cfg['usb']:
+        if usb:
                 cmdline += qemu_usb_options()
-        if (not 'audio' in cfg.keys()) or cfg['audio']:
-                cmdline += qemu_audio_options()
         
-        if cfg['image'] == 'image.iso':
+        if image == 'image.iso':
                 cmdline += ' -boot d -cdrom image.iso'
-        elif cfg['image'] == 'image.boot':
+        elif image == 'image.boot':
                 cmdline += ' -kernel image.boot'
 
-        if ('console' in cfg.keys()) and not cfg['console']:
+        if not console:
                 cmdline += ' -nographic'
 
@@ -171 +128 @@
         else:
                 print(cmdline)
-                if not is_override('dryrun'):
-                        subprocess.call(cmdline, shell = True)
+                subprocess.call(cmdline, shell = True)
                 
-def ski_run(platform, machine):
+def ski_run(platform, machine, console, image, networking, storage, usb):
         run_in_console('ski -i contrib/conf/ski.conf', 'HelenOS/ia64 on ski')
 
-def msim_run(platform, machine):
+def msim_run(platform, machine, console, image, networking, storage, usb):
         run_in_console('msim -c contrib/conf/msim.conf', 'HelenOS/mips32 on msim')
 
+emulators = {}
+emulators['amd64'] = {}
+emulators['arm32'] = {}
+emulators['ia32'] = {}
+emulators['ia64'] = {}
+emulators['mips32'] = {}
+emulators['ppc32'] = {}
+emulators['sparc64'] = {}
 
-emulators = {
-        'amd64' : {
-                'run' : qemu_run,
-                'image' : 'image.iso'
-        },
-        'arm32' : {
-                'integratorcp' : {
-                        'run' : qemu_run,
-                        'image' : 'image.boot',
-                        'net' : False,
-                        'audio' : False
-                }
-        },
-        'ia32' : {
-                'run' : qemu_run,
-                'image' : 'image.iso'
-        },
-        'ia64' : {
-                'ski' : {
-                        'run' : ski_run
-                }
-        },
-        'mips32' : {
-                'msim' : {
-                        'run' : msim_run
-                },
-                'lmalta' : {
-                        'run' : qemu_run,
-                        'image' : 'image.boot',
-                        'console' : False
-                },
-                'bmalta' : {
-                        'run' : qemu_run,
-                        'image' : 'image.boot',
-                        'console' : False
-                },
-        },
-        'ppc32' : {
-                'run' : qemu_run,
-                'image' : 'image.iso',
-                'audio' : False
-        },
-        'sparc64' : {
-                'generic' : {
-                        'run' : qemu_run,
-                        'image' : 'image.iso',
-                        'audio' : False
-                }
-        },
-}
-
-def usage():
-        print("%s - emulator wrapper for running HelenOS\n" % os.path.basename(sys.argv[0]))
-        print("%s [-d] [-h] [-net e1k|rtl8139|ne2k] [-nohdd] [-nokvm] [-nonet] [-nosnd] [-nousb]\n" %
-            os.path.basename(sys.argv[0]))
-        print("-d\tDry run: do not run the emulation, just print the command line.")
-        print("-h\tPrint the usage information and exit.")
-        print("-nohdd\tDisable hard disk, if applicable.")
-        print("-nokvm\tDisable KVM, if applicable.")
-        print("-nonet\tDisable networking support, if applicable.")
-        print("-nosnd\tDisable sound, if applicable.")
-        print("-nousb\tDisable USB support, if applicable.")
+emulators['amd64'][''] = qemu_run, True, 'image.iso', True, True, True
+emulators['arm32']['integratorcp'] = qemu_run, True, 'image.boot', False, False, False
+emulators['ia32'][''] = qemu_run, True, 'image.iso', True, True, True
+emulators['ia64']['ski'] = ski_run, False, 'image.boot', False, False, False
+emulators['mips32']['msim'] = msim_run, False, 'image.boot', False, False, False
+emulators['mips32']['lmalta'] = qemu_run, False, 'image.boot', False, False, False
+emulators['mips32']['bmalta'] = qemu_run, False, 'image.boot', False, False, False
+emulators['ppc32'][''] = qemu_run, True, 'image.iso', True, True, True
+emulators['sparc64']['generic'] = qemu_run, True, 'image.iso', True, True, True
 
 def run():
-        expect_nic = False
-
-        for i in range(1, len(sys.argv)):
-
-                if expect_nic:
-                        expect_nic = False
-                        if not 'net' in overrides.keys():
-                                overrides['net'] = {}
-                        if sys.argv[i] == 'e1k':
-                                overrides['net']['e1k'] = True
-                        elif sys.argv[i] == 'rtl8139':
-                                overrides['net']['rtl8139'] = True
-                        elif sys.argv[i] == 'ne2k':
-                                overrides['net']['ne2k'] = True
-                        else:
-                                usage()
-                                exit()
-
-                elif sys.argv[i] == '-h':
-                        usage()
-                        exit()
-                elif sys.argv[i] == '-d':
-                        overrides['dryrun'] = True
-                elif sys.argv[i] == '-net' and i < len(sys.argv) - 1:
-                        expect_nic = True
-                elif sys.argv[i] == '-nohdd':
-                        overrides['nohdd'] = True
-                elif sys.argv[i] == '-nokvm':
-                        overrides['nokvm'] = True
-                elif sys.argv[i] == '-nonet':
-                        overrides['nonet'] = True
-                elif sys.argv[i] == '-nosnd':
-                        overrides['nosnd'] = True
-                elif sys.argv[i] == '-nousb':
-                        overrides['nousb'] = True
-                else:
-                        usage()
-                        exit()
-
         config = {}
         autotool.read_config(autotool.CONFIG, config)
 
-        if 'PLATFORM' in config.keys():
+        try:
                 platform = config['PLATFORM']
-        else:
+        except:
                 platform = ''
 
-        if 'MACHINE' in config.keys():
+        try:
                 mach = config['MACHINE']
-        else:
+        except:
                 mach = ''
 
         try:
-                emu_run = cfg_get(platform, mach)['run']
+                emu_run, console, image, networking, storage, usb = emulators[platform][mach]
         except:
-                print("Cannot start emulation for the chosen configuration. (%s/%s)" % (platform, mach))
+                print("Cannot start emulation for the chosen configuration.")
                 return
 
-        emu_run(platform, mach)
+        emu_run(platform, mach, console, image, networking, storage, usb)
 
 run()