ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: apply rule SC2153 where possible

Browse Source 
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>
This commit is contained in:
Pawel Kaminski 2019-10-28 08:10:11 -04:00 committed by Tomasz Zawadzki
parent c2f59d6c1f
commit 56621dea3c
8 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/vhost/fiotest/fio.sh
View File

@ -188,8 +188,6 @@ DISK=""
fio_disks="" fio_disks=""
for vm_num in $used_vms; do for vm_num in $used_vms; do
vm_dir=$VM_DIR/$vm_num
qemu_mask_param="VM_${vm_num}_qemu_mask" qemu_mask_param="VM_${vm_num}_qemu_mask"
host_name="VM-$vm_num" host_name="VM-$vm_num"

1
test/vhost/hotplug/blk_hotremove.sh
View File

@ -19,7 +19,6 @@ function prepare_fio_cmd_tc1() {
run_fio="$fio_bin --eta=never " run_fio="$fio_bin --eta=never "
for vm_num in $1; do for vm_num in $1; do
cp $fio_job $tmp_detach_job cp $fio_job $tmp_detach_job
vm_dir=$VM_DIR/$vm_num
vm_check_blk_location $vm_num vm_check_blk_location $vm_num
for disk in $SCSI_DISK; do for disk in $SCSI_DISK; do
echo "[nvme-host$disk]" >> $tmp_detach_job echo "[nvme-host$disk]" >> $tmp_detach_job

2
test/vhost/hotplug/common.sh
View File

@ -113,8 +113,6 @@ function vms_setup_and_run() {
function vms_prepare() { function vms_prepare() {
for vm_num in $1; do for vm_num in $1; do
vm_dir=$VM_DIR/$vm_num
qemu_mask_param="VM_${vm_num}_qemu_mask" qemu_mask_param="VM_${vm_num}_qemu_mask"
host_name="VM-${vm_num}-${!qemu_mask_param}" host_name="VM-${vm_num}-${!qemu_mask_param}"

1
test/vhost/hotplug/scsi_hotattach.sh
View File

@ -12,7 +12,6 @@ function prepare_fio_cmd_tc1() {
run_fio="$fio_bin --eta=never " run_fio="$fio_bin --eta=never "
for vm_num in $1; do for vm_num in $1; do
cp $fio_job $tmp_attach_job cp $fio_job $tmp_attach_job
vm_dir=$VM_DIR/$vm_num
vm_check_scsi_location $vm_num vm_check_scsi_location $vm_num
for disk in $SCSI_DISK; do for disk in $SCSI_DISK; do
echo "[nvme-host$disk]" >> $tmp_attach_job echo "[nvme-host$disk]" >> $tmp_attach_job

4
test/vhost/hotplug/scsi_hotdetach.sh
View File

@ -24,7 +24,6 @@ function prepare_fio_cmd_tc1_iter1() {
run_fio="$fio_bin --eta=never " run_fio="$fio_bin --eta=never "
for vm_num in $1; do for vm_num in $1; do
cp $fio_job $tmp_detach_job cp $fio_job $tmp_detach_job
vm_dir=$VM_DIR/$vm_num
vm_check_scsi_location $vm_num vm_check_scsi_location $vm_num
for disk in $SCSI_DISK; do for disk in $SCSI_DISK; do
echo "[nvme-host$disk]" >> $tmp_detach_job echo "[nvme-host$disk]" >> $tmp_detach_job
@ -42,7 +41,6 @@ function prepare_fio_cmd_tc2_iter1() {
run_fio="$fio_bin --eta=never " run_fio="$fio_bin --eta=never "
for vm_num in $1; do for vm_num in $1; do
cp $fio_job $tmp_detach_job cp $fio_job $tmp_detach_job
vm_dir=$VM_DIR/$vm_num
vm_check_scsi_location $vm_num vm_check_scsi_location $vm_num
disk_array=($SCSI_DISK) disk_array=($SCSI_DISK)
disk=${disk_array[0]} disk=${disk_array[0]}
@ -65,7 +63,6 @@ function prepare_fio_cmd_tc2_iter2() {
else else
vm_job_name=default_integrity_4discs.job vm_job_name=default_integrity_4discs.job
fi fi
vm_dir=$VM_DIR/$vm_num
vm_check_scsi_location $vm_num vm_check_scsi_location $vm_num
for disk in $SCSI_DISK; do for disk in $SCSI_DISK; do
echo "[nvme-host$disk]" >> $tmp_detach_job echo "[nvme-host$disk]" >> $tmp_detach_job
@ -89,7 +86,6 @@ function prepare_fio_cmd_tc3_iter1() {
else else
vm_job_name=default_integrity_4discs.job vm_job_name=default_integrity_4discs.job
fi fi
vm_dir=$VM_DIR/$vm_num
vm_check_scsi_location $vm_num vm_check_scsi_location $vm_num
j=1 j=1
for disk in $SCSI_DISK; do for disk in $SCSI_DISK; do

1
test/vhost/hotplug/scsi_hotremove.sh
View File

@ -21,7 +21,6 @@ function prepare_fio_cmd_tc1() {
run_fio="$fio_bin --eta=never " run_fio="$fio_bin --eta=never "
for vm_num in $1; do for vm_num in $1; do
cp $fio_job $tmp_detach_job cp $fio_job $tmp_detach_job
vm_dir=$VM_DIR/$vm_num
vm_check_scsi_location $vm_num vm_check_scsi_location $vm_num
for disk in $SCSI_DISK; do for disk in $SCSI_DISK; do
echo "[nvme-host$disk]" >> $tmp_detach_job echo "[nvme-host$disk]" >> $tmp_detach_job

1
test/vhost/lvol/lvol_test.sh
View File

@ -226,7 +226,6 @@ vm_wait_for_boot 300 $used_vms
fio_disks="" fio_disks=""
for vm_num in $used_vms; do for vm_num in $used_vms; do
vm_dir=$VM_DIR/$vm_num
qemu_mask_param="VM_${vm_num}_qemu_mask" qemu_mask_param="VM_${vm_num}_qemu_mask"
host_name="VM-$vm_num-${!qemu_mask_param}" host_name="VM-$vm_num-${!qemu_mask_param}"

1
test/vhost/perf_bench/vhost_perf.sh
View File

@ -321,7 +321,6 @@ fi
# Run FIO # Run FIO
fio_disks="" fio_disks=""
for vm_num in $used_vms; do for vm_num in $used_vms; do
vm_dir=$VM_DIR/$vm_num
host_name="VM-$vm_num" host_name="VM-$vm_num"
vm_exec $vm_num "hostname $host_name" vm_exec $vm_num "hostname $host_name"
vm_start_fio_server $fio_bin $vm_num vm_start_fio_server $fio_bin $vm_num