--- idxd-config-accel-config-v3.4.6.3/test/dsa_user_test_runner.sh.orig	2022-05-25 20:31:33.185073217 +0300
+++ idxd-config-accel-config-v3.4.6.3/test/dsa_user_test_runner.sh	2022-05-27 22:12:33.447091343 +0300
@@ -6,7 +6,8 @@
 
 rc="$EXIT_SKIP"
 
-DSA=dsa0
+DEV=`ls /dev/dsa/ | sed -ne 's|wq\([^.]\+\)\(.*\)|dsa\1/wq\1\2|p'`
+DSA=`echo $DEV | cut -f1 -d/`
 WQ0=wq0.0
 WQ1=wq0.1
 
@@ -70,7 +71,7 @@
 		for xfer_size in $SIZE_1 $SIZE_4K $SIZE_64K $SIZE_1M $SIZE_2M; do
 			echo "Testing $xfer_size bytes"
 			"$DSATEST" -w "$wq_mode_code" -l "$xfer_size" -o "$opcode" \
-				-f "$flag" t200 -v
+				-f "$flag" t200 -d "$DEV"
 		done
 	done
 }
@@ -95,14 +96,11 @@
 		for xfer_size in $SIZE_1 $SIZE_4K $SIZE_64K $SIZE_1M $SIZE_2M; do
 			echo "Testing $xfer_size bytes"
 			"$DSATEST" -w "$wq_mode_code" -l "$xfer_size" -o 0x1 -b "$opcode" \
-				-c 16 -f "$flag" t2000 -v
+				-c 16 -f "$flag" t2000 -d "$DEV"
 		done
 	done
 }
 
-_cleanup
-start_dsa
-enable_wqs
 # shellcheck disable=SC2034
 rc="$EXIT_FAILURE"
 
@@ -120,7 +118,3 @@
 	test_op_batch $opcode $flag
 done
 
-disable_wqs
-stop_dsa
-_cleanup
-exit 0
--- idxd-config-accel-config-v3.4.6.4/test/iaa_user_test_runner.sh.orig	2022-06-07 20:52:39.582379032 +0300
+++ idxd-config-accel-config-v3.4.6.4/test/iaa_user_test_runner.sh	2022-06-07 20:57:14.972589001 +0300
@@ -6,7 +6,8 @@
 
 rc="$EXIT_SKIP"
 
-IAX=iax1
+DEV=`ls /dev/iax/ | sed -ne 's|wq\([^.]\+\)\(.*\)|iax\1/wq\1\2|p'`
+IAX=`echo $DEV | cut -f1 -d/`
 WQ0=wq1.4
 WQ1=wq1.1
 
@@ -72,18 +73,15 @@
 			if [ "$extra_flag" != "" ]
 			then
 				"$IAXTEST" -w "$wq_mode_code" -l "$xfer_size" -o "$opcode" \
-					-f "$flag" -e "$extra_flag" -t 5000 -v
+					-f "$flag" -e "$extra_flag" -t 5000 -d "$DEV"
 			else
 				"$IAXTEST" -w "$wq_mode_code" -l "$xfer_size" -o "$opcode" \
-					-f "$flag" -t 5000 -v
+					-f "$flag" -t 5000 -d "$DEV"
 			fi
 		done
 	done
 }
 
-_cleanup
-start_iax
-enable_wqs
 # shellcheck disable=SC2034
 rc="$EXIT_FAILURE"
 
@@ -99,7 +97,3 @@
 	test_op $opcode $flag
 done
 
-disable_wqs
-stop_iax
-_cleanup
-exit 0