openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
Eric Auger 2016-10-17 10:58:01 -06:00 committed by Alex Williamson
parent 1a22aca1d0
commit ec3bcf424e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/vfio/pci.c
View File

@ -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 * need to first look for where the MSI-X table lives. So we
* unfortunately split MSI-X setup across two functions. * 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; uint8_t pos;
uint16_t ctrl; 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); pos = pci_find_capability(&vdev->pdev, PCI_CAP_ID_MSIX);
if (!pos) { if (!pos) {
return 0; return;
} }
if (pread(fd, &ctrl, sizeof(ctrl), if (pread(fd, &ctrl, sizeof(ctrl),
vdev->config_offset + pos + PCI_MSIX_FLAGS) != sizeof(ctrl)) { vdev->config_offset + pos + PCI_MSIX_FLAGS) != sizeof(ctrl)) {
error_setg_errno(errp, errno, "failed to read PCI MSIX FLAGS"); error_setg_errno(errp, errno, "failed to read PCI MSIX FLAGS");
return -errno; return;
} }
if (pread(fd, &table, sizeof(table), if (pread(fd, &table, sizeof(table),
vdev->config_offset + pos + PCI_MSIX_TABLE) != sizeof(table)) { vdev->config_offset + pos + PCI_MSIX_TABLE) != sizeof(table)) {
error_setg_errno(errp, errno, "failed to read PCI MSIX TABLE"); error_setg_errno(errp, errno, "failed to read PCI MSIX TABLE");
return -errno; return;
} }
if (pread(fd, &pba, sizeof(pba), if (pread(fd, &pba, sizeof(pba),
vdev->config_offset + pos + PCI_MSIX_PBA) != sizeof(pba)) { vdev->config_offset + pos + PCI_MSIX_PBA) != sizeof(pba)) {
error_setg_errno(errp, errno, "failed to read PCI MSIX PBA"); error_setg_errno(errp, errno, "failed to read PCI MSIX PBA");
return -errno; return;
} }
ctrl = le16_to_cpu(ctrl); 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, " error_setg(errp, "hardware reports invalid configuration, "
"MSIX PBA outside of specified BAR"); "MSIX PBA outside of specified BAR");
g_free(msix); g_free(msix);
return -EINVAL; return;
} }
} }
@ -1360,8 +1360,6 @@ static int vfio_msix_early_setup(VFIOPCIDevice *vdev, Error **errp)
vdev->msix = msix; vdev->msix = msix;
vfio_pci_fixup_msix_region(vdev); vfio_pci_fixup_msix_region(vdev);
return 0;
} }
static int vfio_msix_setup(VFIOPCIDevice *vdev, int pos, Error **errp) 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; VFIODevice *vbasedev_iter;
VFIOGroup *group; VFIOGroup *group;
char *tmp, group_path[PATH_MAX], *group_name; char *tmp, group_path[PATH_MAX], *group_name;
Error *err = NULL;
ssize_t len; ssize_t len;
struct stat st; struct stat st;
int groupid; int groupid;
@ -2670,8 +2669,9 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
vfio_pci_size_rom(vdev); vfio_pci_size_rom(vdev);
ret = vfio_msix_early_setup(vdev, errp); vfio_msix_early_setup(vdev, &err);
if (ret) { if (err) {
error_propagate(errp, err);
goto error; goto error;
} }