From bfdb94035eec6ce60230a88ff8060a524fed44d7 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Mon, 3 Jun 2019 14:29:20 -0700 Subject: [PATCH] test/vhost: Rename spdk_vhost_kill to vhost_kill No need to prefix name with spdk. Change-Id: I9b07a52f6c88d77e1dda2c63ec951c1847780cca Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/456702 Tested-by: SPDK CI Jenkins Reviewed-by: Darek Stojaczyk Reviewed-by: Jim Harris --- test/vhost/common.sh | 6 +++--- test/vhost/fiotest/fio.sh | 2 +- test/vhost/hotplug/common.sh | 2 +- test/vhost/initiator/blockdev.sh | 6 +++--- test/vhost/integrity/integrity_start.sh | 2 +- test/vhost/lvol/lvol_test.sh | 2 +- test/vhost/migration/migration-tc1.sh | 2 +- test/vhost/migration/migration-tc2.sh | 4 ++-- test/vhost/migration/migration-tc3a.sh | 2 +- test/vhost/migration/migration-tc3b.sh | 2 +- test/vhost/other/negative.sh | 2 +- test/vhost/perf_bench/vhost_perf.sh | 2 +- test/vhost/readonly/readonly.sh | 2 +- test/vhost/shared/shared.sh | 2 +- test/vhost/vhost_boot/vhost_boot.sh | 4 ++-- test/vhost/windows/windows.sh | 2 +- test/vhost/windows/windows_scsi_compliance.sh | 2 +- 17 files changed, 23 insertions(+), 23 deletions(-) diff --git a/test/vhost/common.sh b/test/vhost/common.sh index b006669f4..98b67ad3c 100644 --- a/test/vhost/common.sh +++ b/test/vhost/common.sh @@ -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" diff --git a/test/vhost/fiotest/fio.sh b/test/vhost/fiotest/fio.sh index 4d7925e71..7f7edc85c 100755 --- a/test/vhost/fiotest/fio.sh +++ b/test/vhost/fiotest/fio.sh @@ -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 "===============" diff --git a/test/vhost/hotplug/common.sh b/test/vhost/hotplug/common.sh index d159f3bdf..690cb306a 100644 --- a/test/vhost/hotplug/common.sh +++ b/test/vhost/hotplug/common.sh @@ -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() { diff --git a/test/vhost/initiator/blockdev.sh b/test/vhost/initiator/blockdev.sh index cb9b88d30..3e4d782b1 100755 --- a/test/vhost/initiator/blockdev.sh +++ b/test/vhost/initiator/blockdev.sh @@ -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 diff --git a/test/vhost/integrity/integrity_start.sh b/test/vhost/integrity/integrity_start.sh index 61f10038c..1a6b0c2f9 100755 --- a/test/vhost/integrity/integrity_start.sh +++ b/test/vhost/integrity/integrity_start.sh @@ -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 diff --git a/test/vhost/lvol/lvol_test.sh b/test/vhost/lvol/lvol_test.sh index 76aaec249..4b26ca7cf 100755 --- a/test/vhost/lvol/lvol_test.sh +++ b/test/vhost/lvol/lvol_test.sh @@ -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 diff --git a/test/vhost/migration/migration-tc1.sh b/test/vhost/migration/migration-tc1.sh index 61e1002dd..b982bf210 100644 --- a/test/vhost/migration/migration-tc1.sh +++ b/test/vhost/migration/migration-tc1.sh @@ -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" } diff --git a/test/vhost/migration/migration-tc2.sh b/test/vhost/migration/migration-tc2.sh index 05c4e495f..9884737c4 100644 --- a/test/vhost/migration/migration-tc2.sh +++ b/test/vhost/migration/migration-tc2.sh @@ -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 diff --git a/test/vhost/migration/migration-tc3a.sh b/test/vhost/migration/migration-tc3a.sh index 3857eea82..457909762 100644 --- a/test/vhost/migration/migration-tc3a.sh +++ b/test/vhost/migration/migration-tc3a.sh @@ -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 } diff --git a/test/vhost/migration/migration-tc3b.sh b/test/vhost/migration/migration-tc3b.sh index b1e325fbe..1acfb6b98 100644 --- a/test/vhost/migration/migration-tc3b.sh +++ b/test/vhost/migration/migration-tc3b.sh @@ -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 } diff --git a/test/vhost/other/negative.sh b/test/vhost/other/negative.sh index 67ca8455e..af80888c5 100755 --- a/test/vhost/other/negative.sh +++ b/test/vhost/other/negative.sh @@ -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 "===============" diff --git a/test/vhost/perf_bench/vhost_perf.sh b/test/vhost/perf_bench/vhost_perf.sh index 9fd2ceeaf..340bbc450 100755 --- a/test/vhost/perf_bench/vhost_perf.sh +++ b/test/vhost/perf_bench/vhost_perf.sh @@ -388,7 +388,7 @@ else else cleanup_lvol_cfg fi - spdk_vhost_kill + vhost_kill fi if [[ -n "$kernel_cpus" ]]; then diff --git a/test/vhost/readonly/readonly.sh b/test/vhost/readonly/readonly.sh index 48d5572e1..4d5459147 100755 --- a/test/vhost/readonly/readonly.sh +++ b/test/vhost/readonly/readonly.sh @@ -132,6 +132,6 @@ blk_ro_tc1 $rpc_py delete_nvme_controller Nvme0 -spdk_vhost_kill +vhost_kill vhosttestfini diff --git a/test/vhost/shared/shared.sh b/test/vhost/shared/shared.sh index 3b05d1b72..ee8948e98 100755 --- a/test/vhost/shared/shared.sh +++ b/test/vhost/shared/shared.sh @@ -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 diff --git a/test/vhost/vhost_boot/vhost_boot.sh b/test/vhost/vhost_boot/vhost_boot.sh index d5786dd67..4a914a70a 100755 --- a/test/vhost/vhost_boot/vhost_boot.sh +++ b/test/vhost/vhost_boot/vhost_boot.sh @@ -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 diff --git a/test/vhost/windows/windows.sh b/test/vhost/windows/windows.sh index 698d469f5..0274bb95f 100755 --- a/test/vhost/windows/windows.sh +++ b/test/vhost/windows/windows.sh @@ -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 diff --git a/test/vhost/windows/windows_scsi_compliance.sh b/test/vhost/windows/windows_scsi_compliance.sh index 9405ea338..4a6b7fde9 100755 --- a/test/vhost/windows/windows_scsi_compliance.sh +++ b/test/vhost/windows/windows_scsi_compliance.sh @@ -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