[dts] [PATCH 4/4] conf: modify the config files for cryptodev virtio test suites

[xinfengx]

Signed-off-by: xinfengx <xinfengx.zhao at intel.com>
---
 conf/virtio_ipsec_cryptodev_func.cfg | 27 +++++++++++----------------
 conf/virtio_perf_cryptodev_func.cfg  | 17 +++++------------
 conf/virtio_unit_cryptodev_func.cfg  | 16 +++++-----------
 3 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/conf/virtio_ipsec_cryptodev_func.cfg b/conf/virtio_ipsec_cryptodev_func.cfg
index 0b51b7d..de6724d 100644
--- a/conf/virtio_ipsec_cryptodev_func.cfg
+++ b/conf/virtio_ipsec_cryptodev_func.cfg
@@ -2,20 +2,17 @@
 # Cryptodev common options qat device id
 crypto_dev_id="37c9"
 
-# PCI Pass-through
-vfio_pci="0000:60:00.0 0000:60:00.1 0000:3b:00.0 0000:3b:00.1"
-
 # default crypto device and sw device config
-w="0000:1a:01.0"
 vdev="crypto_aesni_mb_pmd_1 --vdev crypto_aesni_mb_pmd_2"
+w="0000:00:00.0"
 
 [vm0]
 qemu =
-    path=/root/qemu-2/bin/qemu-system-x86_64;
+    path=/opt/qemu-2.12.0/bin/qemu-system-x86_64;
 cpu =
     model=host,number=4,cpupin=11 12 13 14;
 mem =
-    size=5120,hugepage=yes;
+    size=4096,hugepage=yes;
 crypto =
     enable=yes,opt_num=2;
 daemon =
@@ -23,20 +20,19 @@ daemon =
 login =
     user=root,password=tester;
 disk =
-    file=/root/VMs/virtio_crypto_test_710_1.img;
+    file=/home/image/ubuntu16-0.img;
 vnc =
     displayNum=1;
-device =
-    driver=vfio-pci,opt_host=0000:3b:00.0;
-    driver=vfio-pci,opt_host=0000:3b:00.1;
+start =
+    wait_seconds=200;
 
 [vm1]
 qemu =
-    path=/root/qemu-2/bin/qemu-system-x86_64;
+    path=/opt/qemu-2.12.0/bin/qemu-system-x86_64;
 cpu =
     model=host,number=4,cpupin=15 16 17 18;
 mem =
-    size=5120,hugepage=yes;
+    size=4096,hugepage=yes;
 crypto =
     enable=yes,opt_num=2;
 daemon =
@@ -44,9 +40,8 @@ daemon =
 login =
     user=root,password=tester;
 disk =
-    file=/root/VMs/virtio_crypto_test_710_2.img;
+    file=/home/image/ubuntu16-1.img;
 vnc =
     displayNum=2;
-device =
-    driver=vfio-pci,opt_host=0000:60:00.0;
-    driver=vfio-pci,opt_host=0000:60:00.1;
+start =
+    wait_seconds=200;
diff --git a/conf/virtio_perf_cryptodev_func.cfg b/conf/virtio_perf_cryptodev_func.cfg
index cdadf31..0cd766b 100644
--- a/conf/virtio_perf_cryptodev_func.cfg
+++ b/conf/virtio_perf_cryptodev_func.cfg
@@ -2,12 +2,9 @@
 # Cryptodev common options qat device id
 crypto_dev_id="37c9"
 
-# PCI Pass-through
-vfio_pci="0000:60:00.0 0000:60:00.1"
-
-# Vhost-crypto option config
-w="0000:1a:01.0"
+# default crypto device and sw device config
 vdev="crypto_aesni_mb_pmd_1"
+w="0000:00:00.0"
 
 [test_aesni_mb_aes_cbc_sha1_hmac]
 buffer-sz="64,128,256,512,1024,2048"
@@ -30,7 +27,6 @@ total-ops=100000
 buffer-sz="64,128,256,512,1024,2048"
 l="0,1"
 socket-mem="512,0"
-w="00:05.0"
 optype="cipher-then-auth"
 devtype="crypto_virtio"
 cipher-algo="aes-cbc"
@@ -45,11 +41,11 @@ total-ops=100000
 
 [vm0]
 qemu =
-    path=/root/qemu-2/bin/qemu-system-x86_64;
+    path=/opt/qemu-2.12.0/bin/qemu-system-x86_64;
 cpu =
     model=host,number=4,cpupin=11 12 13 14;
 mem =
-    size=5120,hugepage=yes;
+    size=4096,hugepage=yes;
 crypto =
     enable=yes,opt_num=2;
 daemon =
@@ -57,9 +53,6 @@ daemon =
 login =
     user=root,password=tester;
 disk =
-    file=/root/VMs/virtio_crypto_test_710_1.img;
+    file=/home/image/ubuntu16-0.img;
 vnc =
     displayNum=1;
-device =
-    driver=vfio-pci,opt_host=0000:60:00.0;
-    driver=vfio-pci,opt_host=0000:60:00.1;
diff --git a/conf/virtio_unit_cryptodev_func.cfg b/conf/virtio_unit_cryptodev_func.cfg
index f8165bd..53611e3 100644
--- a/conf/virtio_unit_cryptodev_func.cfg
+++ b/conf/virtio_unit_cryptodev_func.cfg
@@ -2,20 +2,17 @@
 # Cryptodev common options qat device id
 crypto_dev_id="37c9"
 
-# PCI Pass-through
-vfio_pci="0000:60:00.0 0000:60:00.1"
-
-# Vhost-crypto option config
-w="0000:1a:01.0"
+# default crypto device and sw device config
 vdev="crypto_aesni_mb_pmd_1"
+w="0000:00:00.0"
 
 [vm0]
 qemu =
-    path=/root/qemu-2/bin/qemu-system-x86_64;
+    path=/opt/qemu-2.12.0/bin/qemu-system-x86_64;
 cpu =
     model=host,number=4,cpupin=11 12 13 14;
 mem =
-    size=5120,hugepage=yes;
+    size=4096,hugepage=yes;
 crypto =
     enable=yes,opt_num=2;
 daemon =
@@ -23,9 +20,6 @@ daemon =
 login =
     user=root,password=tester;
 disk =
-    file=/root/VMs/virtio_crypto_test_710_1.img;
+    file=/home/image/ubuntu16-0.img;
 vnc =
     displayNum=1;
-device =
-    driver=vfio-pci,opt_host=0000:60:00.0;
-    driver=vfio-pci,opt_host=0000:60:00.1;
-- 
2.17.1