Add device address parameter for s390x

Signed-off-by: Xujun Ma <xuma@redhat.com>
avocado-framework · Oct 8, 2024 · bfd86ab · bfd86ab
1 parent e69c15e
commit bfd86ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/virttest/qemu_devices/qcontainer.py b/virttest/qemu_devices/qcontainer.py
@@ -2472,7 +2472,7 @@ def define_hbas(
                 if scsi_hba == "virtio-scsi-device":
                     pci_bus = {"type": "virtio-bus"}
                 elif scsi_hba == "virtio-scsi-ccw":
-                    pci_bus = None
+                    pci_bus = {'aobject': 'virtual-css'}
             elif scsi_hba == "spapr-vscsi":
                 addr_spec = [64, 32]
                 pci_bus = None
@@ -3132,7 +3132,7 @@ def serials_define_by_variables(
                 if bus_type == "virtio-serial-device":
                     pci_bus = {"type": "virtio-bus"}
                 elif bus_type == "virtio-serial-ccw":
-                    pci_bus = None
+                    pci_bus = {'aobject': 'virtual-css'}
                 else:
                     pci_bus = {"aobject": "pci.0"}
                 if bus != "<new>":

diff --git a/virttest/qemu_devices/qdevices.py b/virttest/qemu_devices/qdevices.py
@@ -3080,10 +3080,13 @@ class QNoAddrCustomBus(QSparseBus):
     """
 
     def _set_device_props(self, device, addr):
-        pass
+        if self.aobject == "virtual-css":
+            device.set_param("devno", "fe.0.%s" % f"{addr[0]:04x}")
+        else:
+            pass
 
     def _update_device_props(self, device, addr):
-        pass
+        self._set_device_props(device, addr)
 
 
 class QUSBBus(QSparseBus):