From 89236d8fc86ad74c871da0a46c93f8ae843263d7 Mon Sep 17 00:00:00 2001 From: Pawel Niedzwiecki Date: Fri, 18 May 2018 18:42:30 +0200 Subject: [PATCH] test/vhost:Remove vhost configuration file from live migration test. Change-Id: I78d6ddf008a9f1e3fefdaa3de4a47a46d0c654d7 Signed-off-by: Pawel Niedzwiecki Reviewed-on: https://review.gerrithub.io/411715 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: Tomasz Zawadzki Reviewed-by: Ben Walker --- test/vhost/migration/migration-tc1.sh | 2 +- test/vhost/migration/migration-tc2.sh | 4 ++-- test/vhost/migration/migration-tc3a.sh | 2 +- test/vhost/migration/migration-tc3b.sh | 2 +- test/vhost/migration/vhost.conf.in | 5 ----- 5 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 test/vhost/migration/vhost.conf.in diff --git a/test/vhost/migration/migration-tc1.sh b/test/vhost/migration/migration-tc1.sh index 4947f2de0..3269daf46 100644 --- a/test/vhost/migration/migration-tc1.sh +++ b/test/vhost/migration/migration-tc1.sh @@ -57,7 +57,7 @@ function migration_tc1() local job_file="$MIGRATION_DIR/migration-tc1.job" # Run vhost - spdk_vhost_run --conf-path=$MIGRATION_DIR + spdk_vhost_run migration_tc1_configure_vhost notice "Setting up VMs" diff --git a/test/vhost/migration/migration-tc2.sh b/test/vhost/migration/migration-tc2.sh index 04b5dcad0..2c1f06cac 100644 --- a/test/vhost/migration/migration-tc2.sh +++ b/test/vhost/migration/migration-tc2.sh @@ -101,11 +101,11 @@ function migration_tc2_configure_vhost() waitforlisten "$nvmf_tgt_pid" "$nvmf_dir/rpc.sock" timing_exit start_nvmf_tgt - spdk_vhost_run --conf-path=$MIGRATION_DIR --memory=512 --vhost-num=0 + spdk_vhost_run --memory=512 --vhost-num=0 # Those are global intentionaly vhost_1_reactor_mask=0x2 vhost_1_master_core=1 - spdk_vhost_run --conf-path=$MIGRATION_DIR --memory=512 --vhost-num=1 + spdk_vhost_run --memory=512 --vhost-num=1 local rdma_ip_list=$(get_available_rdma_ips) local nvmf_target_ip=$(echo "$rdma_ip_list" | head -n 1) diff --git a/test/vhost/migration/migration-tc3a.sh b/test/vhost/migration/migration-tc3a.sh index 2dcdf29c8..2e68acdfd 100644 --- a/test/vhost/migration/migration-tc3a.sh +++ b/test/vhost/migration/migration-tc3a.sh @@ -118,7 +118,7 @@ function host1_start_vhost() notice "Starting vhost0 instance on local server" trap 'host1_cleanup_vhost; error_exit "${FUNCNAME}" "${LINENO}"' INT ERR EXIT - spdk_vhost_run --conf-path=$MIGRATION_DIR --vhost-num=0 + spdk_vhost_run --vhost-num=0 $rpc_0 construct_nvme_bdev -b Nvme0 -t rdma -f ipv4 -a $RDMA_TARGET_IP -s 4420 -n "nqn.2018-02.io.spdk:cnode1" $rpc_0 construct_vhost_scsi_controller $incoming_vm_ctrlr $rpc_0 add_vhost_scsi_lun $incoming_vm_ctrlr 0 Nvme0n1 diff --git a/test/vhost/migration/migration-tc3b.sh b/test/vhost/migration/migration-tc3b.sh index a59753399..f4b358456 100755 --- a/test/vhost/migration/migration-tc3b.sh +++ b/test/vhost/migration/migration-tc3b.sh @@ -33,7 +33,7 @@ function host_2_start_vhost() notice "Starting vhost 1 instance on remote server" trap 'host_2_cleanup_vhost; error_exit "${FUNCNAME}" "${LINENO}"' INT ERR EXIT - spdk_vhost_run --conf-path=$MIGRATION_DIR --vhost-num=1 + spdk_vhost_run --vhost-num=1 $rpc construct_nvme_bdev -b Nvme0 -t rdma -f ipv4 -a $RDMA_TARGET_IP -s 4420 -n "nqn.2018-02.io.spdk:cnode1" $rpc construct_vhost_scsi_controller $target_vm_ctrl diff --git a/test/vhost/migration/vhost.conf.in b/test/vhost/migration/vhost.conf.in deleted file mode 100644 index 967a08766..000000000 --- a/test/vhost/migration/vhost.conf.in +++ /dev/null @@ -1,5 +0,0 @@ -[Global] - NoPci Yes - -[Ioat] - Disable Yes