d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test/vhost: add VM_BASE_DIR to vm_shutdown_all checks

Browse Source 
New vm_list_all function returns just vm numbers - with no
path.  vm_shutdown_all was not modified to add back the path,
so it would immediately think all VMs were shutdown when actually
they were not.

While here, fix a few other typos and nops.

Fixes db0c3174 (test/vhost: avoid setting nullglob's where possible)

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I43c58eac4dba3422cda34a2b8a02d174d4737f61

Reviewed-on: https://review.gerrithub.io/399951
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
This commit is contained in:
Jim Harris 2018-02-14 14:52:23 -07:00
parent 341a489ac9
commit 0169a18fc2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/vhost/common/common.sh
View File

@ -393,7 +393,7 @@ function vm_shutdown_all()
local vm
for vm in $vms; do
vm_shutdown $(basename $vm)
vm_shutdown $vm
done
notice "Waiting for VMs to shutdown..."
@ -401,7 +401,7 @@ function vm_shutdown_all()
while [[ $timeo -gt 0 ]]; do
all_vms_down=1
for vm in $vms; do
if [[ -r $vm/qemu.pid ]] && pkill -0 -F "$vm/qemu.pid"; then
if [[ -r $VM_BASE_DIR/$vm/qemu.pid ]] && pkill -0 -F "$VM_BASE_DIR/$vm/qemu.pid"; then
all_vms_down=0
break
fi
@ -418,7 +418,7 @@ function vm_shutdown_all()
done
$shell_restore_x
error "Timout waiting for some VMs to shutdown"
error "Timeout waiting for some VMs to shutdown"
return 1
}
@ -735,7 +735,7 @@ function vm_run()
continue
fi
notice "running $VM_BASE_DIR$vm/run.sh"
notice "running $VM_BASE_DIR/$vm/run.sh"
if ! $VM_BASE_DIR/$vm/run.sh; then
error "FAILED to run vm $vm"
return 1