From 8cc72fe459edde3293a23232a68adebe799409bf Mon Sep 17 00:00:00 2001
From: Michal Berger <michalx.berger@intel.com>
Date: Tue, 28 Apr 2020 17:08:33 +0200
Subject: [PATCH] test/nvmf: Handle multiple arguments in nvmfappstart()

Change-Id: Ibc75320b2de8885125e0835ead9e208fcace976d
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2092
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: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
---
 test/compress/compress.sh              | 2 +-
 test/nvmf/common.sh                    | 2 +-
 test/nvmf/host/aer.sh                  | 2 +-
 test/nvmf/host/bdevperf.sh             | 2 +-
 test/nvmf/host/perf.sh                 | 2 +-
 test/nvmf/host/target_disconnect.sh    | 2 +-
 test/nvmf/target/bdev_io_wait.sh       | 2 +-
 test/nvmf/target/bdevio.sh             | 2 +-
 test/nvmf/target/connect_disconnect.sh | 2 +-
 test/nvmf/target/create_transport.sh   | 2 +-
 test/nvmf/target/discovery.sh          | 2 +-
 test/nvmf/target/filesystem.sh         | 2 +-
 test/nvmf/target/fio.sh                | 2 +-
 test/nvmf/target/initiator_timeout.sh  | 2 +-
 test/nvmf/target/invalid.sh            | 2 +-
 test/nvmf/target/multiconnection.sh    | 2 +-
 test/nvmf/target/multitarget.sh        | 2 +-
 test/nvmf/target/nmic.sh               | 2 +-
 test/nvmf/target/nvme_cli.sh           | 2 +-
 test/nvmf/target/nvmf_lvol.sh          | 2 +-
 test/nvmf/target/rpc.sh                | 2 +-
 test/nvmf/target/shutdown.sh           | 2 +-
 test/nvmf/target/srq_overwhelm.sh      | 2 +-
 test/openstack/run_openstack_tests.sh  | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/test/compress/compress.sh b/test/compress/compress.sh
index 1db5351c5..8679f3130 100755
--- a/test/compress/compress.sh
+++ b/test/compress/compress.sh
@@ -86,7 +86,7 @@ if [ $RUN_NIGHTLY -eq 1 ]; then
 
 	# run perf on nvmf target w/compressed vols
 	export TEST_TRANSPORT=tcp && nvmftestinit
-	nvmfappstart "-m 0x7"
+	nvmfappstart -m 0x7
 	trap "nvmftestfini; error_cleanup; exit 1" SIGINT SIGTERM EXIT
 
 	# Create an NVMe-oF subsystem and add compress bdevs as namespaces
