From 5922706ccb7c7d136d162e22b1cc4a0fe7dec88b Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Thu, 18 Mar 2021 00:23:33 +0800 Subject: [PATCH] test/nvmf_vfio_user: simplify the creation of Unix domain socket We only need to create an empty directory for vfio-user device, the softlink isn't required anymore, so remove it. Change-Id: Ie3f9ce73d287be3651f4ac06483888ac0f693700 Signed-off-by: Changpeng Liu Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6954 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Reviewed-by: Ben Walker --- test/nvmf/target/nvmf_vfio_user.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/test/nvmf/target/nvmf_vfio_user.sh b/test/nvmf/target/nvmf_vfio_user.sh index fe39d349e..f74274236 100755 --- a/test/nvmf/target/nvmf_vfio_user.sh +++ b/test/nvmf/target/nvmf_vfio_user.sh @@ -14,7 +14,6 @@ rpc_py="$rootdir/scripts/rpc.py" export TEST_TRANSPORT=VFIOUSER rm -rf /var/run/muser -rm -rf /dev/shm/muser # Start the target "${NVMF_APP[@]}" -m 0x1 & @@ -29,20 +28,14 @@ sleep 1 $rpc_py nvmf_create_transport -t VFIOUSER mkdir -p /var/run/muser -mkdir -p /var/run/muser/iommu_group for i in $(seq 1 $NUM_DEVICES); do mkdir -p /var/run/muser/domain/muser$i/$i - mkdir -p /dev/shm/muser/muser$i $rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc$i $rpc_py nvmf_create_subsystem nqn.2019-07.io.spdk:cnode$i -a -s SPDK$i $rpc_py nvmf_subsystem_add_ns nqn.2019-07.io.spdk:cnode$i Malloc$i $rpc_py nvmf_subsystem_add_listener nqn.2019-07.io.spdk:cnode$i -t VFIOUSER -a "/var/run/muser/domain/muser$i/$i" -s 0 - - ln -s /var/run/muser/domain/muser$i/$i /var/run/muser/domain/muser$i/$i/iommu_group - ln -s /var/run/muser/domain/muser$i/$i /var/run/muser/iommu_group/$i - ln -s /var/run/muser/domain/muser$i/$i/bar0 /dev/shm/muser/muser$i/bar0 done for i in $(seq 1 $NUM_DEVICES); do @@ -59,6 +52,5 @@ done killprocess $nvmfpid rm -rf /var/run/muser -rm -rf /dev/shm/muser trap - SIGINT SIGTERM EXIT