test suite reviews and discussions
 help / color / mirror / Atom feed
* [dts] [PATCH V1] framework qemu_kvm.py: Add "server" and "multi_queue" parameter for more qemu launch option and adjust some timeout setting to improve the test stability
@ 2016-12-16  7:54 Yao Lei
  2016-12-19  2:59 ` Liu, Yong
  0 siblings, 1 reply; 5+ messages in thread
From: Yao Lei @ 2016-12-16  7:54 UTC (permalink / raw)
  To: dts; +Cc: lei yao

From: lei yao <lei.a.yao@intel.com>

Signed-off-by: lei yao <lei.a.yao@intel.com>
---
 framework/qemu_kvm.py | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/framework/qemu_kvm.py b/framework/qemu_kvm.py
index 6ced54a..e9d29cc 100644
--- a/framework/qemu_kvm.py
+++ b/framework/qemu_kvm.py
@@ -606,21 +606,31 @@ class QEMUKvm(VirtBase):
         if 'opt_path' in options.keys() and options['opt_path']:
             dev_boot_line = '-chardev socket'
             char_id = 'char%d' % self.char_idx
-            dev_boot_line += separator + 'id=%s' % char_id + separator + 'path=%s' % options['opt_path']
-            self.char_idx += 1
-            self.__add_boot_line(dev_boot_line)
+            if 'opt_server' in options.keys() and options['opt_server']:
+                dev_boot_line += separator + 'id=%s' % char_id + separator + 'path=%s' %options['opt_path'] + separator + '%s' % options['opt_server']
+		self.char_idx += 1
+                self.__add_boot_line(dev_boot_line)
+            else:
+                dev_boot_line += separator + 'id=%s' % char_id + separator + 'path=%s' %options['opt_path']
+                self.char_idx += 1
+                self.__add_boot_line(dev_boot_line)
             # netdev parameter
             netdev_id = 'netdev%d' % self.netdev_idx
             self.netdev_idx += 1
-            dev_boot_line = '-netdev type=vhost-user,id=%s,chardev=%s,vhostforce' % (netdev_id, char_id)
+            if 'opt_queue' in options.keys() and options['opt_queue']:
+                queue_num=options['opt_queue']
+                dev_boot_line = '-netdev type=vhost-user,id=%s,chardev=%s,vhostforce,queues=%s' % (netdev_id, char_id,queue_num)
+            else:
+                dev_boot_line = '-netdev type=vhost-user,id=%s,chardev=%s,vhostforce' % (netdev_id, char_id)
             self.__add_boot_line(dev_boot_line)
             # device parameter
             opts = {'opt_netdev': '%s' % netdev_id}
             if 'opt_mac' in options.keys() and \
                     options['opt_mac']:
                 opts['opt_mac'] = options['opt_mac']
-
-            self.__add_vm_virtio_net_pci(**opts)
+            if 'opt_settings' in options.keys() and options['opt_settings']:
+                opts['opt_settings'] = options['opt_settings']
+	self.__add_vm_virtio_net_pci(**opts)
 
     def __add_vm_virtio_cuse_pci(self, **options):
         """
@@ -939,7 +949,7 @@ class QEMUKvm(VirtBase):
         wait for 120 seconds for vm net ready
         10.0.2.* is the default ip address allocated by qemu
         """
-        count = 20
+        count = 40
         while count:
             out = self.__control_session('ifconfig')
             if "10.0.2" in out:
-- 
2.7.4

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2016-12-19  4:46 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-16  7:54 [dts] [PATCH V1] framework qemu_kvm.py: Add "server" and "multi_queue" parameter for more qemu launch option and adjust some timeout setting to improve the test stability Yao Lei
2016-12-19  2:59 ` Liu, Yong
2016-12-19  3:19   ` Yao, Lei A
2016-12-19  3:33     ` Liu, Yong
2016-12-19  4:46       ` Yao, Lei A

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).