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

test/vhost: Rename spdk_vhost_kill to vhost_kill

Browse Source 
No need to prefix name with spdk.

Change-Id: I9b07a52f6c88d77e1dda2c63ec951c1847780cca
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/456702
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Ben Walker 2019-06-03 14:29:20 -07:00 committed by Jim Harris
parent a87ba5a7cf
commit bfdb94035e
17 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/vhost/common.sh
View File

@ -131,7 +131,7 @@ function vhost_run()
local vhost_pid_file="$vhost_dir/vhost.pid"
local vhost_socket="$vhost_dir/usvhost"
notice "starting vhost app in background"
[[ -r "$vhost_pid_file" ]] && spdk_vhost_kill $vhost_num
[[ -r "$vhost_pid_file" ]] && vhost_kill $vhost_num
[[ -d $vhost_dir ]] && rm -f $vhost_dir/*
mkdir -p $vhost_dir
@ -178,7 +178,7 @@ function vhost_run()
timing_exit vhost_start
}
function spdk_vhost_kill()
function vhost_kill()
{
local rc=0
local vhost_num=0
@ -1118,7 +1118,7 @@ function at_app_exit()
notice "killing vhost app"
for vhost_num in $(vhost_list_all); do
spdk_vhost_kill $vhost_num
vhost_kill $vhost_num
done
notice "EXIT DONE"

2
test/vhost/fiotest/fio.sh
View File

@ -254,7 +254,7 @@ if ! $no_shutdown; then
fi
notice "Testing done -> shutting down"
notice "killing vhost app"
spdk_vhost_kill
vhost_kill
notice "EXIT DONE"
notice "==============="

2
test/vhost/hotplug/common.sh
View File

@ -181,7 +181,7 @@ function reboot_all_and_prepare() {
function post_test_case() {
vm_shutdown_all
spdk_vhost_kill
vhost_kill
}
function on_error_exit() {

6
test/vhost/initiator/blockdev.sh
View File

@ -202,8 +202,8 @@ timing_exit remove_kernel_vhost
$RPC_PY delete_nvme_controller Nvme0
timing_enter spdk_vhost_kill
spdk_vhost_kill
timing_exit spdk_vhost_kill
timing_enter vhost_kill
vhost_kill
timing_exit vhost_kill
vhosttestfini

2
test/vhost/integrity/integrity_start.sh
View File

@ -99,6 +99,6 @@ clean_lvol_cfg
$rpc_py delete_nvme_controller Nvme0
notice "Shutting down SPDK vhost app..."
spdk_vhost_kill
vhost_kill
vhosttestfini

2
test/vhost/lvol/lvol_test.sh
View File

@ -283,6 +283,6 @@ $rpc_py get_bdevs
$rpc_py get_vhost_controllers
notice "Shutting down SPDK vhost app..."
spdk_vhost_kill
vhost_kill
vhosttestfini

2
test/vhost/migration/migration-tc1.sh
View File

@ -115,7 +115,7 @@ function migration_tc1()
migration_tc1_clean_vhost_config
notice "killing vhost app"
spdk_vhost_kill
vhost_kill
notice "Migration TC1 SUCCESS"
}

4
test/vhost/migration/migration-tc2.sh
View File

@ -52,8 +52,8 @@ function migration_tc2_cleanup_vhost_config()
$rpc_1 remove_vhost_controller $target_vm_ctrlr
notice "killing vhost app"
spdk_vhost_kill 0
spdk_vhost_kill 1
vhost_kill 0
vhost_kill 1
unset -v incoming_vm target_vm incoming_vm_ctrlr target_vm_ctrlr
unset -v rpc_0 rpc_1

2
test/vhost/migration/migration-tc3a.sh
View File

@ -86,7 +86,7 @@ function host1_cleanup_vhost()
$rpc_0 remove_vhost_controller $incoming_vm_ctrlr
notice "Shutting down vhost app"
spdk_vhost_kill 0
vhost_kill 0
host1_cleanup_nvmf
}

2
test/vhost/migration/migration-tc3b.sh
View File

@ -20,7 +20,7 @@ function host_2_cleanup_vhost()
$rpc remove_vhost_controller $target_vm_ctrl
notice "Shutting down vhost app"
spdk_vhost_kill 1
vhost_kill 1
sleep 1
}

2
test/vhost/other/negative.sh
View File

@ -141,7 +141,7 @@ if [[ $RUN_NIGHTLY -eq 1 ]]; then
notice "Testing done -> shutting down"
notice "killing vhost app"
spdk_vhost_kill
vhost_kill
notice "EXIT DONE"
notice "==============="

2
test/vhost/perf_bench/vhost_perf.sh
View File

@ -388,7 +388,7 @@ else
else
cleanup_lvol_cfg
fi
spdk_vhost_kill
vhost_kill
fi
if [[ -n "$kernel_cpus" ]]; then

2
test/vhost/readonly/readonly.sh
View File

@ -132,6 +132,6 @@ blk_ro_tc1
$rpc_py delete_nvme_controller Nvme0
spdk_vhost_kill
vhost_kill
vhosttestfini

2
test/vhost/shared/shared.sh
View File

@ -31,6 +31,6 @@ run_fio_pid=$!
sleep 1
run_spdk_fio --size=50% --offset=50% --filename=VirtioBlk0
wait $run_fio_pid
spdk_vhost_kill
vhost_kill
vhosttestfini

4
test/vhost/vhost_boot/vhost_boot.sh
View File

@ -21,7 +21,7 @@ function err_clean
$rpc_py remove_vhost_controller naa.vhost_vm.$vm_no
$rpc_py destroy_lvol_bdev $lvb_u
$rpc_py destroy_lvol_store -u $lvs_u
spdk_vhost_kill
vhost_kill
exit 1
}
@ -110,7 +110,7 @@ $rpc_py remove_vhost_scsi_target naa.vhost_vm.$vm_no 0
$rpc_py remove_vhost_controller naa.vhost_vm.$vm_no
$rpc_py destroy_lvol_bdev $lvb_u
$rpc_py destroy_lvol_store -u $lvs_u
spdk_vhost_kill
vhost_kill
timing_exit clean_vhost
timing_exit vhost_boot

2
test/vhost/windows/windows.sh
View File

@ -133,6 +133,6 @@ notice "Shutting down Windows VM..."
vm_kill $vm_num
notice "Shutting down SPDK vhost app..."
spdk_vhost_kill
vhost_kill
rm -f $aio_file

2
test/vhost/windows/windows_scsi_compliance.sh
View File

@ -73,7 +73,7 @@ dos2unix $testdir/results/WIN_SCSI_*.log
notice "Kill vm 1"
vm_kill "$vm_num"
notice "Kill spdk"
spdk_vhost_kill
vhost_kill
notice "Remove $aio_file"
rm -f $aio_file