From: Jonas Bjurel <jonas.bjurel@ericsson.com>
Date: Thu, 24 Sep 2015 22:06:34 +0000 (+0000)
Subject: Merge "Add removing existing VMs in clean.sh There might be VMs leftovers sometimes... 
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=5383bd288bd6915fe706fee3bc09cce2ee015b23;hp=1333e1c578a0ce79489b75eee42b387ede3c6675;p=genesis.git

Merge "Add removing existing VMs in clean.sh There might be VMs leftovers sometimes, then, the command 'rmmod kvm_intel' fails."
---

diff --git a/common/ci/clean.sh b/common/ci/clean.sh
index caaf88f..4cbc67b 100755
--- a/common/ci/clean.sh
+++ b/common/ci/clean.sh
@@ -220,6 +220,12 @@ else
   echo "${blue}libvirt/KVM is not installed${reset}"
 fi
 
+###remove possible VMs (needed for 'rmmod kvm_intel')
+if [ -n "$(ps -ef | grep qemu-kvm | grep -v grep)" ]; then
+    echo "${blue}Removing existing VMs ${reset}"
+    killall -9 qemu-kvm
+fi
+
 ###remove kernel modules
 echo "${blue}Removing kernel modules ${reset}"
 for kernel_mod in vboxnetadp vboxnetflt vboxpci vboxdrv kvm_intel kvm; do