QEMU default command lines updates

 - Fix a bug in clientctl which tried to test for kvm. This simply
   remove this faulty test  as the kvm command has been deprecated by the
   QEMU project for a couple of years now.

 - Specify by default 256M of RAM as this is the minimal amount required
   for the whole-OS live update test to succeed.

 - Update the default command printed out at the end of the x86_hdimage
   script to be more generic, less focused on one use-case.

Change-Id: Ic555d50a3a1471f7d35cc7fd369f2292add6ac39

diff --git a/minix/llvm/clientctl b/minix/llvm/clientctl
index a27cdb4cac986de0c1fc07707fd64d2a52b81bab..d0868c1fc9d721e19056cc301ee30aed613acb29 100755 (executable)
--- a/minix/llvm/clientctl
+++ b/minix/llvm/clientctl
@@ -290,15 +290,13 @@ function run_cmd {
 
 function run {
     if [ "$HYPER" == "" ]; then
-        if which kvm2 > /dev/null; then
-            HYPER=kvm
-        elif [ -e /dev/kvm ]; then
+        if [ -e /dev/kvm ]; then
             HYPER="qemu-system-i386 --enable-kvm"
         else
             HYPER=qemu-system-i386
         fi
     fi
-    opts="-hda $IMAGE"
+    opts="-m 256 -hda $IMAGE"
     append="$APPEND rootdevname=c0d0p1"
     [ ! -f $DISK ] || opts="$opts -hdb $DISK"
     if [ "$OUT" == "F" ]; then

diff --git a/releasetools/x86_hdimage.sh b/releasetools/x86_hdimage.sh
index ec2253143c98557d4760c9fea39c76dbea609403..194a64b6f20e114b000ecaf6079fd32416f417cd 100755 (executable)
--- a/releasetools/x86_hdimage.sh
+++ b/releasetools/x86_hdimage.sh
@@ -199,5 +199,5 @@ then
        echo "CD image at `pwd`/${IMG}"
 else
        echo "To boot this image on kvm:"
-       echo "cd ${MODDIR} && qemu-system-i386 -display none -serial stdio -kernel kernel -append \"console=tty00 rootdevname=c0d0p1\" -initrd \"${mods}\" -hda `pwd`/${IMG} --enable-kvm"
+       echo "cd ${MODDIR} && qemu-system-i386 --enable-kvm -m 256 -kernel kernel -append \"rootdevname=c0d0p1\" -initrd \"${mods}\" -hda `pwd`/${IMG}"
 fi