Commit bfdb9403 authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

test/vhost: Rename spdk_vhost_kill to vhost_kill 



No need to prefix name with spdk.

Change-Id: I9b07a52f6c88d77e1dda2c63ec951c1847780cca
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/456702


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent a87ba5a7

test/vhost/common.sh

+3 −3
Original line number Diff line number Diff line
@@ -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"

test/vhost/fiotest/fio.sh

+1 −1
Original line number Diff line number Diff line
@@ -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 "==============="

test/vhost/hotplug/common.sh

+1 −1
Original line number Diff line number Diff line
@@ -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() {

test/vhost/initiator/blockdev.sh

+3 −3
Original line number Diff line number Diff line
@@ -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

test/vhost/integrity/integrity_start.sh

+1 −1
Original line number Diff line number Diff line
@@ -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