X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fenvs%2Fhost-run-qemu.sh;h=631adfc0070c96cb6028dcc49630a45284b49dfc;hb=868367c47df84a70a49f7be6b5e6c3150906aa8f;hp=487aebe66abd25bda0dc274c2f8eb3f290c85c51;hpb=98ac1e06204a5cb5f9ab1158173232e31772359f;p=kvmfornfv.git

diff --git a/ci/envs/host-run-qemu.sh b/ci/envs/host-run-qemu.sh
index 487aebe66..631adfc00 100755
--- a/ci/envs/host-run-qemu.sh
+++ b/ci/envs/host-run-qemu.sh
@@ -9,14 +9,17 @@
 ## http://www.apache.org/licenses/LICENSE-2.0
 ###############################################################################
 
+source utils.sh
 source host-config
 
+HOST_IP=$( getHostIP )
+
 cpumask () {
     m=$((1<<${1}))
     printf 0x%x ${m}
 }
 
-qmp_sock="/tmp/qmp-sock-$$"
+qmp_sock="/tmp/qmp-sock"
 
 #${qemu} -smp ${guest_cpus} -monitor unix:${qmp_sock},server,nowait -daemonize \
 #    -cpu host,migratable=off,+invtsc,+tsc-deadline,pmu=off \
@@ -27,25 +30,22 @@ qmp_sock="/tmp/qmp-sock-$$"
 #    -device virtio-net-pci,netdev=guest0 \
 #    -nographic -serial /dev/null -parallel /dev/null
 
-${qemu} -smp ${guest_cpus} -drive file=/root/guest1.qcow2 -daemonize \
-     -netdev user,id=net0,hostfwd=tcp:10.2.117.23:5555-:22 \
+${qemu} -smp ${guest_cpus} -monitor unix:${qmp_sock},server,nowait \
+     -cpu host,migratable=off,+invtsc,+tsc-deadline,pmu=off \
+     -drive file=/root/guest1.qcow2 -daemonize \
+     -netdev user,id=net0,hostfwd=tcp:$HOST_IP:5555-:22 \
      -realtime mlock=on -mem-prealloc -enable-kvm -m 1G \
      -mem-path /mnt/hugetlbfs-1g \
      -device virtio-net-pci,netdev=net0 \
-
-i=0
-for c in `echo ${host_isolcpus} | sed 's/,/ /g'` ; do
-    cpu[$i]=${c}
-    i=`expr $i + 1`
-done
+     -vnc :1
 
 threads=`echo "info cpus" | nc -U ${qmp_sock} | grep thread_id | cut -d= -f3`
 
 # Bind QEMU processor threads to RT CPUs
 i=0
 for tid in ${threads} ; do
-    tid=`printf %d ${tid}`  # this is required to get rid of cr at end
-    mask=`cpumask ${cpu[$i]}`
-    taskset -p ${mask} ${tid}
+    new_tid=`echo $tid | sed -e 's/[\r\n]//g'` # this is required to get rid of cr at end
+    mask=`cpumask ${qemu_cpu[$i]}`
+    taskset -p ${mask} ${new_tid}
     i=`expr $i + 1`
 done