Changeset 05bab88 in mainline

Timestamp:

2013-03-10T14:57:26Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c8752175, d8d7a0d

Parents:

850235d (diff), e4a1497 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

tools/ew.py

@@ -39 +39 @@
 def run_in_console(cmd, title):
         cmdline = 'xterm -T ' + '"' + title + '"' + ' -e ' + cmd
-        print cmdline
+        print(cmdline)
         subprocess.call(cmdline, shell = True);
 
@@ -81 +81 @@
 def qemu_net_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'
+        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():
@@ -114 +114 @@
                 run_in_console(cmdline, title)
         else:
-                print cmdline
+                print(cmdline)
                 subprocess.call(cmdline, shell = True)
                 
@@ -159 +159 @@
                 emu_run, console, image, networking, storage, usb = emulators[platform][mach]
         except:
-                print "Cannot start emulation for the chosen configuration."
+                print("Cannot start emulation for the chosen configuration.")
                 return