From 56621dea3c209cfafc8c4d71d99814c682e392f3 Mon Sep 17 00:00:00 2001
From: Pawel Kaminski <pawelx.kaminski@intel.com>
Date: Mon, 28 Oct 2019 08:10:11 -0400
Subject: [PATCH] test: apply rule SC2153 where possible

Fix: removed vhost_dir assigment in places where it is not needed.

Change-Id: Idd120099d8c5d28901437e13b5670209f7536568
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/472603
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 test/vhost/fiotest/fio.sh            | 2 --
 test/vhost/hotplug/blk_hotremove.sh  | 1 -
 test/vhost/hotplug/common.sh         | 2 --
 test/vhost/hotplug/scsi_hotattach.sh | 1 -
 test/vhost/hotplug/scsi_hotdetach.sh | 4 ----
 test/vhost/hotplug/scsi_hotremove.sh | 1 -
 test/vhost/lvol/lvol_test.sh         | 1 -
 test/vhost/perf_bench/vhost_perf.sh  | 1 -
 8 files changed, 13 deletions(-)

diff --git a/test/vhost/fiotest/fio.sh b/test/vhost/fiotest/fio.sh
index 64e45eb6a..4ebb1ea8a 100755
--- a/test/vhost/fiotest/fio.sh
+++ b/test/vhost/fiotest/fio.sh
@@ -188,8 +188,6 @@ DISK=""
 
 fio_disks=""
 for vm_num in $used_vms; do
-	vm_dir=$VM_DIR/$vm_num
-
 	qemu_mask_param="VM_${vm_num}_qemu_mask"
 
 	host_name="VM-$vm_num"
diff --git a/test/vhost/hotplug/blk_hotremove.sh b/test/vhost/hotplug/blk_hotremove.sh
index 4e838852f..e2715b814 100644
--- a/test/vhost/hotplug/blk_hotremove.sh
+++ b/test/vhost/hotplug/blk_hotremove.sh
@@ -19,7 +19,6 @@ function prepare_fio_cmd_tc1() {
     run_fio="$fio_bin --eta=never "
     for vm_num in $1; do
         cp $fio_job $tmp_detach_job
-        vm_dir=$VM_DIR/$vm_num
         vm_check_blk_location $vm_num
         for disk in $SCSI_DISK; do
             echo "[nvme-host$disk]" >> $tmp_detach_job
diff --git a/test/vhost/hotplug/common.sh b/test/vhost/hotplug/common.sh
index 833f74315..fe2f9ed0b 100644
--- a/test/vhost/hotplug/common.sh
+++ b/test/vhost/hotplug/common.sh
@@ -113,8 +113,6 @@ function vms_setup_and_run() {
 
 function vms_prepare() {
     for vm_num in $1; do
-        vm_dir=$VM_DIR/$vm_num
-
         qemu_mask_param="VM_${vm_num}_qemu_mask"
 
         host_name="VM-${vm_num}-${!qemu_mask_param}"
diff --git a/test/vhost/hotplug/scsi_hotattach.sh b/test/vhost/hotplug/scsi_hotattach.sh
index 46bb85f4c..c952b64ea 100755
--- a/test/vhost/hotplug/scsi_hotattach.sh
+++ b/test/vhost/hotplug/scsi_hotattach.sh
@@ -12,7 +12,6 @@ function prepare_fio_cmd_tc1() {
     run_fio="$fio_bin --eta=never "
     for vm_num in $1; do
         cp $fio_job $tmp_attach_job
-        vm_dir=$VM_DIR/$vm_num
         vm_check_scsi_location $vm_num
         for disk in $SCSI_DISK; do
             echo "[nvme-host$disk]" >> $tmp_attach_job
diff --git a/test/vhost/hotplug/scsi_hotdetach.sh b/test/vhost/hotplug/scsi_hotdetach.sh
index 44229a6b9..35d5ad22c 100755
--- a/test/vhost/hotplug/scsi_hotdetach.sh
+++ b/test/vhost/hotplug/scsi_hotdetach.sh
@@ -24,7 +24,6 @@ function prepare_fio_cmd_tc1_iter1() {
     run_fio="$fio_bin --eta=never "
     for vm_num in $1; do
         cp $fio_job $tmp_detach_job
-        vm_dir=$VM_DIR/$vm_num
         vm_check_scsi_location $vm_num
         for disk in $SCSI_DISK; do
             echo "[nvme-host$disk]" >> $tmp_detach_job
@@ -42,7 +41,6 @@ function prepare_fio_cmd_tc2_iter1() {
     run_fio="$fio_bin --eta=never "
     for vm_num in $1; do
         cp $fio_job $tmp_detach_job
-        vm_dir=$VM_DIR/$vm_num
         vm_check_scsi_location $vm_num
         disk_array=($SCSI_DISK)
         disk=${disk_array[0]}
@@ -65,7 +63,6 @@ function prepare_fio_cmd_tc2_iter2() {
         else
             vm_job_name=default_integrity_4discs.job
         fi
-        vm_dir=$VM_DIR/$vm_num
         vm_check_scsi_location $vm_num
         for disk in $SCSI_DISK; do
             echo "[nvme-host$disk]" >> $tmp_detach_job
@@ -89,7 +86,6 @@ function prepare_fio_cmd_tc3_iter1() {
         else
             vm_job_name=default_integrity_4discs.job
         fi
-        vm_dir=$VM_DIR/$vm_num
         vm_check_scsi_location $vm_num
         j=1
         for disk in $SCSI_DISK; do
diff --git a/test/vhost/hotplug/scsi_hotremove.sh b/test/vhost/hotplug/scsi_hotremove.sh
index 293cfe556..0af150e6e 100644
--- a/test/vhost/hotplug/scsi_hotremove.sh
+++ b/test/vhost/hotplug/scsi_hotremove.sh
@@ -21,7 +21,6 @@ function prepare_fio_cmd_tc1() {
     run_fio="$fio_bin --eta=never "
     for vm_num in $1; do
         cp $fio_job $tmp_detach_job
-        vm_dir=$VM_DIR/$vm_num
         vm_check_scsi_location $vm_num
         for disk in $SCSI_DISK; do
             echo "[nvme-host$disk]" >> $tmp_detach_job
diff --git a/test/vhost/lvol/lvol_test.sh b/test/vhost/lvol/lvol_test.sh
index 1a450453c..e72fca016 100755
--- a/test/vhost/lvol/lvol_test.sh
+++ b/test/vhost/lvol/lvol_test.sh
@@ -226,7 +226,6 @@ vm_wait_for_boot 300 $used_vms
 
 fio_disks=""
 for vm_num in $used_vms; do
-    vm_dir=$VM_DIR/$vm_num
     qemu_mask_param="VM_${vm_num}_qemu_mask"
 
     host_name="VM-$vm_num-${!qemu_mask_param}"
diff --git a/test/vhost/perf_bench/vhost_perf.sh b/test/vhost/perf_bench/vhost_perf.sh
index 0a4d554ca..a5c4f6e8c 100755
--- a/test/vhost/perf_bench/vhost_perf.sh
+++ b/test/vhost/perf_bench/vhost_perf.sh
@@ -321,7 +321,6 @@ fi
 # Run FIO
 fio_disks=""
 for vm_num in $used_vms; do
-	vm_dir=$VM_DIR/$vm_num
 	host_name="VM-$vm_num"
 	vm_exec $vm_num "hostname $host_name"
 	vm_start_fio_server $fio_bin $vm_num