Merge pull request avocado-framework#3430 from PaulYuuu/s390_rng

[minor fix] Cut out '-pci' from the namespace of virtio-rng device params
vipmike007 · Jul 21, 2022 · fce4872 · fce4872
2 parents 42e2abe + 6d05fea
commit fce4872
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/virttest/qemu_vm.py b/virttest/qemu_vm.py
@@ -932,7 +932,7 @@ def set_dev_params(dev, dev_params,
                 parent_bus = None
             if devices.has_device(dev_type):
                 rng_pci = QDevice(dev_type, parent_bus=parent_bus)
-                set_dev_params(rng_pci, rng_params, None, dev_type)
+                set_dev_params(rng_pci, rng_params, None, 'virtio-rng')
 
                 rng_dev = qdevices.QCustomDevice(dev_type="object",
                                                  backend="backend")

diff --git a/virttest/shared/cfg/guest-hw.cfg b/virttest/shared/cfg/guest-hw.cfg
@@ -435,8 +435,8 @@ variants:
     - virtio_rng:
         no Host_RHEL.m5 Host_RHEL.m6.u0 Host_RHEL.m6.u1 Host_RHEL.m6.u2 Host_RHEL.m6.u3 Host_RHEL.m6.u4 Host_RHEL.m6.u5
         virtio_rngs += " rng0"
-        #max-bytes_virtio-rng-pci =
-        #period_virtio-rng-pci =
+        #max-bytes_virtio-rng =
+        #period_virtio-rng =
         variants:
              - rng_builtin:
                  required_qemu ~= [4.2, )