Changeset 89ac5513 in mainline for tools/ew.py

Timestamp:

2013-06-23T19:54:53Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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) (3 diffs)

tools/ew.py

@@ -36 +36 @@
 import subprocess 
 import autotool
+import platform
 
 def run_in_console(cmd, title):
@@ -42 +43 @@
         subprocess.call(cmdline, shell = True);
 
-def pc_options():
-        return '-enable-kvm'
+def get_host_native_width():
+        return int(platform.architecture()[0].strip('bit'))
+
+def pc_options(guest_width):
+        opts = ''
+        
+        # Do not enable KVM if running 64 bits HelenOS
+        # on 32 bits host
+        host_width = get_host_native_width()
+        if guest_width <= host_width:
+                opts = opts + ' -enable-kvm'
+        
+        # Remove the leading space
+        return opts[1:]
 
 def malta_options():
@@ -50 +63 @@
 def platform_to_qemu_options(platform, machine):
         if platform == 'amd64':
-                return 'system-x86_64', pc_options()
+                return 'system-x86_64', pc_options(64)
         elif platform == 'arm32':
                 return 'system-arm', ''
         elif platform == 'ia32':
-                return 'system-i386', pc_options()
+                return 'system-i386', pc_options(32)
         elif platform == 'mips32':
                 if machine == 'lmalta':