From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Mon, 26 Jul 2010 15:52:29 +0000 (+0200)
Subject: backport -no-kqemu patch
X-Git-Tag: tests-5.0-14
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f838c061bd945ff5a6b18167a9c02d0a01d5bf7b;p=tests.git

backport -no-kqemu patch
---

diff --git a/system/template-qemu/qemu-start-node b/system/template-qemu/qemu-start-node
index cc0ea2a..0f80239 100755
--- a/system/template-qemu/qemu-start-node
+++ b/system/template-qemu/qemu-start-node
@@ -34,11 +34,18 @@ CONFIG=qemu.conf
 [ -f "$CONFIG" ] || { echo "Config file for qemu $CONFIG not found in $(pwd)" ; exit 1 ; }
 . $CONFIG
 
+# NOTE: check if the machine supports 64bits. We'll add -no-kqemu only
+# if it does. On 32bits host, qemu-system-x86_64 doesn't accept this
+# parameter (although it's there in the man page)
+function is_64bits () {
+    return $(cat /proc/cpuinfo | grep "^flags" | grep " lm " > /dev/null)
+}
+
 # the launcher, depending on target arch
 # make sure to check qemu-kill-node for consistency
 case $TARGET_ARCH in
     i386)		QEMU=qemu ; ARGS="" ;;
-    x86_64)		QEMU=qemu-system-x86_64 ; ARGS="-no-kqemu" ;;
+    x86_64)		QEMU=qemu-system-x86_64 ; if is_64bits; then ARGS="-no-kqemu"; fi ;;
     *)			echo "Cannot handle TARGET_ARCH=$TARGET_ARCH"; exit 1 ;;
 esac