ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vfio: don't display error if no pci devices are assigned to container

Browse Source 
Change-Id: I21429ce084cfd39af6a9997b4c1e459f5a6ef672
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2018-10-05 16:46:00 +02:00
committed by Florin Coras
parent 16de39e1a1
commit b7620fdfd5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/vlib/linux/vfio.c
View File

@@ -35,7 +35,7 @@
linux_vfio_main_t vfio_main;
static int
map_regions (vlib_main_t * vm, int fd)
vfio_map_regions (vlib_main_t * vm, int fd)
{
vlib_physmem_main_t *vpm = &physmem_main;
linux_vfio_main_t *lvm = &vfio_main;
@@ -58,7 +58,8 @@ map_regions (vlib_main_t * vm, int fd)
vlib_log_debug (lvm->log_default, "map DMA va:0x%lx iova:%lx "
"size:0x%lx", dm.vaddr, dm.iova, dm.size);
if ((rv = ioctl (fd, VFIO_IOMMU_MAP_DMA, &dm)))
if ((rv = ioctl (fd, VFIO_IOMMU_MAP_DMA, &dm)) &&
errno != EINVAL)
{
vlib_log_err (lvm->log_default, "map DMA va:0x%lx iova:%lx "
"size:0x%lx failed, error %s (errno %d)",
@@ -78,7 +79,7 @@ linux_vfio_dma_map_regions (vlib_main_t * vm)
linux_vfio_main_t *lvm = &vfio_main;
if (lvm->container_fd != -1)
map_regions (vm, lvm->container_fd);
vfio_map_regions (vm, lvm->container_fd);
}
static linux_pci_vfio_iommu_group_t *