Commit 56621dea authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Tomasz Zawadzki
Browse files

test: apply rule SC2153 where possible 



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

Change-Id: Idd120099d8c5d28901437e13b5670209f7536568
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/472603


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent c2f59d6c

test/vhost/fiotest/fio.sh

+0 −2
Original line number Diff line number Diff line
@@ -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"

test/vhost/hotplug/blk_hotremove.sh

+0 −1
Original line number Diff line number Diff line
@@ -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

test/vhost/hotplug/common.sh

+0 −2
Original line number Diff line number Diff line
@@ -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}"

test/vhost/hotplug/scsi_hotattach.sh

+0 −1
Original line number Diff line number Diff line
@@ -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

test/vhost/hotplug/scsi_hotdetach.sh

+0 −4
Original line number Diff line number Diff line
@@ -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