Unverified Commit 166c61a9 authored Apr 28, 2023 by openeuler-ci-bot Committed by Gitee Apr 28, 2023

!630 vfio/pci: Fix mistakenly deleted "vdev->num_regions"

Merge Pull Request from: @did-you-collect-the-wool-today 
 
virt inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6LQMC


CVE: NA

---------------------

In commit 6f5013f4, the 'vdev->num_regions' was deleted by mistake.

Fixes: 6f5013f4 (Revert "vfio/pci: Add framework for custom interrupt indices")
Signed-off-by: Kunkun Jiang <jiangkunkun@huawei.com>
 
Link:https://gitee.com/openeuler/kernel/pulls/630

 

Reviewed-by: Zenghui Yu <yuzenghui@huawei.com>
Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com>

parents d0329145 e49bc3a9

drivers/vfio/pci/vfio_pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -886,7 +886,7 @@ long vfio_pci_ioctl(void *device_data,
		if (vdev->reset_works)
		info.flags \|= VFIO_DEVICE_FLAGS_RESET;

		info.num_regions = VFIO_PCI_NUM_REGIONS +
		info.num_regions = VFIO_PCI_NUM_REGIONS + vdev->num_regions +
		vdev->num_vendor_regions;
		info.num_irqs = VFIO_PCI_NUM_IRQS + vdev->num_vendor_irqs;