fix qemu script

Author: XuhengLi

scripts/multi/multi-kvm.py

@@ -16,7 +16,7 @@
         exit(0)
 
 NUM = 8
-QEMU="/srv/vm/qemu/aarch64-softmmu/qemu-system-aarch64"
+QEMU="/srv/vm/qemu"
 CMD = "./run-guest-n.sh -q {} -k ../tests/Image.sekvm -i /mydata/cloud-{}-{}.img -m tcp:localhost:444{},server,nowait -x {}"
 
 print("Launch %d VM(s)"%NUM)

scripts/multi/multi-sekvm.py

@@ -16,7 +16,7 @@
         exit(0)
 
 NUM = 8
-QEMU = "../../qemu/aarch64-softmmu/qemu-system-aarch64"
+QEMU = "../../qemu"
 CMD = "./run-guest-n.sh -q {} -k ../tests/Image.sekvm -i /mydata/cloud-{}-{}.img -m tcp:localhost:444{},server,nowait -x {}"
 
 print("Launch %d VM(s)"%NUM)

scripts/multi/run-guest-n.sh

@@ -115,7 +115,7 @@ echo $MAC
 
 if [[ $err == 0 ]]; then
 	echo "Using bridged networking"
-        BRIDGE_IF="-netdev tap,id=net1,helper=/mydata/sosp-paper211-ae/qemu/qemu-bridge-helper,vhost=on"
+        BRIDGE_IF="-netdev tap,id=net1,helper=$QEMU/qemu-bridge-helper,vhost=on"
         BRIDGE_IF="$BRIDGE_IF -device virtio-net-pci,netdev=net1,mac=$MAC"
         #BRIDGE_IF="$BRIDGE_IF -device virtio-net-pci,netdev=net1"
 elif [[ "$tap" != "/dev/tap" ]]; then
@@ -126,7 +126,7 @@ elif [[ "$tap" != "/dev/tap" ]]; then
 	exec 3<>$tap
 fi
 
-$QEMU \
+$QEMU/aarch64-softmmu/qemu-system-aarch64 \
         -smp $SMP -m $MEMSIZE -machine virt${DUMPDTB} -cpu host \
 	-kernel ${KERNEL} -enable-kvm ${DTB} \
         -drive if=none,file=$FS,id=vda,cache=none,format=raw \

scripts/tests/run-guest-kvm.sh

@@ -97,7 +97,7 @@ tap=/dev/tap$(< /sys/class/net/kvmtap0/ifindex) 2>/dev/null
 
 if [[ $err == 0 ]]; then
 	echo "Using bridged networking"
-        BRIDGE_IF="-netdev tap,id=net1,helper=../../qemu/qemu-bridge-helper,vhost=on"
+        BRIDGE_IF="-netdev tap,id=net1,helper=/srv/vm/qemu/qemu-bridge-helper,vhost=on"
         BRIDGE_IF="$BRIDGE_IF -device virtio-net-pci,netdev=net1,mac=de:ad:be:ef:f6:bd"
         #BRIDGE_IF="$BRIDGE_IF -device virtio-net-pci,netdev=net1"
 elif [[ "$tap" != "/dev/tap" ]]; then