update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / test / vhost / shared / shared.sh

diff --git a/ceph/src/spdk/test/vhost/shared/shared.sh b/ceph/src/spdk/test/vhost/shared/shared.sh
index 24a51809bb1cf1f718db2f3f111915c334eff3ee..bbf0fd85801a509bc9a20d6274db97814dd89a89 100755 (executable)
--- a/ceph/src/spdk/test/vhost/shared/shared.sh
+++ b/ceph/src/spdk/test/vhost/shared/shared.sh
@@ -1,34 +1,32 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/vhost/common.sh
 
-rpc_py="$rootdir/scripts/rpc.py -s $(get_vhost_dir)/rpc.sock"
+rpc_py="$rootdir/scripts/rpc.py -s $(get_vhost_dir 0)/rpc.sock"
 
 function run_spdk_fio() {
        fio_bdev --ioengine=spdk_bdev \
-       "$rootdir/test/vhost/common/fio_jobs/default_initiator.job" --runtime=10 --rw=randrw \
-       --spdk_mem=1024 --spdk_single_seg=1 --spdk_conf=$testdir/bdev.conf "$@"
+               "$rootdir/test/vhost/common/fio_jobs/default_initiator.job" --runtime=10 --rw=randrw \
+               --spdk_mem=1024 --spdk_single_seg=1 --spdk_json_conf=$testdir/bdev.json "$@"
 }
 
 vhosttestinit
 
 trap 'error_exit "${FUNCNAME}" "${LINENO}"' ERR SIGTERM SIGABRT
 
-vhost_run
+vhost_run 0
 
-$rpc_py construct_malloc_bdev -b Malloc 124 4096
-$rpc_py construct_vhost_blk_controller Malloc.0 Malloc
+$rpc_py bdev_malloc_create -b Malloc 124 4096
+$rpc_py vhost_create_blk_controller Malloc.0 Malloc
 
 run_spdk_fio --size=50% --offset=0 --filename=VirtioBlk0 &
 run_fio_pid=$!
 sleep 1
 run_spdk_fio --size=50% --offset=50% --filename=VirtioBlk0
 wait $run_fio_pid
-vhost_kill
+vhost_kill 0
 
 vhosttestfini