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.

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

device_bit_check:fix pci search pattern #3768

Merged

Conversation

qingwangrh
Copy link
Contributor

@qingwangrh qingwangrh commented Jul 5, 2023

Updates the case logic using numerical ID as
test point due to name will be changed without
notice. In order to support 0.9 and 1.0 virtio
devices, the pattern now contains both IDs.

The ids of device may refer to
https://github.com/vcrhonek/hwdata/blob/master/pci.ids#L24039-L24058

ID:2217301

@qingwangrh
Copy link
Contributor Author

python ConfigTest.py --testcase=device_bit_check.block_device.q35 --iothread_scheme=roundrobin --nr_iothreads=2 --platform=x86_64 --guestname=RHEL.8.8.0,RHEL.8.9.0,RHEL.9.2.0,RHEL.9.3.0 --driveformat=virtio_scsi --nicmodel=virtio_net --imageformat=qcow2 --machines=q35 --customsparams="vm_mem_limit = 12G\nimage_aio=threads" --firmware=default_bios --netdst=virbr0

(1/8) Host_RHEL.m8.u9.product_rhel.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.8.8.0.x86_64.io-github-autotest-qemu.unattended_install.cdrom.extra_cdrom_ks.default_install.aio_threads.q35: STARTED
(1/8) Host_RHEL.m8.u9.product_rhel.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.8.8.0.x86_64.io-github-autotest-qemu.unattended_install.cdrom.extra_cdrom_ks.default_install.aio_threads.q35: PASS (1000.59 s)
(2/8) Host_RHEL.m8.u9.product_rhel.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.8.9.0.x86_64.io-github-autotest-qemu.unattended_install.cdrom.extra_cdrom_ks.default_install.aio_threads.q35: STARTED
(2/8) Host_RHEL.m8.u9.product_rhel.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.8.9.0.x86_64.io-github-autotest-qemu.unattended_install.cdrom.extra_cdrom_ks.default_install.aio_threads.q35: PASS (769.86 s)
(3/8) Host_RHEL.m8.u9.product_rhel.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.2.0.x86_64.io-github-autotest-qemu.unattended_install.cdrom.extra_cdrom_ks.default_install.aio_threads.q35: STARTED
(3/8) Host_RHEL.m8.u9.product_rhel.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.2.0.x86_64.io-github-autotest-qemu.unattended_install.cdrom.extra_cdrom_ks.default_install.aio_threads.q35: PASS (917.91 s)
(4/8) Host_RHEL.m8.u9.product_rhel.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.3.0.x86_64.io-github-autotest-qemu.unattended_install.cdrom.extra_cdrom_ks.default_install.aio_threads.q35: STARTED
(4/8) Host_RHEL.m8.u9.product_rhel.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.3.0.x86_64.io-github-autotest-qemu.unattended_install.cdrom.extra_cdrom_ks.default_install.aio_threads.q35: PASS (582.11 s)
(5/8) Host_RHEL.m8.u9.product_rhel.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.8.8.0.x86_64.io-github-autotest-qemu.device_bit_check.block_device.q35: STARTED
(5/8) Host_RHEL.m8.u9.product_rhel.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.8.8.0.x86_64.io-github-autotest-qemu.device_bit_check.block_device.q35: PASS (181.30 s)
(6/8) Host_RHEL.m8.u9.product_rhel.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.8.9.0.x86_64.io-github-autotest-qemu.device_bit_check.block_device.q35: STARTED
(6/8) Host_RHEL.m8.u9.product_rhel.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.8.9.0.x86_64.io-github-autotest-qemu.device_bit_check.block_device.q35: PASS (178.38 s)
(7/8) Host_RHEL.m8.u9.product_rhel.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.2.0.x86_64.io-github-autotest-qemu.device_bit_check.block_device.q35: STARTED
(7/8) Host_RHEL.m8.u9.product_rhel.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.2.0.x86_64.io-github-autotest-qemu.device_bit_check.block_device.q35: PASS (186.08 s)
(8/8) Host_RHEL.m8.u9.product_rhel.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.3.0.x86_64.io-github-autotest-qemu.device_bit_check.block_device.q35: STARTED
(8/8) Host_RHEL.m8.u9.product_rhel.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.3.0.x86_64.io-github-autotest-qemu.device_bit_check.block_device.q35: PASS (179.36 s)
RESULTS : PASS 8 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0

@qingwangrh
Copy link
Contributor Author

@XueqiangWei @zhenyzha Please help to review,thanks

@qingwangrh qingwangrh force-pushed the 2217301_fix_pci_search_pattern branch from 6f37467 to 3ff5f91 Compare July 14, 2023 04:00
@qingwangrh
Copy link
Contributor Author

