Commit 69c9a7c9 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

test/nvme: Commonize get_ctrls_with_feature() 



Change-Id: I61f4abad8018bb11b993aed0ab6462e21fc7e6a6
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/18128


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 8f290091

test/nvme/cuse/common.sh

+9 −6
Original line number Diff line number Diff line
@@ -175,20 +175,23 @@ ctrl_has_fdp() { 
	((ctratt & 1 << 19))

}



get_ctrls_with_fdp() {

get_ctrls_with_feature() {

	((${#ctrls[@]} == 0)) && scan_nvme_ctrls



	local ctrl

	local ctrl feature=${1:-fdp}



	[[ $(type -t "ctrl_has_$feature") == function ]] || return 1



	for ctrl in "${!ctrls[@]}"; do

		ctrl_has_fdp "$ctrl" && echo "$ctrl"

		"ctrl_has_$feature" "$ctrl" && echo "$ctrl"

	done



}



get_ctrl_with_fdp() {

	local _ctrls

get_ctrl_with_feature() {

	local _ctrls feature=${1:-fdp}



	_ctrls=($(get_ctrls_with_fdp))

	_ctrls=($(get_ctrls_with_feature "$feature"))

	if ((${#_ctrls[@]} > 0)); then

		echo "${_ctrls[0]}"

		return 0

test/nvme/nvme_fdp.sh

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ source "$rootdir/test/nvme/cuse/common.sh" 
"$rootdir/scripts/setup.sh" reset



scan_nvme_ctrls

ctrl=$(get_ctrl_with_fdp) bdf=${bdfs["$ctrl"]}

ctrl=$(get_ctrl_with_feature fdp) bdf=${bdfs["$ctrl"]}



"$rootdir/scripts/setup.sh"