david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vfio-pci: Don't peak at msi_supported

Browse Source 
Let the init function fail, just don't warn for -ENOTSUP.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
Alex Williamson 2012-10-08 08:45:30 -06:00
parent 5c97e5eba6
commit e43b9a5a4f
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/vfio_pci.c
View File

@ -1084,14 +1084,6 @@ static int vfio_setup_msi(VFIODevice *vdev, int pos)
bool msi_64bit, msi_maskbit; bool msi_64bit, msi_maskbit;
int ret, entries; int ret, entries;
/*
* TODO: don't peek into msi_supported, let msi_init fail and
* check for ENOTSUP
*/
if (!msi_supported) {
return 0;
}
if (pread(vdev->fd, &ctrl, sizeof(ctrl), if (pread(vdev->fd, &ctrl, sizeof(ctrl),
vdev->config_offset + pos + PCI_CAP_FLAGS) != sizeof(ctrl)) { vdev->config_offset + pos + PCI_CAP_FLAGS) != sizeof(ctrl)) {
return -errno; return -errno;
@ -1107,6 +1099,9 @@ static int vfio_setup_msi(VFIODevice *vdev, int pos)
ret = msi_init(&vdev->pdev, pos, entries, msi_64bit, msi_maskbit); ret = msi_init(&vdev->pdev, pos, entries, msi_64bit, msi_maskbit);
if (ret < 0) { if (ret < 0) {
if (ret == -ENOTSUP) {
return 0;
}
error_report("vfio: msi_init failed\n"); error_report("vfio: msi_init failed\n");
return ret; return ret;
} }
@ -1173,20 +1168,15 @@ static int vfio_setup_msix(VFIODevice *vdev, int pos)
{ {
int ret; int ret;
/*
* TODO: don't peek into msi_supported, let msix_init fail and
* check for ENOTSUP
*/
if (!msi_supported) {
return 0;
}
ret = msix_init(&vdev->pdev, vdev->msix->entries, ret = msix_init(&vdev->pdev, vdev->msix->entries,
&vdev->bars[vdev->msix->table_bar].mem, &vdev->bars[vdev->msix->table_bar].mem,
vdev->msix->table_bar, vdev->msix->table_offset, vdev->msix->table_bar, vdev->msix->table_offset,
&vdev->bars[vdev->msix->pba_bar].mem, &vdev->bars[vdev->msix->pba_bar].mem,
vdev->msix->pba_bar, vdev->msix->pba_offset, pos); vdev->msix->pba_bar, vdev->msix->pba_offset, pos);
if (ret < 0) { if (ret < 0) {
if (ret == -ENOTSUP) {
return 0;
}
error_report("vfio: msix_init failed\n"); error_report("vfio: msix_init failed\n");
return ret; return ret;
} }