From 11b8af05378f9fe1814236a7c33cab6200a2597f Mon Sep 17 00:00:00 2001
From: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Date: Tue, 13 Feb 2018 19:49:46 +0100
Subject: [PATCH] test/vhost: remove vhost-blk disk size leftover

After 1c164f117db3 ("vhost-blk: enable vhost block with new added
get/set config messages") vhost-blk "_size_X" workaround is not needed
nor used.

Change-Id: I6d8cb761aba65f6eb080d6d285ebf65de12dc212
Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/399670
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 test/vhost/common/common.sh     | 6 ------
 test/vhost/lvol/lvol_test.sh    | 4 +---
 test/vhost/readonly/readonly.sh | 9 ++++-----
 test/vhost/spdk_vhost.sh        | 2 +-
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/test/vhost/common/common.sh b/test/vhost/common/common.sh
index 9a0835eb3..addc0bbc2 100644
--- a/test/vhost/common/common.sh
+++ b/test/vhost/common/common.sh
@@ -632,12 +632,6 @@ function vm_setup()
 				cmd+="-device vhost-user-scsi-pci,id=scsi_$disk,num_queues=$queue_number,chardev=char_$disk ${eol}"
 				;;
 			spdk_vhost_blk)
-				[[ $disk =~ _size_([0-9]+[MG]?) ]] || true
-				size=${BASH_REMATCH[1]}
-				if [ -z "$size" ]; then
-					size="20G"
-				fi
-				disk=${disk%%_*}
 				notice "using socket $SPDK_VHOST_SCSI_TEST_DIR/naa.$disk.$vm_num"
 				cmd+="-chardev socket,id=char_$disk,path=$SPDK_VHOST_SCSI_TEST_DIR/naa.$disk.$vm_num ${eol}"
 				cmd+="-device vhost-user-blk-pci,num-queues=$queue_number,chardev=char_$disk ${eol}"
diff --git a/test/vhost/lvol/lvol_test.sh b/test/vhost/lvol/lvol_test.sh
index 8dc4367c0..0f0f1dc8d 100755
--- a/test/vhost/lvol/lvol_test.sh
+++ b/test/vhost/lvol/lvol_test.sh
@@ -206,10 +206,8 @@ for (( i=0; i<$vm_count; i++)); do
     elif [[ "$ctrl_type" == "spdk_vhost_blk" ]]; then
         disk=""
         for (( j=0; j<${#bdevs[@]}; j++)); do
-            blk_dev_size=$(get_bdev_size "${bdevs[$j]}")
-
             $rpc_py construct_vhost_blk_controller naa.$j.$i ${bdevs[$j]} $mask_arg
-            disk+="${j}_size_${blk_dev_size}M:"
+            disk+="${j}:"
         done
         disk="${disk::-1}"
         setup_cmd+=" --disks=$disk"
diff --git a/test/vhost/readonly/readonly.sh b/test/vhost/readonly/readonly.sh
index c0bb47b2f..72468a6a0 100755
--- a/test/vhost/readonly/readonly.sh
+++ b/test/vhost/readonly/readonly.sh
@@ -8,7 +8,7 @@ BASE_DIR=$(readlink -f $(dirname $0))
 rpc_py="$BASE_DIR/../../../scripts/rpc.py "
 
 vm_img=""
-disk="Nvme0n1_size_1G"
+disk="Nvme0n1"
 x=""
 
 function usage()
@@ -21,10 +21,9 @@ function usage()
 	echo
 	echo "-h, --help                Print help and exit"
 	echo "    --vm_image=           Path to VM image"
-	echo "    --disk=               Disk name and size. Disk can have additional size parameter,"
-	echo "                          e.g. --disk=Nvme0n1_size_35G; unit can be M or G; default - 20G."
+	echo "    --disk=               Disk name."
 	echo "                          If disk=malloc, then creates malloc disk. For malloc disks, size is always 512M,"
-	echo "                          e.g. --disk=malloc. (Default: Nvme0n1_size_1G)"
+	echo "                          e.g. --disk=malloc. (Default: Nvme0n1)"
 	echo "-x                        set -x for script debug"
 }
 
@@ -74,7 +73,7 @@ function blk_ro_tc1()
 			fail "Failed to create malloc bdev"
 		fi
 
-		disk=$disk_name"_size_512M"
+		disk=$disk_name
 	else
 		disk_name=${disk%%_*}
 		if ! $rpc_py get_bdevs | jq -r '.[] .name' | grep -qi $disk_name$; then
diff --git a/test/vhost/spdk_vhost.sh b/test/vhost/spdk_vhost.sh
index f99e8a278..8d754b17f 100755
--- a/test/vhost/spdk_vhost.sh
+++ b/test/vhost/spdk_vhost.sh
@@ -162,7 +162,7 @@ case $1 in
 		;;
 	-ro|--readonly)
 		echo 'Running readonly tests suite...'
-		$WORKDIR/readonly/readonly.sh --vm_image=$VM_IMAGE --disk=Nvme0n1_size_1G
+		$WORKDIR/readonly/readonly.sh --vm_image=$VM_IMAGE --disk=Nvme0n1
 		;;
 	*)
 		echo "unknown test type: $1"