Changes in tools/ew.py [7f0580d:644352c] in mainline

File:

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

tools/ew.py

@@ -33 +33 @@
 """
 
-import os
+import os 
 import sys
-import subprocess
+import subprocess 
 import autotool
 import platform
-import thread
-import time
 
 overrides = {}
@@ -48 +46 @@
         return False
 
-def cfg_get(platform, machine, processor):
-        if machine == "" or emulators[platform].has_key("run"):
+def cfg_get(platform, machine):
+        if machine == "":
                 return emulators[platform]
-        elif processor == "" or emulators[platform][machine].has_key("run"):
+        else:
                 return emulators[platform][machine]
-        else:
-                return emulators[platform][machine][processor]
 
 def run_in_console(cmd, title):
@@ -97 +93 @@
                 return 'system-sparc64', ''
 
-def hdisk_mk():
-        if not os.path.exists('hdisk.img'):
-                subprocess.call('tools/mkfat.py 1048576 uspace/dist/data hdisk.img', shell = True)
-
 def qemu_bd_options():
         if is_override('nohdd'):
                 return ''
-        
-        hdisk_mk()
-        
-        return ' -drive file=hdisk.img,index=0,media=disk,format=raw'
+
+        if not os.path.exists('hdisk.img'):
+                subprocess.call('tools/mkfat.py 1048576 uspace/dist/data hdisk.img', shell = True)
+
+        return ' -hda hdisk.img'
 
 def qemu_nic_ne2k_options():
@@ -134 +127 @@
                 nic_options += qemu_nic_e1k_options()
 
-        return nic_options + ' -net user,hostfwd=udp::8080-:8080,hostfwd=udp::8081-:8081,hostfwd=tcp::8080-:8080,hostfwd=tcp::8081-:8081,hostfwd=tcp::2223-:2223'
+        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():
@@ -146 +139 @@
         return ' -device intel-hda -device hda-duplex'
 
-def qemu_run(platform, machine, processor):
-        cfg = cfg_get(platform, machine, processor)
+def qemu_run(platform, machine):
+        cfg = cfg_get(platform, machine)
         suffix, options = platform_to_qemu_options(platform, machine)
         cmd = 'qemu-' + suffix
@@ -181 +174 @@
                         subprocess.call(cmdline, shell = True)
                 
-def ski_run(platform, machine, processor):
+def ski_run(platform, machine):
         run_in_console('ski -i contrib/conf/ski.conf', 'HelenOS/ia64 on ski')
 
-def msim_run(platform, machine, processor):
-        hdisk_mk()
+def msim_run(platform, machine):
         run_in_console('msim -c contrib/conf/msim.conf', 'HelenOS/mips32 on msim')
 
-def gem5_console_thread():
-        # Wait a little bit so that gem5 can create the port
-        time.sleep(1)
-        term = os.environ['M5_PATH'] + '/gem5/util/term/m5term'
-        port = 3457
-        run_in_console('expect -c \'spawn %s %d; expect "ok " { send "boot\n" } timeout exp_continue; interact\'' % (term, port), 'HelenOS/sun4v on gem5')
-
-def gem5_run(platform, machine, processor):
-        try:
-                gem5 = os.environ['M5_PATH'] + '/gem5/build/SPARC/gem5.fast'
-                if not os.path.exists(gem5):
-                        raise Exception
-        except:
-                print("Did you forget to set M5_PATH?")
-                raise
-
-        thread.start_new_thread(gem5_console_thread, ())
-
-        cmdline = gem5 + ' ' + os.environ['M5_PATH'] + '/configs/example/fs.py --disk-image=' + os.path.abspath('image.iso')
-
-        print(cmdline)
-        if not is_override('dry_run'):
-                subprocess.call(cmdline, shell = True)
 
 emulators = {
@@ -256 +225 @@
         'sparc64' : {
                 'generic' : {
-                        'us' : {
-                                'run' : qemu_run,
-                                'image' : 'image.iso',
-                                'audio' : False
-                        },
-                        'sun4v' : {
-                                'run' : gem5_run,
-                        }
+                        'run' : qemu_run,
+                        'image' : 'image.iso',
+                        'audio' : False
                 }
         },
@@ -279 +243 @@
         print("-nosnd\tDisable sound, if applicable.")
         print("-nousb\tDisable USB support, if applicable.")
-
-def fail(platform, machine):
-        print("Cannot start emulation for the chosen configuration. (%s/%s)" % (platform, machine))
-        
 
 def run():
@@ -337 +297 @@
                 mach = ''
 
-        if 'PROCESSOR' in config.keys():
-                processor = config['PROCESSOR']
-        else:
-                processor = ''
-
         try:
-                emu_run = cfg_get(platform, mach, processor)['run']
-                emu_run(platform, mach, processor)
+                emu_run = cfg_get(platform, mach)['run']
         except:
-                fail(platform, mach)
+                print("Cannot start emulation for the chosen configuration. (%s/%s)" % (platform, mach))
                 return
 
+        emu_run(platform, mach)
+
 run()