@mcasquer Please help to review

@mcasquer
Copy link
Contributor

@mcasquer Please help to review

Let's wait for a veredict in #3777, thanks!

Updates the case logic using numerical ID as
test point due to name will be changed without
notice. In order to support 0.9 and 1.0 virtio
devices, the pattern now contains both IDs.

The ids of device may refer to
https://github.com/vcrhonek/hwdata/blob/master/pci.ids#L24039-L24058

Signed-off-by: qingwangrh <[email protected]>
@qingwangrh qingwangrh force-pushed the 2217301_fix_pci_search_pattern branch from 3ff5f91 to 97e286e Compare July 19, 2023 08:00
@XueqiangWei
Copy link
Contributor

Tested with edk2, the results were passed.
(1/4) Host_RHEL.m9.u3.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.8.8.0.x86_6
4.io-github-autotest-qemu.device_bit_check.block_device.q35: STARTED
(1/4) Host_RHEL.m9.u3.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.8.8.0.x86_6
4.io-github-autotest-qemu.device_bit_check.block_device.q35: PASS (259.06 s)
(2/4) Host_RHEL.m9.u3.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.8.9.0.x86_6
4.io-github-autotest-qemu.device_bit_check.block_device.q35: STARTED
(2/4) Host_RHEL.m9.u3.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.8.9.0.x86_6
4.io-github-autotest-qemu.device_bit_check.block_device.q35: PASS (263.35 s)
(3/4) Host_RHEL.m9.u3.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.2.0.x86_6
4.io-github-autotest-qemu.device_bit_check.block_device.q35: STARTED
(3/4) Host_RHEL.m9.u3.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.2.0.x86_64.io-github-autotest-qemu.device_bit_check.block_device.q35: PASS (271.54 s)
(4/4) Host_RHEL.m9.u3.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.3.0.x86_64.io-github-autotest-qemu.device_bit_check.block_device.q35: STARTED
(4/4) Host_RHEL.m9.u3.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.3.0.x86_64.io-github-autotest-qemu.device_bit_check.block_device.q35: PASS (320.23 s)

@XueqiangWei
Copy link
Contributor

LGTM,
Acked-by: [email protected]

@XueqiangWei
Copy link
Contributor

@zhenyzha Please help review it. Many thanks.

@SiboWang1997
Copy link
Contributor

Tested with aarch64, the results were passed.
virtio_blk:
python3 ConfigTest.py --guestname=RHEL.9.3.0..page_64k --platform=aarch64 --machines=arm64-pci --driveformat=virtio_blk --nicmodel=virtio_net --mem=8192 --vcpu=4 --testcase=device_bit_check.block_device --netdst=virbr0 --clone=no --debug

(1/1) Host_RHEL.m9.u3.qcow2.virtio_blk.up.virtio_net.Guest.RHEL.9.3.0.aarch64.page_64k.io-github-autotest-qemu.device_bit_check.block_device.arm64-pci: STARTED
(1/1) Host_RHEL.m9.u3.qcow2.virtio_blk.up.virtio_net.Guest.RHEL.9.3.0.aarch64.page_64k.io-github-autotest-qemu.device_bit_check.block_device.arm64-pci: PASS (179.71 s)
RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0
JOB HTML : /root/avocado/job-results/job-2023-08-07T01.45-d640074/results.html
JOB TIME : 180.89 s

virtio_scsi:
python3 ConfigTest.py --guestname=RHEL.9.3.0..page_64k --platform=aarch64 --machines=arm64-pci --driveformat=virtio_scsi --nicmodel=virtio_net --mem=8192 --vcpu=4 --testcase=device_bit_check.block_device --netdst=virbr0 --clone=no --debug

(1/1) Host_RHEL.m9.u3.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.3.0.aarch64.page_64k.io-github-autotest-qemu.device_bit_check.block_device.arm64-pci: STARTED
(1/1) Host_RHEL.m9.u3.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.3.0.aarch64.page_64k.io-github-autotest-qemu.device_bit_check.block_device.arm64-pci: PASS (212.59 s)
RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0
JOB HTML : /root/avocado/job-results/job-2023-08-06T22.44-22fb6a5/results.html
JOB TIME : 213.72 s

LGTM,
Acked-by: [email protected]

@zhenyzha
Copy link
Contributor

zhenyzha commented Aug 7, 2023

LGTM, Acked-by: [email protected]

Thanks @SiboWang1997 for testing

LGTM.Acked-by: Zhenyu Zhang [email protected]

@XueqiangWei XueqiangWei merged commit 035bab0 into autotest:master Aug 7, 2023
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants