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 <changpeng.liu@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6954 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: <dongx.yi@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
parent
a0aa389e13
commit
5922706ccb
@ -14,7 +14,6 @@ rpc_py="$rootdir/scripts/rpc.py"
|
|||||||
export TEST_TRANSPORT=VFIOUSER
|
export TEST_TRANSPORT=VFIOUSER
|
||||||
|
|
||||||
rm -rf /var/run/muser
|
rm -rf /var/run/muser
|
||||||
rm -rf /dev/shm/muser
|
|
||||||
|
|
||||||
# Start the target
|
# Start the target
|
||||||
"${NVMF_APP[@]}" -m 0x1 &
|
"${NVMF_APP[@]}" -m 0x1 &
|
||||||
@ -29,20 +28,14 @@ sleep 1
|
|||||||
$rpc_py nvmf_create_transport -t VFIOUSER
|
$rpc_py nvmf_create_transport -t VFIOUSER
|
||||||
|
|
||||||
mkdir -p /var/run/muser
|
mkdir -p /var/run/muser
|
||||||
mkdir -p /var/run/muser/iommu_group
|
|
||||||
|
|
||||||
for i in $(seq 1 $NUM_DEVICES); do
|
for i in $(seq 1 $NUM_DEVICES); do
|
||||||
mkdir -p /var/run/muser/domain/muser$i/$i
|
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 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_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_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
|
$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
|
done
|
||||||
|
|
||||||
for i in $(seq 1 $NUM_DEVICES); do
|
for i in $(seq 1 $NUM_DEVICES); do
|
||||||
@ -59,6 +52,5 @@ done
|
|||||||
killprocess $nvmfpid
|
killprocess $nvmfpid
|
||||||
|
|
||||||
rm -rf /var/run/muser
|
rm -rf /var/run/muser
|
||||||
rm -rf /dev/shm/muser
|
|
||||||
|
|
||||||
trap - SIGINT SIGTERM EXIT
|
trap - SIGINT SIGTERM EXIT
|
||||||
|
Loading…
Reference in New Issue
Block a user