Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

device_bit_check:fix pci search pattern #3768

Merged
merged 1 commit into from
Aug 7, 2023
Merged

device_bit_check:fix pci search pattern #3768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions qemu/tests/cfg/device_bit_check.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@
virtio_blk:
dev_param_name = blk_extra_params
blk_extra_params = ""
pci_id_pattern = "(\d+:\d+\.\d+)\s+SCSI storage controller:.*?Virtio block device"
pci_id_pattern = "(\d+:\d+\.\d+).*?1af4:(?:1001|1042)"
dev_type = "virtio-blk-.*"
virtio_scsi:
dev_param_name = bus_extra_params
bus_extra_params = ""
pci_id_pattern = "(\d+:\d+\.\d+)\s+SCSI storage controller:.*?Virtio SCSI"
pci_id_pattern = "(\d+:\d+\.\d+).*?1af4:(?:1004|1048)"
dev_type = "virtio-scsi-.*"
s390x:
ccw_id_pattern = "\d+\.\d+\."
- nic_device:
only virtio_net
nic_extra_params = ""
pci_id_pattern = "(\d+:\d+\.\d+)\s+Ethernet controller:.*?Virtio network device"
pci_id_pattern = "(\d+:\d+\.\d+).*?1af4:(?:1000|1041)"
dev_type = "virtio-net-.*"
dev_param_name = nic_extra_params
2 changes: 1 addition & 1 deletion qemu/tests/device_bit_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def run(test, params, env):
test.error("Can't get the ccw id for device")
cmd = "cat /sys/bus/ccw/devices/%s/" % ccw_n[0]
else:
pci_info = session.cmd_output("lspci")
pci_info = session.cmd_output("lspci -n")
pci_n = re.findall(pci_id_pattern, pci_info)
if not pci_n:
test.error("Can't get the pci id for device")
Expand Down