diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh index 17a7d1942..78ec6e519 100644 --- a/test/common/autotest_common.sh +++ b/test/common/autotest_common.sh @@ -828,6 +828,27 @@ function freebsd_update_contigmem_mod() fi } +function get_nvme_name_from_bdf { + blkname=() + + nvme_devs=$(lsblk -d --output NAME | grep "^nvme") || true + if [ -z "$nvme_devs" ]; then + return + fi + for dev in $nvme_devs; do + link_name=$(readlink /sys/block/$dev/device/device) || true + if [ -z "$link_name" ]; then + link_name=$(readlink /sys/block/$dev/device) + fi + bdf=$(basename "$link_name") + if [ "$bdf" = "$1" ]; then + blkname+=($dev) + fi + done + + printf '%s\n' "${blkname[@]}" +} + set -o errtrace trap "trap - ERR; print_backtrace >&2" ERR diff --git a/test/nvme/nvme.sh b/test/nvme/nvme.sh index e5a9bb617..d2f4f56e2 100755 --- a/test/nvme/nvme.sh +++ b/test/nvme/nvme.sh @@ -5,27 +5,6 @@ rootdir=$(readlink -f $testdir/../..) source $rootdir/scripts/common.sh source $rootdir/test/common/autotest_common.sh -function get_nvme_name_from_bdf { - blkname=() - - nvme_devs=$(lsblk -d --output NAME | grep "^nvme") || true - if [ -z "$nvme_devs" ]; then - return - fi - for dev in $nvme_devs; do - link_name=$(readlink /sys/block/$dev/device/device) || true - if [ -z "$link_name" ]; then - link_name=$(readlink /sys/block/$dev/device) - fi - bdf=$(basename "$link_name") - if [ "$bdf" = "$1" ]; then - blkname+=($dev) - fi - done - - printf '%s\n' "${blkname[@]}" -} - timing_enter nvme if [ $(uname) = Linux ]; then