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

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

Browse Source 
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: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/396675
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Chen Wang <chenx.wang@intel.com>
Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Daniel Verkamp 2018-01-26 11:22:26 -07:00 committed by Jim Harris
parent c7b8b414d1
commit 71dba27cab
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/vhost/integrity/integrity_start.sh
View File

@ -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