From 82b362a739ac5f3ec23b7447514278232462821f Mon Sep 17 00:00:00 2001 From: Xujun Ma Date: Tue, 8 Oct 2024 03:27:50 -0400 Subject: [PATCH] Add device address parameter for s390x Signed-off-by: Xujun Ma --- virttest/qemu_devices/qcontainer.py | 4 ++-- virttest/qemu_devices/qdevices.py | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/virttest/qemu_devices/qcontainer.py b/virttest/qemu_devices/qcontainer.py index e21748bb4b..359150f7c1 100644 --- 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 != "": diff --git a/virttest/qemu_devices/qdevices.py b/virttest/qemu_devices/qdevices.py index 2020d7194b..679f438ce8 100644 --- 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):