Commit ec3bcf42 authored by Eric Auger's avatar Eric Auger Committed by Alex Williamson
Browse files

vfio/pci: Remove vfio_msix_early_setup returned value 



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: default avatarEric Auger <eric.auger@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 1a22aca1

hw/vfio/pci.c

+10 −10
Original line number Diff line number Diff line
@@ -1290,7 +1290,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;
@@ -1300,25 +1300,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);
@@ -1351,7 +1351,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;

        }

    }
@@ -1360,8 +1360,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)
@@ -2519,6 +2517,7 @@ static void vfio_realize(PCIDevice *pdev, Error **errp) 
    VFIODevice *vbasedev_iter;

    VFIOGroup *group;

    char *tmp, group_path[PATH_MAX], *group_name;

    Error *err = NULL;

    ssize_t len;

    struct stat st;

    int groupid;
@@ -2670,8 +2669,9 @@ static void vfio_realize(PCIDevice *pdev, Error **errp) 


    vfio_pci_size_rom(vdev);



    ret = vfio_msix_early_setup(vdev, errp);

    if (ret) {

    vfio_msix_early_setup(vdev, &err);

    if (err) {

        error_propagate(errp, err);

        goto error;

    }