[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/12] vfio/pci: Remove vfio_msix_early_setup ret
From: |
Eric Auger |
Subject: |
[Qemu-devel] [PATCH v2 10/12] vfio/pci: Remove vfio_msix_early_setup returned value |
Date: |
Tue, 20 Sep 2016 20:45:50 +0000 |
The returned value is not used anymore by the caller, vfio_realize
since the error now is stored in the error object. So let's remove it.
Signed-off-by: Eric Auger <address@hidden>
---
hw/vfio/pci.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 857d89f..f8be00d 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -1286,7 +1286,7 @@ static void vfio_pci_fixup_msix_region(VFIOPCIDevice
*vdev)
* need to first look for where the MSI-X table lives. So we
* unfortunately split MSI-X setup across two functions.
*/
-static int vfio_msix_early_setup(VFIOPCIDevice *vdev, Error **errp)
+static void vfio_msix_early_setup(VFIOPCIDevice *vdev, Error **errp)
{
uint8_t pos;
uint16_t ctrl;
@@ -1296,25 +1296,25 @@ static int vfio_msix_early_setup(VFIOPCIDevice *vdev,
Error **errp)
pos = pci_find_capability(&vdev->pdev, PCI_CAP_ID_MSIX);
if (!pos) {
- return 0;
+ return;
}
if (pread(fd, &ctrl, sizeof(ctrl),
vdev->config_offset + pos + PCI_MSIX_FLAGS) != sizeof(ctrl)) {
error_setg_errno(errp, errno, "failed to read PCI MSIX FLAGS");
- return -errno;
+ return;
}
if (pread(fd, &table, sizeof(table),
vdev->config_offset + pos + PCI_MSIX_TABLE) != sizeof(table)) {
error_setg_errno(errp, errno, "failed to read PCI MSIX TABLE");
- return -errno;
+ return;
}
if (pread(fd, &pba, sizeof(pba),
vdev->config_offset + pos + PCI_MSIX_PBA) != sizeof(pba)) {
error_setg_errno(errp, errno, "failed to read PCI MSIX PBA");
- return -errno;
+ return;
}
ctrl = le16_to_cpu(ctrl);
@@ -1347,7 +1347,7 @@ static int vfio_msix_early_setup(VFIOPCIDevice *vdev,
Error **errp)
error_setg(errp, "hardware reports invalid configuration, "
"MSIX PBA outside of specified BAR");
g_free(msix);
- return -EINVAL;
+ return;
}
}
@@ -1356,8 +1356,6 @@ static int vfio_msix_early_setup(VFIOPCIDevice *vdev,
Error **errp)
vdev->msix = msix;
vfio_pci_fixup_msix_region(vdev);
-
- return 0;
}
static int vfio_msix_setup(VFIOPCIDevice *vdev, int pos, Error **errp)
@@ -2669,7 +2667,7 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
vfio_pci_size_rom(vdev);
- ret = vfio_msix_early_setup(vdev, &err);
+ vfio_msix_early_setup(vdev, &err);
if (err) {
goto error;
}
--
1.9.1
- Re: [Qemu-devel] [PATCH v2 05/12] vfio/pci: Pass an error object to vfio_add_capabilities, (continued)
- [Qemu-devel] [PATCH v2 06/12] vfio/pci: Pass an error object to vfio_pci_igd_opregion_init, Eric Auger, 2016/09/20
- [Qemu-devel] [PATCH v2 07/12] vfio: Pass an error object to vfio_get_group, Eric Auger, 2016/09/20
- [Qemu-devel] [PATCH v2 08/12] vfio: Pass an error object to vfio_get_device, Eric Auger, 2016/09/20
- [Qemu-devel] [PATCH v2 09/12] vfio/pci: Conversion to realize, Eric Auger, 2016/09/20
- [Qemu-devel] [PATCH v2 10/12] vfio/pci: Remove vfio_msix_early_setup returned value,
Eric Auger <=
- [Qemu-devel] [PATCH v2 11/12] vfio/pci: Remove vfio_populate_device returned value, Eric Auger, 2016/09/20
- [Qemu-devel] [PATCH v2 12/12] vfio/pci: Handle host oversight, Eric Auger, 2016/09/20
- Re: [Qemu-devel] [PATCH v2 00/12] Convert VFIO-PCI to realize, Markus Armbruster, 2016/09/22