test/vfio_user: rename existing vfio_user NVMe test cases

This is the preparation to add virtio device test cases
with vfio-user target.

Change-Id: I08a33ac9cb6c1a6239841077facbf84927383814
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14647
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>

test/vfio_user/common.sh

@@ -12,36 +12,3 @@ if [[ ! -e $VFIO_QEMU_BIN ]]; then
 fi
 
 QEMU_BIN=$VFIO_QEMU_BIN
-
-function clean_vfio_user() {
-	trap - ERR
-	print_backtrace
-	set +e
-	error "Error on $1 $2"
-	vm_kill_all
-	vhost_kill 0
-	exit 1
-}
-
-function vfio_user_run() {
-	local vhost_name=$1
-	local vfio_user_dir nvmf_pid_file rpc_py
-
-	vfio_user_dir=$(get_vhost_dir $vhost_name)
-	nvmf_pid_file="$vfio_user_dir/vhost.pid"
-	rpc_py="$rootdir/scripts/rpc.py -s $vfio_user_dir/rpc.sock"
-
-	mkdir -p $vfio_user_dir
-
-	timing_enter vfio_user_start
-	$rootdir/build/bin/nvmf_tgt -r $vfio_user_dir/rpc.sock -m 0xf &
-	nvmfpid=$!
-	echo $nvmfpid > $nvmf_pid_file
-
-	echo "Process pid: $nvmfpid"
-	echo "waiting for app to run..."
-	waitforlisten $nvmfpid $vfio_user_dir/rpc.sock
-
-	$rpc_py nvmf_create_transport -t VFIOUSER
-	timing_exit vfio_user_start
-}

test/vfio_user/nvme/common.sh

@@ -0,0 +1,32 @@
+function clean_vfio_user() {
+	trap - ERR
+	print_backtrace
+	set +e
+	error "Error on $1 $2"
+	vm_kill_all
+	vhost_kill 0
+	exit 1
+}
+
+function vfio_user_run() {
+	local vhost_name=$1
+	local vfio_user_dir nvmf_pid_file rpc_py
+
+	vfio_user_dir=$(get_vhost_dir $vhost_name)
+	nvmf_pid_file="$vfio_user_dir/vhost.pid"
+	rpc_py="$rootdir/scripts/rpc.py -s $vfio_user_dir/rpc.sock"
+
+	mkdir -p $vfio_user_dir
+
+	timing_enter vfio_user_start
+	$rootdir/build/bin/nvmf_tgt -r $vfio_user_dir/rpc.sock -m 0xf &
+	nvmfpid=$!
+	echo $nvmfpid > $nvmf_pid_file
+
+	echo "Process pid: $nvmfpid"
+	echo "waiting for app to run..."
+	waitforlisten $nvmfpid $vfio_user_dir/rpc.sock
+
+	$rpc_py nvmf_create_transport -t VFIOUSER
+	timing_exit vfio_user_start
+}

test/vfio_user/nvme/vfio_user_fio.sh

@@ -4,6 +4,7 @@ testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/vfio_user/common.sh
+source $rootdir/test/vfio_user/nvme/common.sh
 source $rootdir/test/vfio_user/autotest.config
 
 rpc_py="$rootdir/scripts/rpc.py -s $(get_vhost_dir 0)/rpc.sock"

test/vfio_user/nvme/vfio_user_restart_vm.sh

@@ -3,6 +3,7 @@ testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/vfio_user/common.sh
+source $rootdir/test/vfio_user/nvme/common.sh
 source $rootdir/test/vfio_user/autotest.config
 
 bdfs=($(get_nvme_bdfs))

test/vfio_user/vfio_user.sh

@@ -8,7 +8,7 @@ echo "Running SPDK vfio-user fio autotest..."
 
 vhosttestinit
 
-run_test "vfio_user_fio" $WORKDIR/vfio_user_fio/vfio_user_fio.sh
+run_test "vfio_user_nvme_fio" $WORKDIR/nvme/vfio_user_fio.sh
-run_test "vfio_user_restart_vm" $WORKDIR/vfio_user_restart_vm/vfio_user_restart_vm.sh
+run_test "vfio_user_nvme_restart_vm" $WORKDIR/nvme/vfio_user_restart_vm.sh
 
 vhosttestfini