Commit 71dba27c authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

test/vhost: use qemu-img from qemu install dir 



The test system may not have qemu-img installed system-wide, since we
build a custom version of qemu and install it in a non-standard path.

Change-Id: I52e16fc7bbf90b9c3d0832f6a81c5cfecd5f24ed
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/396675


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarChen Wang <chenx.wang@intel.com>
Reviewed-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent c7b8b414

test/vhost/integrity/integrity_start.sh

+5 −1
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ if [[ ! -x $VM_QEMU ]]; then 
    echo "ERROR: QEMU binary not present in $VM_QEMU"

fi



if [[ -z $QEMU_IMG ]]; then

    QEMU_IMG="$qemu_install_dir/bin/qemu-img"

fi



echo "Running test with filesystem: $VM_FS"



function cleanup_virsh() {
@@ -90,7 +94,7 @@ function cleanup_lvol() { 
timing_enter integrity_test



# Backing image for VM

qemu-img create -f qcow2 -o backing_file=$VM_IMG $VM_BAK_IMG

"$QEMU_IMG" create -f qcow2 -o backing_file=$VM_IMG $VM_BAK_IMG



# Prepare vhost config

cp $basedir/vhost.conf.in $basedir/vhost.conf