[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/11] vfio-pci: Don't peak at msi_supported
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PATCH 07/11] vfio-pci: Don't peak at msi_supported |
Date: |
Thu, 04 Oct 2012 16:18:18 -0600 |
User-agent: |
StGIT/0.14.3 |
Let the init function fail, just don't warn for -ENOTSUP.
Signed-off-by: Alex Williamson <address@hidden>
---
hw/vfio_pci.c | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c
index 4d01707..d62ddd1 100644
--- a/hw/vfio_pci.c
+++ b/hw/vfio_pci.c
@@ -1084,14 +1084,6 @@ static int vfio_setup_msi(VFIODevice *vdev, int pos)
bool msi_64bit, msi_maskbit;
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),
vdev->config_offset + pos + PCI_CAP_FLAGS) != sizeof(ctrl)) {
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);
if (ret < 0) {
+ if (ret == -ENOTSUP) {
+ return 0;
+ }
error_report("vfio: msi_init failed\n");
return ret;
}
@@ -1173,20 +1168,15 @@ static int vfio_setup_msix(VFIODevice *vdev, int pos)
{
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,
&vdev->bars[vdev->msix->table_bar].mem,
vdev->msix->table_bar, vdev->msix->table_offset,
&vdev->bars[vdev->msix->pba_bar].mem,
vdev->msix->pba_bar, vdev->msix->pba_offset, pos);
if (ret < 0) {
+ if (ret == -ENOTSUP) {
+ return 0;
+ }
error_report("vfio: msix_init failed\n");
return ret;
}
- [Qemu-devel] [PATCH 00/11] vfio-pci cleanup and fixes, Alex Williamson, 2012/10/04
- [Qemu-devel] [PATCH 01/11] vfio-pci: Update slow path INTx algorithm, Alex Williamson, 2012/10/04
- [Qemu-devel] [PATCH 02/11] vfio-pci: Re-order map/unmap, Alex Williamson, 2012/10/04
- [Qemu-devel] [PATCH 03/11] vfio-pci: Unmap and retry DMA mapping, Alex Williamson, 2012/10/04
- [Qemu-devel] [PATCH 05/11] vfio-pci: No spurious MSIs, Alex Williamson, 2012/10/04
- [Qemu-devel] [PATCH 06/11] vfio-pci: Roll the header into the .c file, Alex Williamson, 2012/10/04
- [Qemu-devel] [PATCH 07/11] vfio-pci: Don't peak at msi_supported,
Alex Williamson <=
- [Qemu-devel] [PATCH 11/11] vfio-pci: Cleanup on INTx setup failure, Alex Williamson, 2012/10/04
- [Qemu-devel] [PATCH 08/11] vfio-pci: Use uintptr_t for void* cast, Alex Williamson, 2012/10/04
- [Qemu-devel] [PATCH 10/11] vfio-pci: Extend reset, Alex Williamson, 2012/10/04
- [Qemu-devel] [PATCH 04/11] vfio-pci: Rework MSIX setup/teardown, Alex Williamson, 2012/10/04
- [Qemu-devel] [PATCH 09/11] vfio-pci: Remove setting of MSI qsize, Alex Williamson, 2012/10/04