File c32fb597-virttest-qemu_vm-fix_bug_virtio_port-b... of Package avocado-plugins-vt

Overview Repositories Revisions Requests Users Attributes Meta

File c32fb597-virttest-qemu_vm-fix_bug_virtio_port-bus_is_off.patch of Package avocado-plugins-vt (Revision fd5b1f4d13587cbb6017be691739569e)

Currently displaying revision fd5b1f4d13587cbb6017be691739569e , Show latest

commit c32fb597d779e1e121ae279a5ebdf7640d513fdf
Author: Xu Tian <xutian@redhat.com>
Date:   Thu Dec 29 14:46:27 2016 +0800

virttest.qemu_vm:fix bug virtio port bus is off
    
    skip add bus option for virtio port device
    
    Signed-off-by: Xu Tian <xutian@redhat.com>
    Signed-off-by: Lin Ma <lma@suse.com>

diff --git a/virttest/qemu_vm.py b/virttest/qemu_vm.py
index b6a3a42..3e1b40f 100644
--- a/virttest/qemu_vm.py
+++ b/virttest/qemu_vm.py
@@ -491,9 +491,8 @@ class VM(virt_vm.BaseVM):
             :param bus: Which virtio-serial-pci device use
             :param index: Index of the current virtio_port
             """
-            def get_extra_options(params):
-                """Get extra params pairs"""
-                options = dict()
+            def set_extra_options(virtio_port, params):
+                """Set extra params pairs"""
                 extra_params = params.get('virtio_port_params', '')
                 for _ in extra_params.split():
                     try:
@@ -501,13 +500,12 @@ class VM(virt_vm.BaseVM):
                             key, value = _, "NO_EQUAL_STRING"
                         else:
                             key, value = _.split('=')
-                        options[key] = value
+                        virtio_port.set_param(key, value)
                     except Exception:
-                        options.clear()
                         msg = ("Invaild params %s in " % _ +
                                "'virtio_port_param' = %s" % extra_params)
                         logging.error(msg)
-                return options
+                return virtio_port
 
             # used by spiceagent (com.redhat.spice.*)
             if 'console' in params.get('virtio_port_type'):
@@ -515,17 +513,22 @@ class VM(virt_vm.BaseVM):
             else:
                 port_type = 'virtserialport'
             virtio_port = QDevice(port_type)
-            virtio_port.set_param("bus", bus)
+
+            if not virtio_port.get_param("id"):
+                devid = utils_misc.generate_random_id()
+                virtio_port.set_param("id", devid, dynamic=True)
+
             if params.get('virtio_port_name_prefix'):
                 prefix = params["virtio_port_name_prefix"]
                 name = "%s%d" % (prefix, index)
             virtio_port.set_param("name", name)
+
+            if bus:
+                virtio_port.set_param("bus", bus)
+
             virtio_port.set_param("chardev", chardev.get_qid())
-            for key, value in get_extra_options(params).items():
-                virtio_port.set_param(key, value)
-            if not virtio_port.get_param("id"):
-                devid = utils_misc.generate_random_id()
-                virtio_port.set_param("id", devid, dynamic=True)
+            set_extra_options(virtio_port, params)
+
             return virtio_port
 
         def add_log_seabios(devices):

Places

File c32fb597-virttest-qemu_vm-fix_bug_virtio_port-bus_is_off.patch of Package avocado-plugins-vt (Revision fd5b1f4d13587cbb6017be691739569e)

Places