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

test/vhost: Document and simplify handling of the $disks

Browse Source 
From the code, and due to lack of any help() or usage(), the way how
$disks are meant to be declared was not clear right off the bat.
Comment out how the argument should be formatted and cleanup its
usage within the code.

Change-Id: I3a4b077d5026f6f17d0ccc27183d2a89222169f5
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2002
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: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
This commit is contained in:
Michal Berger 2020-04-23 11:22:39 +02:00 committed by Tomasz Zawadzki
parent e1ddec2ca4
commit 64471319e3
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/vhost/common.sh
View File

@ -517,7 +517,8 @@ function vm_setup()
local qemu_args=()
local disk_type_g=NOT_DEFINED
local read_only="false"
local disks=""
# List created of a strings separated with a ":"
local disks=()
local raw_cache=""
local vm_incoming=""
local vm_migrate_to=""
@ -535,7 +536,7 @@ function vm_setup()
qemu-args=*) qemu_args+=("${OPTARG#*=}") ;;
disk-type=*) disk_type_g="${OPTARG#*=}" ;;
read-only=*) read_only="${OPTARG#*=}" ;;
disks=*) disks="${OPTARG#*=}" ;;
disks=*) IFS=":" read -ra disks <<<"${OPTARG#*=}" ;;
raw-cache=*) raw_cache=",cache${OPTARG#*=}" ;;
force=*) force_vm=${OPTARG#*=} ;;
memory=*) guest_memory=${OPTARG#*=} ;;
@ -686,17 +687,18 @@ function vm_setup()
cmd+=(-device "ide-hd,drive=os_disk,bootindex=0")
fi
if [[ $disks == '' ]] && [[ $disk_type_g == virtio* ]]; then
disks=1
if (( ${#disks[@]} == 0 )) && [[ $disk_type_g == virtio* ]]; then
disks=("default_virtio.img")
elif (( ${#disks[@]} == 0 )); then
error "No disks defined, aborting"
return 1
fi
for disk in ${disks//:/ }; do
if [[ $disk = *","* ]]; then
disk_type=${disk#*,}
disk=${disk%,*}
else
disk_type=$disk_type_g
fi
for disk in "${disks[@]}"; do
# Each disk can define its type in a form of a disk_name,type. The remaining parts
# of the string are dropped.
IFS="," read -r disk disk_type _ <<<"$disk"
[[ -z $disk_type ]] && disk_type=$disk_type_g
case $disk_type in
virtio)