From 161eb083ae0368d7ab650fb161ebcbcbb0071116 Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Tue, 5 Jun 2018 10:44:35 +0200 Subject: [PATCH] test/vhost: remove config-ro Qemu option from config Vhost-blk readonly "config-ro" option was removed from Qemu arguments after merging pull request f67c9b693a into Qemu master. "config-ro" Qemu option needs to be removed from scripts in order for tests to pass. Nightly test for read-only feature has to be commented out until Qemu is updated on test servers. Change-Id: I0cdc9c2fd3b23ef77a63b54e280e1bb9500229ee Signed-off-by: Karol Latecki Reviewed-on: https://review.gerrithub.io/413745 Tested-by: SPDK Automated Test System Reviewed-by: Changpeng Liu Reviewed-by: Jim Harris --- autotest.sh | 6 +++--- test/vhost/common/common.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autotest.sh b/autotest.sh index 97126e52b1..ab59e80129 100755 --- a/autotest.sh +++ b/autotest.sh @@ -167,9 +167,9 @@ if [ $SPDK_TEST_VHOST -eq 1 ]; then run_test ./test/vhost/spdk_vhost.sh --migration timing_exit vhost_migration - timing_enter readonly - run_test ./test/vhost/spdk_vhost.sh --readonly - timing_exit readonly + # timing_enter readonly + # run_test ./test/vhost/spdk_vhost.sh --readonly + # timing_exit readonly fi timing_enter integrity_lvol_scsi diff --git a/test/vhost/common/common.sh b/test/vhost/common/common.sh index 09c7274562..9e928fcfd0 100644 --- a/test/vhost/common/common.sh +++ b/test/vhost/common/common.sh @@ -725,7 +725,7 @@ function vm_setup() spdk_vhost_blk) notice "using socket $vhost_dir/naa.$disk.$vm_num" cmd+="-chardev socket,id=char_$disk,path=$vhost_dir/naa.$disk.$vm_num ${eol}" - cmd+="-device vhost-user-blk-pci,num-queues=$queue_number,chardev=char_$disk,config-ro=$read_only ${eol}" + cmd+="-device vhost-user-blk-pci,num-queues=$queue_number,chardev=char_$disk ${eol}" ;; kernel_vhost) if [[ -z $disk ]]; then