From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 23 Jul 2010 12:46:48 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/tests
X-Git-Tag: tests-5.0-15~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f3da7c1a9397208dfdc52997d8bb0a21fdbf4e12;hp=7e1e36a2a5a713f40bdf3cc506d7766d3d6bb54e;p=tests.git

Merge branch 'master' of ssh://git.onelab.eu/git/tests
---

diff --git a/system/template-qemu/qemu-start-node b/system/template-qemu/qemu-start-node
index cc0ea2a..f16e8aa 100755
--- a/system/template-qemu/qemu-start-node
+++ b/system/template-qemu/qemu-start-node
@@ -38,7 +38,7 @@ CONFIG=qemu.conf
 # 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 ; ARGS="" ;;
     *)			echo "Cannot handle TARGET_ARCH=$TARGET_ARCH"; exit 1 ;;
 esac
 
diff --git a/tests.spec b/tests.spec
index 07f53a1..09a29d9 100644
--- a/tests.spec
+++ b/tests.spec
@@ -1,5 +1,5 @@
 # for use by module-tools only
 %define version 5.0
-%define taglevel 11
+%define taglevel 12
 
 %define module_current_branch 4.3