fix check_tcp - display iptables before running qemu - get test specs in build summary

[tests.git] / system / template-qemu / qemu-kill-node

diff --git a/system/template-qemu/qemu-kill-node b/system/template-qemu/qemu-kill-node
index 830d33d..5d591f9 100755 (executable)
--- a/system/template-qemu/qemu-kill-node
+++ b/system/template-qemu/qemu-kill-node
@@ -4,11 +4,16 @@ COMMAND=$(basename $0)
 cd $(dirname $0)
 cd ..
 
+# somehow qemu-system-x86_64 show up in pgrep as qemu-system-x86
+COMMANDS_TO_KILL="qemu qemu-system-x86_64 qemu-system-x86"
+
 function usage () {
     echo "Usage: $COMMAND -l"
     echo "  lists current qemu processes"
     echo "usage: $COMMAND hostname"
     echo "  kill qemu instance for that node"
+    echo "usage: $COMMAND"
+    echo "  kill all instances of [$COMMANDS_TO_KILL]"
     exit 1
 }
 
@@ -20,7 +25,9 @@ function list_pids () {
            cat $nodedir/qemu.pid 2> /dev/null
        done
     else
-       pgrep qemu
+       for command in $COMMANDS_TO_KILL; do
+           pgrep -x $command
+       done
     fi
 }
 
@@ -44,8 +51,16 @@ function kill_pids () {
            kill_from_file $nodedir/qemu.pid
        done
     else
-       echo Killing all processes mathing qemu
-       pkill qemu
+       pids=$(list_pids)
+       if [ -n "$pids" ] ; then
+           echo "Killing all processes matching $COMMANDS_TO_KILL"
+           for pid in $pids; do
+               echo Killing $pid
+               kill $pid
+           done
+       else
+           echo "No process found that match $COMMANDS_TO_KILL"
+       fi
     fi
 }