From 3327842974053db243dec6cabdcaf09b0fd1b9cc Mon Sep 17 00:00:00 2001
From: Pawel Niedzwiecki <pawelx.niedzwiecki@intel.com>
Date: Tue, 13 Feb 2018 14:55:04 +0100
Subject: [PATCH] test/virtio: set 8 virtqueues for each device

Set queue number to match fio threads (7 IO threads + spdk)
Previous number resulted from the wrong assumption that
the number of queues is the sum of threads on all devices

Change-Id: Idd51cf0f62c07fa3833e3e7172edb8425ca1e19b
Signed-off-by: Pawel Niedzwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-on: https://review.gerrithub.io/399595
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
---
 test/vhost/initiator/bdev.conf   | 6 +++---
 test/vhost/initiator/blockdev.sh | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/vhost/initiator/bdev.conf b/test/vhost/initiator/bdev.conf
index 1fbc31120..9ef95f48d 100644
--- a/test/vhost/initiator/bdev.conf
+++ b/test/vhost/initiator/bdev.conf
@@ -1,14 +1,14 @@
 [VirtioUser0]
   Path naa.Nvme0n1.0
-  Queues 18
+  Queues 8
 
 [VirtioUser1]
   Path naa.Malloc0.0
-  Queues 18
+  Queues 8
 
 [VirtioUser2]
   Path naa.Malloc1.0
-  Queues 18
+  Queues 8
 
 [Ioat]
   Disable Yes
diff --git a/test/vhost/initiator/blockdev.sh b/test/vhost/initiator/blockdev.sh
index f773ed937..1b9d4ac14 100755
--- a/test/vhost/initiator/blockdev.sh
+++ b/test/vhost/initiator/blockdev.sh
@@ -103,8 +103,9 @@ timing_exit run_spdk_fio_unmap
 
 timing_enter setup_vm
 vm_no="0"
-vm_setup --disk-type=spdk_vhost_scsi --force=$vm_no --os=$os_image --disks="Nvme0n1:Malloc0:Malloc1" \
- --queue_num=18 --memory=6144
+vm_setup --disk-type=spdk_vhost_scsi --force=$vm_no --os=$os_image \
+ --disks="Nvme0n1:Malloc0:Malloc1" \
+ --queue_num=8 --memory=6144
 vm_run $vm_no
 
 timing_enter vm_wait_for_boot