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

virtio_mode: updates PCI patterns according to the numerical ID #3777

Merged
merged 1 commit into from
Jul 24, 2023
Merged

virtio_mode: updates PCI patterns according to the numerical ID #3777

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
15 changes: 9 additions & 6 deletions qemu/tests/cfg/virtio_mode.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
virtio_dev_disable_legacy = off
virtio_mode = legacy
variants:
# Numerical PCI ids have been used as a reference
# https://man7.org/linux/man-pages/man5/pci.ids.5.html
# https://github.com/pciutils/pciids/blob/master/pci.ids
- with_netkvm:
only virtio_net
driver_name = netkvm
Expand All @@ -30,12 +33,12 @@
driver_verifier += " ndis"
device_type = "virtio-net-pci"
device_name = "Red Hat VirtIO Ethernet Adapter.*"
pci_id_pattern = "(\d+:\d+\.\d+)\s+Ethernet controller:.*?Virtio network device"
pci_id_pattern = "(\d+:\d+\.\d+).*?1af4:(?:1000|1041)"
- with_viorng:
driver_name = viorng
device_type = "virtio-rng-pci"
device_name = "VirtIO RNG Device"
pci_id_pattern = "(\d+:\d+\.\d+)\s+Unclassified device\s.*?Virtio RNG"
pci_id_pattern = "(\d+:\d+\.\d+).*?1af4:(?:1005|1044)"
no_virtio_rng:
virtio_rngs += " rng0"
variants:
Expand All @@ -56,26 +59,26 @@
driver_name = viostor
device_type = "virtio-blk-pci"
device_name = "Red Hat VirtIO SCSI controller"
pci_id_pattern = "(\d+:\d+\.\d+)\s+SCSI storage controller:.*?Virtio block device"
pci_id_pattern = "(\d+:\d+\.\d+).*?1af4:(?:1001|1042)"
- with_vioscsi:
only virtio_scsi
driver_name = vioscsi
device_type = "virtio-scsi-pci"
device_name = "Red Hat VirtIO SCSI pass-through controller"
pci_id_pattern = "(\d+:\d+\.\d+)\s+SCSI storage controller:.*?Virtio SCSI"
pci_id_pattern = "(\d+:\d+\.\d+).*?1af4:(?:1004|1048)"
- with_vioserial:
only Windows
driver_name = vioser
serials += " vs"
serial_type_vs = virtserialport
device_type = "virtio-serial-pci"
device_name = "VirtIO Serial Driver"
pci_id_pattern = "(\d+:\d+\.\d+)\s+Communication controller:.*?Virtio console"
pci_id_pattern = "(\d+:\d+\.\d+).*?1af4:(?:1003|1043)"
- with_balloon:
driver_name = balloon
balloon = balloon0
balloon_dev_devid = balloon0
balloon_dev_add_bus = yes
device_name = "VirtIO Balloon Driver"
device_type = "virtio-balloon-pci"
pci_id_pattern = "(\d+:\d+\.\d+)\s+Unclassified device\s.*?Virtio memory balloon"
pci_id_pattern = "(\d+:\d+\.\d+).*?1af4:(?:1002|1045)"
2 changes: 1 addition & 1 deletion qemu/tests/virtio_mode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def verify_virtio_mode_guest_linux(session):

:param session: shell Object
"""
pci_info = session.cmd_output("lspci")
pci_info = session.cmd_output("lspci -n")
pci_id_pattern = params["pci_id_pattern"]
pci_n = re.findall(pci_id_pattern, pci_info)[0]
if not pci_n:
Expand Down