From f2da539dbcf6d5e492d90b01dccb73ae7e6f95d6 Mon Sep 17 00:00:00 2001 From: Pawel Niedzwiecki Date: Fri, 20 Apr 2018 18:41:47 +0200 Subject: [PATCH] test/virtio: bring back QEMU's emulated virtio-scsi-pci tests This reverts commit 8cf4bc42e710def17f294aea9df04cc19dd48967 Change-Id: I6a161d191ea38b859a69eadd2eb831894011988a Signed-off-by: Pawel Niedzwiecki Reviewed-on: https://review.gerrithub.io/408481 Tested-by: SPDK Automated Test System Reviewed-by: Ben Walker Reviewed-by: Daniel Verkamp --- test/vhost/initiator/blockdev.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/vhost/initiator/blockdev.sh b/test/vhost/initiator/blockdev.sh index f00b251fc..084b08bc5 100755 --- a/test/vhost/initiator/blockdev.sh +++ b/test/vhost/initiator/blockdev.sh @@ -68,7 +68,8 @@ function remove_kernel_vhost() targetcli "/backstores/$targetcli_rd_name delete ramdisk" } -trap 'rm -f *.state $ROOT_DIR/spdk.tar.gz $ROOT_DIR/fio.tar.gz; error_exit "${FUNCNAME}""${LINENO}"' ERR SIGTERM SIGABRT +trap 'rm -f *.state $ROOT_DIR/spdk.tar.gz $ROOT_DIR/fio.tar.gz $(get_vhost_dir)/Virtio0;\ + error_exit "${FUNCNAME}""${LINENO}"' ERR SIGTERM SIGABRT function run_spdk_fio() { LD_PRELOAD=$PLUGIN_DIR/fio_plugin $FIO_PATH/fio --ioengine=spdk_bdev\ "$@" --spdk_mem=1024 --spdk_single_seg=1 @@ -135,7 +136,7 @@ timing_exit create_kernel_vhost timing_enter setup_vm vm_no="0" vm_setup --disk-type=spdk_vhost_scsi --force=$vm_no --os=$os_image \ - --disks="Nvme0n1_scsi0:Malloc0:Malloc1:$kernel_vhost_disk,kernel_vhost:\ + --disks="Nvme0n1_scsi0:Malloc0:Malloc1:$kernel_vhost_disk,kernel_vhost:Virtio0,virtio:\ Nvme0n1_blk0,spdk_vhost_blk:Nvme0n1_blk1,spdk_vhost_blk" \ --queue_num=8 --memory=6144 vm_run $vm_no @@ -187,7 +188,7 @@ timing_enter vm_shutdown_all vm_shutdown_all timing_exit vm_shutdown_all -rm -f *.state $ROOT_DIR/spdk.tar.gz $ROOT_DIR/fio.tar.gz +rm -f *.state $ROOT_DIR/spdk.tar.gz $ROOT_DIR/fio.tar.gz $(get_vhost_dir)/Virtio0 timing_enter remove_kernel_vhost remove_kernel_vhost timing_exit remove_kernel_vhost