update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / test / spdkcli / virtio.sh

diff --git a/ceph/src/spdk/test/spdkcli/virtio.sh b/ceph/src/spdk/test/spdkcli/virtio.sh
index a86f8fe9c5d1ab6f7ce20450c0605a8494e22c2e..b483e0562f0fdd7e51e3432f22453847bb984ad6 100755 (executable)
--- a/ceph/src/spdk/test/spdkcli/virtio.sh
+++ b/ceph/src/spdk/test/spdkcli/virtio.sh
@@ -1,18 +1,18 @@
 #!/usr/bin/env bash
-set -xe
 
 testdir=$(readlink -f $(dirname $0))
-. $testdir/common.sh
+rootdir=$(readlink -f $testdir/../..)
+source $rootdir/test/common/autotest_common.sh
+source $rootdir/test/spdkcli/common.sh
 
 trap 'killprocess $virtio_pid; on_error_exit' ERR
-timing_enter spdk_cli_vhost_init
 
 timing_enter run_spdk_tgt
 run_spdk_tgt
 timing_exit run_spdk_tgt
 
 timing_enter run_spdk_virtio
-$SPDKCLI_BUILD_DIR/app/spdk_tgt/spdk_tgt -m 0x4 -p 0 -g -u -s 1024 -r /var/tmp/virtio.sock &
+$SPDK_BIN_DIR/spdk_tgt -m 0x4 -p 0 -g -u -s 1024 -r /var/tmp/virtio.sock &
 virtio_pid=$!
 waitforlisten $virtio_pid /var/tmp/virtio.sock
 timing_exit run_spdk_virtio
@@ -22,11 +22,11 @@ $spdkcli_job "'/bdevs/malloc create 32 512 Malloc0' 'Malloc0' True
 '/bdevs/malloc create 32 512 Malloc1' 'Malloc1' True
 "
 pci_blk=$(lspci -nn -D | grep '1af4:1001' | head -1 | awk '{print $1;}')
-if [ ! -z $pci_blk ]; then
+if [ -n "$pci_blk" ] && grep -Eq "DRIVER=(uio|vfio)" "/sys/bus/pci/devices/$pci_blk/uevent"; then
        $spdkcli_job "'/bdevs/virtioblk_disk create virtioblk_pci pci $pci_blk' 'virtioblk_pci' True"
 fi
 pci_scsi=$(lspci -nn -D | grep '1af4:1004' | head -1 | awk '{print $1;}')
-if [ ! -z $pci_scsi ]; then
+if [ -n "$pci_scsi" ] && grep -Eq "DRIVER=(uio|vfio)" "/sys/bus/pci/devices/$pci_scsi/uevent"; then
        $spdkcli_job "'/bdevs/virtioscsi_disk create virtioscsi_pci pci $pci_scsi' 'virtioscsi_pci' True"
 fi
 $spdkcli_job "'/vhost/scsi create sample_scsi' 'sample_scsi' True
@@ -36,10 +36,10 @@ $spdkcli_job "'/vhost/scsi create sample_scsi' 'sample_scsi' True
 timing_exit spdkcli_create_virtio_pci_config
 
 timing_enter spdkcli_check_match
-if [ ! -z $pci_blk ]  && [ ! -z $pci_scsi ]; then
-        MATCH_FILE="spdkcli_virtio_pci.test"
-        SPDKCLI_BRANCH="/bdevs"
-        check_match
+if [ -n "$pci_blk" ] && [ -n "$pci_scsi" ]; then
+       MATCH_FILE="spdkcli_virtio_pci.test"
+       SPDKCLI_BRANCH="/bdevs"
+       check_match
 fi
 timing_exit spdkcli_check_match
 
@@ -63,10 +63,10 @@ $spdkcli_job "'/vhost/block delete sample_block' 'sample_block'
 '/vhost/scsi/sample_scsi remove_target 0' 'Malloc0'
 '/vhost/scsi delete sample_scsi' 'sample_scsi'
 "
-if [ ! -z $pci_blk ]; then
+if [ -n "$pci_blk" ] && grep -Eq "DRIVER=(uio|vfio)" "/sys/bus/pci/devices/$pci_blk/uevent"; then
        $spdkcli_job "'/bdevs/virtioblk_disk delete virtioblk_pci' 'virtioblk_pci'"
 fi
-if [ ! -z $pci_scsi ]; then
+if [ -n "$pci_scsi" ] && grep -Eq "DRIVER=(uio|vfio)" "/sys/bus/pci/devices/$pci_scsi/uevent"; then
        $spdkcli_job "'/bdevs/virtioscsi_disk delete virtioscsi_pci' 'virtioscsi_pci'"
 fi
 $spdkcli_job "'/bdevs/malloc delete Malloc0' 'Malloc0'
@@ -76,5 +76,3 @@ timing_exit spdkcli_clear_virtio_config
 
 killprocess $virtio_pid
 killprocess $spdk_tgt_pid
-
-timing_exit spdk_cli_vhost_init