Commit 4a770fa9 authored by Ben Walker's avatar Ben Walker Committed by Darek Stojaczyk
Browse files

test/vhost: Export default VM_IMAGE from common.sh 



Also, construct this path by grabbing the home directory
of the current user.

Change-Id: Ia8d5cc2be40c0c3ac693c80a3132b970f7124183
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/456704


Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 421a736b

scripts/perf/vhost/run_vhost_test.py

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ parser.add_argument('-d', '--max-disks', default=0, type=int, 
                    each virtual machine gets it's own bdev to work on.")

parser.add_argument('-v', '--vm-count', default=1, type=int,

                    help="How many VMs to run in test. Default: 1")

parser.add_argument('-i', '--vm-image', default="/home/sys_sgsw/vhost_vm_image.qcow2",

parser.add_argument('-i', '--vm-image', default="$HOME/vhost_vm_image.qcow2",

                    type=str, help="VM image to use for running VMs.")



subparsers = parser.add_subparsers()

test/nvmf/target/nvmf_vhost.sh

+1 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ NVMF_RPC="$rootdir/scripts/rpc.py -s $NVMF_SOCK" 
VHOST_SOCK="/tmp/vhost_rpc.sock"

VHOST_APP="$rootdir/app/vhost/vhost -p 0 -r $VHOST_SOCK -u"

VHOST_RPC="$rootdir/scripts/rpc.py -s $VHOST_SOCK"

vm_image="/home/sys_sgsw/vhost_vm_image.qcow2"



timing_enter nvmf_vhost

nvmftestinit
@@ -54,7 +53,7 @@ $VHOST_RPC construct_vhost_scsi_controller naa.VhostScsi0.3 
$VHOST_RPC add_vhost_scsi_lun naa.VhostScsi0.3 0 "Nvme0n1"



# start qemu based VM.

vm_setup --os="$vm_image" --disk-type=spdk_vhost_scsi --disks="VhostScsi0"  --force=3 --vhost-num=3

vm_setup --os="$VM_IMAGE" --disk-type=spdk_vhost_scsi --disks="VhostScsi0"  --force=3 --vhost-num=3



vm_run 3

test/vhost/common.sh

+1 −0
Original line number Diff line number Diff line 
: ${SPDK_VHOST_VERBOSE=false}

: ${QEMU_PREFIX="/usr/local/qemu/spdk-3.0.0"}

: ${VM_IMAGE="$HOME/vhost_vm_image.qcow2"}



TEST_DIR=$(readlink -f $rootdir/..)

test/vhost/integrity/integrity_start.sh

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ fi 


# Set up and run VM

setup_cmd="vm_setup --disk-type=$ctrl_type --force=0"

setup_cmd+=" --os=/home/sys_sgsw/vhost_vm_image.qcow2"

setup_cmd+=" --os=$VM_IMAGE"

setup_cmd+=" --disks=Nvme0n1"

$setup_cmd

test/vhost/lvol/lvol_test.sh

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ for (( i=0; i<$vm_count; i++)); do 
    if [[ $i%2 -ne 0 ]] && [[ $multi_os ]]; then

        setup_cmd+=" --os=/home/sys_sgsw/spdk_vhost_CentOS_vm_image.qcow2"

    else

        setup_cmd+=" --os=/home/sys_sgsw/vhost_vm_image.qcow2"

        setup_cmd+=" --os=$VM_IMAGE"

    fi



    # Create single SCSI controller or multiple BLK controllers for this VM