diff --git a/test/nvmf/common.sh b/test/nvmf/common.sh
index 5040493d8..3dc044b08 100644
--- a/test/nvmf/common.sh
+++ b/test/nvmf/common.sh
@@ -193,7 +193,7 @@ function nvmftestinit() {
 
 function nvmfappstart() {
 	timing_enter start_nvmf_tgt
-	"${NVMF_APP[@]}" $1 &
+	"${NVMF_APP[@]}" "$@" &
 	nvmfpid=$!
 	trap 'process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1' SIGINT SIGTERM EXIT
 	waitforlisten $nvmfpid
diff --git a/test/nvmf/host/aer.sh b/test/nvmf/host/aer.sh
index 5d961d706..1c438c686 100755
--- a/test/nvmf/host/aer.sh
+++ b/test/nvmf/host/aer.sh
@@ -8,7 +8,7 @@ source $rootdir/test/nvmf/common.sh
 rpc_py="$rootdir/scripts/rpc.py"
 
 nvmftestinit
-nvmfappstart "-m 0xF"
+nvmfappstart -m 0xF
 
 $rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 
diff --git a/test/nvmf/host/bdevperf.sh b/test/nvmf/host/bdevperf.sh
index 6f07c7ba4..776550c4d 100755
--- a/test/nvmf/host/bdevperf.sh
+++ b/test/nvmf/host/bdevperf.sh
@@ -11,7 +11,7 @@ MALLOC_BLOCK_SIZE=512
 rpc_py="$rootdir/scripts/rpc.py"
 
 function tgt_init() {
-	nvmfappstart "-m 0xF"
+	nvmfappstart -m 0xF
 
 	$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 	$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0
diff --git a/test/nvmf/host/perf.sh b/test/nvmf/host/perf.sh
index 1608bf54f..8f4064a02 100755
--- a/test/nvmf/host/perf.sh
+++ b/test/nvmf/host/perf.sh
@@ -11,7 +11,7 @@ MALLOC_BLOCK_SIZE=512
 rpc_py="$rootdir/scripts/rpc.py"
 
 nvmftestinit
-nvmfappstart "-m 0xF"
+nvmfappstart -m 0xF
 
 $rootdir/scripts/gen_nvme.sh --json | $rpc_py load_subsystem_config
 
diff --git a/test/nvmf/host/target_disconnect.sh b/test/nvmf/host/target_disconnect.sh
index 4f11414b5..796f71e20 100755
--- a/test/nvmf/host/target_disconnect.sh
+++ b/test/nvmf/host/target_disconnect.sh
@@ -13,7 +13,7 @@ MALLOC_BLOCK_SIZE=512
 rpc_py="$rootdir/scripts/rpc.py"
 
 function disconnect_init() {
-	nvmfappstart "-m 0xF0"
+	nvmfappstart -m 0xF0
 
 	$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0
 
diff --git a/test/nvmf/target/bdev_io_wait.sh b/test/nvmf/target/bdev_io_wait.sh
index 4230b1ff8..e57ffc36d 100755
--- a/test/nvmf/target/bdev_io_wait.sh
+++ b/test/nvmf/target/bdev_io_wait.sh
@@ -11,7 +11,7 @@ MALLOC_BLOCK_SIZE=512
 rpc_py="$rootdir/scripts/rpc.py"
 
 nvmftestinit
-nvmfappstart "-m 0xF --wait-for-rpc"
+nvmfappstart -m 0xF --wait-for-rpc
 
 # Minimal number of bdev io pool (5) and cache (1)
 $rpc_py bdev_set_options -p 5 -c 1
diff --git a/test/nvmf/target/bdevio.sh b/test/nvmf/target/bdevio.sh
index 13dc46914..f4d7eb1b5 100755
--- a/test/nvmf/target/bdevio.sh
+++ b/test/nvmf/target/bdevio.sh
@@ -12,7 +12,7 @@ rpc_py="$rootdir/scripts/rpc.py"
 
 nvmftestinit
 # Don't use cores 0 - 2 to avoid overlap with bdevio.
-nvmfappstart "-m 0x78"
+nvmfappstart -m 0x78
 
 $rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 $rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0
diff --git a/test/nvmf/target/connect_disconnect.sh b/test/nvmf/target/connect_disconnect.sh
index caba36688..b74394123 100755
--- a/test/nvmf/target/connect_disconnect.sh
+++ b/test/nvmf/target/connect_disconnect.sh
@@ -12,7 +12,7 @@ rpc_py="$rootdir/scripts/rpc.py"
 
 # connect disconnect is geared towards ensuring that we are properly freeing resources after disconnecting qpairs.
 nvmftestinit
-nvmfappstart "-m 0xF"
+nvmfappstart -m 0xF
 
 $rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192 -c 0
 
diff --git a/test/nvmf/target/create_transport.sh b/test/nvmf/target/create_transport.sh
index f8709f703..e2766467b 100755
--- a/test/nvmf/target/create_transport.sh
+++ b/test/nvmf/target/create_transport.sh
@@ -16,7 +16,7 @@ if ! hash nvme; then
 fi
 
 nvmftestinit
-nvmfappstart "-m 0xF"
+nvmfappstart -m 0xF
 
 # Use nvmf_create_transport call to create transport
 $rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
diff --git a/test/nvmf/target/discovery.sh b/test/nvmf/target/discovery.sh
index dd144965b..ad5a6ce96 100755
--- a/test/nvmf/target/discovery.sh
+++ b/test/nvmf/target/discovery.sh
@@ -16,7 +16,7 @@ if ! hash nvme; then
 fi
 
 nvmftestinit
-nvmfappstart "-m 0xF"
+nvmfappstart -m 0xF
 
 $rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 
diff --git a/test/nvmf/target/filesystem.sh b/test/nvmf/target/filesystem.sh
index ceb43fe21..ff819fdb6 100755
--- a/test/nvmf/target/filesystem.sh
+++ b/test/nvmf/target/filesystem.sh
@@ -44,7 +44,7 @@ function nvmf_filesystem_create() {
 function nvmf_filesystem_part() {
 	incapsule=$1
 
-	nvmfappstart "-m 0xF"
+	nvmfappstart -m 0xF
 
 	$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192 -c $incapsule
 	$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc1
diff --git a/test/nvmf/target/fio.sh b/test/nvmf/target/fio.sh
index 82c691a96..4e98d7083 100755
--- a/test/nvmf/target/fio.sh
+++ b/test/nvmf/target/fio.sh
@@ -11,7 +11,7 @@ MALLOC_BLOCK_SIZE=512
 rpc_py="$rootdir/scripts/rpc.py"
 
 nvmftestinit
-nvmfappstart "-m 0xF"
+nvmfappstart -m 0xF
 
 $rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 
diff --git a/test/nvmf/target/initiator_timeout.sh b/test/nvmf/target/initiator_timeout.sh
index 8da75af26..199983be5 100755
--- a/test/nvmf/target/initiator_timeout.sh
+++ b/test/nvmf/target/initiator_timeout.sh
@@ -11,7 +11,7 @@ MALLOC_BLOCK_SIZE=512
 rpc_py="$rootdir/scripts/rpc.py"
 
 nvmftestinit
-nvmfappstart "-m 0xF"
+nvmfappstart -m 0xF
 
 trap 'process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1' SIGINT SIGTERM EXIT
 
diff --git a/test/nvmf/target/invalid.sh b/test/nvmf/target/invalid.sh
index 4a0b24322..98246efeb 100755
--- a/test/nvmf/target/invalid.sh
+++ b/test/nvmf/target/invalid.sh
@@ -29,7 +29,7 @@ gen_random_s() {
 }
 
 nvmftestinit
-nvmfappstart "-m 0xF"
+nvmfappstart -m 0xF
 
 trap 'process_shm --id $NVMF_APP_SHM_ID; nvmftestfini $1; exit 1' SIGINT SIGTERM EXIT
 
diff --git a/test/nvmf/target/multiconnection.sh b/test/nvmf/target/multiconnection.sh
index 04405bc07..d7e490861 100755
--- a/test/nvmf/target/multiconnection.sh
+++ b/test/nvmf/target/multiconnection.sh
@@ -13,7 +13,7 @@ NVMF_SUBSYS=11
 rpc_py="$rootdir/scripts/rpc.py"
 
 nvmftestinit
-nvmfappstart "-m 0xF"
+nvmfappstart -m 0xF
 
 # SoftRoce does not have enough queues available for
 # multiconnection tests. Detect if we're using software RDMA.
diff --git a/test/nvmf/target/multitarget.sh b/test/nvmf/target/multitarget.sh
index a537b052a..4c3ece7c0 100755
--- a/test/nvmf/target/multitarget.sh
+++ b/test/nvmf/target/multitarget.sh
@@ -9,7 +9,7 @@ source $rootdir/test/nvmf/common.sh
 rpc_py="$rootdir/test/nvmf/target/multitarget_rpc.py"
 
 nvmftestinit
-nvmfappstart "-m 0xF"
+nvmfappstart -m 0xF
 
 trap 'process_shm --id $NVMF_APP_SHM_ID; nvmftestfini $1; exit 1' SIGINT SIGTERM EXIT
 
diff --git a/test/nvmf/target/nmic.sh b/test/nvmf/target/nmic.sh
index 65bbddd37..6a967dc08 100755
--- a/test/nvmf/target/nmic.sh
+++ b/test/nvmf/target/nmic.sh
@@ -11,7 +11,7 @@ MALLOC_BLOCK_SIZE=512
 rpc_py="$rootdir/scripts/rpc.py"
 
 nvmftestinit
-nvmfappstart "-m 0xF"
+nvmfappstart -m 0xF
 
 NVMF_SECOND_TARGET_IP=$(echo "$RDMA_IP_LIST" | sed -n 2p)
 
diff --git a/test/nvmf/target/nvme_cli.sh b/test/nvmf/target/nvme_cli.sh
index 65f76ed77..7cef32179 100755
--- a/test/nvmf/target/nvme_cli.sh
+++ b/test/nvmf/target/nvme_cli.sh
@@ -18,7 +18,7 @@ MALLOC_BLOCK_SIZE=512
 rpc_py="$rootdir/scripts/rpc.py"
 
 nvmftestinit
-nvmfappstart "-m 0xF"
+nvmfappstart -m 0xF
 
 $rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 
diff --git a/test/nvmf/target/nvmf_lvol.sh b/test/nvmf/target/nvmf_lvol.sh
index b2324eb68..c85a5f742 100755
--- a/test/nvmf/target/nvmf_lvol.sh
+++ b/test/nvmf/target/nvmf_lvol.sh
@@ -13,7 +13,7 @@ LVOL_BDEV_FINAL_SIZE=30
 rpc_py="$rootdir/scripts/rpc.py"
 
 nvmftestinit
-nvmfappstart "-m 0x7"
+nvmfappstart -m 0x7
 
 $rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 
diff --git a/test/nvmf/target/rpc.sh b/test/nvmf/target/rpc.sh
index ad42ec9ce..d715e4b4f 100755
--- a/test/nvmf/target/rpc.sh
+++ b/test/nvmf/target/rpc.sh
@@ -18,7 +18,7 @@ function jsum() {
 }
 
 nvmftestinit
-nvmfappstart "-m 0xF"
+nvmfappstart -m 0xF
 
 stats=$($rpc_py nvmf_get_stats)
 # Expect 4 poll groups (from CPU mask) and no transports yet
diff --git a/test/nvmf/target/shutdown.sh b/test/nvmf/target/shutdown.sh
index fb084080e..8ad73bd6f 100755
--- a/test/nvmf/target/shutdown.sh
+++ b/test/nvmf/target/shutdown.sh
@@ -12,7 +12,7 @@ rpc_py="$rootdir/scripts/rpc.py"
 
 function starttarget() {
 	# Start the target
-	nvmfappstart "-m 0x1E"
+	nvmfappstart -m 0x1E
 
 	$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
 
diff --git a/test/nvmf/target/srq_overwhelm.sh b/test/nvmf/target/srq_overwhelm.sh
index a7fc2bed9..fe4dd7d29 100755
--- a/test/nvmf/target/srq_overwhelm.sh
+++ b/test/nvmf/target/srq_overwhelm.sh
@@ -17,7 +17,7 @@ if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then
 	exit 0
 fi
 
-nvmfappstart "-m 0xF"
+nvmfappstart -m 0xF
 
 # create the rdma transport with an intentionally small SRQ depth
 $rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192 -s 1024
diff --git a/test/openstack/run_openstack_tests.sh b/test/openstack/run_openstack_tests.sh
index 01a7d8e1a..3bbd57d29 100755
--- a/test/openstack/run_openstack_tests.sh
+++ b/test/openstack/run_openstack_tests.sh
@@ -23,7 +23,7 @@ cat <<- JSON > "$testdir/conf.json"
 	]}
 JSON
 
-nvmfappstart "-m 0x3 -p 0 -s 1024 --json $testdir/conf.json"
+nvmfappstart -m 0x3 -p 0 -s 1024 --json $testdir/conf.json
 
 trap 'finish_test; process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1' SIGINT SIGTERM EXIT