X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Ftemplate-qemu%2Fqemu-start-node;h=7198b0352204e6062d5af6666b0c50339e6c71a6;hb=668b04ee255f8fc61d56e81b16d1fefa1de64773;hp=acaa0e6de57ad67c5c023179853a809c035b8d77;hpb=acc29368268d995c2965a917409dba89d2373397;p=tests.git

diff --git a/system/template-qemu/qemu-start-node b/system/template-qemu/qemu-start-node
index acaa0e6..7198b03 100755
--- a/system/template-qemu/qemu-start-node
+++ b/system/template-qemu/qemu-start-node
@@ -14,9 +14,9 @@ COMMAND=$(basename $0)
 cd $(dirname $0)
 
 ########## globals
-# 1 gigabyte ram
-RAM=1024
-DISK_SIZE=18G
+# 2 gigabytes ram
+RAM=2048
+DISK_SIZE=100G
 DISK_FORMAT=qcow2
 DISK_IMAGE=hdd-${DISK_FORMAT}-${DISK_SIZE}.img
 
@@ -46,11 +46,18 @@ function is_64bits () {
 
 # 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 ; if is_64bits; then ARGS="-no-kqemu"; else ARGS=""; fi ;;
-    *)			echo "Cannot handle TARGET_ARCH=$TARGET_ARCH"; exit 1 ;;
-esac
+
+# use kvm if available
+has_kvm=$(type -p qemu-kvm)
+if [ -n "$has_kvm" ] ; then
+    QEMU="qemu-kvm" ; ARGS=""
+else
+    case $TARGET_ARCH in
+	i386)		QEMU=qemu ; ARGS="" ;;
+	x86_64)		QEMU=qemu-system-x86_64 ; if is_64bits; then ARGS="-no-kqemu"; else ARGS=""; fi ;;
+	*)			echo "Cannot handle TARGET_ARCH=$TARGET_ARCH"; exit 1 ;;
+    esac
+fi
 
 echo "Running $COMMAND in $(pwd)"
 echo "Starting at $(date)"