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

vfio/pci: Pass an error object to vfio_pci_igd_opregion_init 

Pass an error object to prepare for migration to VFIO-PCI realize.

In vfio_probe_igd_bar4_quirk, simply report the error.

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:57:59 -06:00 committed by Alex Williamson
parent 7ef165b9a8
commit 7237011d05
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/vfio/pci-quirks.c
View File

@ -1056,7 +1056,7 @@ typedef struct VFIOIGDQuirk {
* of the IGD device.
*/
int vfio_pci_igd_opregion_init(VFIOPCIDevice *vdev,
struct vfio_region_info *info)
struct vfio_region_info *info, Error **errp)
{
int ret;
@ -1064,7 +1064,7 @@ int vfio_pci_igd_opregion_init(VFIOPCIDevice *vdev,
ret = pread(vdev->vbasedev.fd, vdev->igd_opregion,
info->size, info->offset);
if (ret != info->size) {
error_report("vfio: Error reading IGD OpRegion");
error_setg(errp, "failed to read IGD OpRegion");
g_free(vdev->igd_opregion);
vdev->igd_opregion = NULL;
return -EINVAL;
@ -1489,10 +1489,10 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr)
}
/* Setup OpRegion access */
ret = vfio_pci_igd_opregion_init(vdev, opregion);
ret = vfio_pci_igd_opregion_init(vdev, opregion, &err);
if (ret) {
error_report("IGD device %s failed to setup OpRegion, "
"legacy mode disabled", vdev->vbasedev.name);
error_append_hint(&err, "IGD legacy mode disabled\n");
error_reportf_err(err, ERR_PREFIX, vdev->vbasedev.name);
goto out;
}

3
hw/vfio/pci.c
View File

@ -2721,10 +2721,9 @@ static int vfio_initfn(PCIDevice *pdev)
goto out_teardown;
}
ret = vfio_pci_igd_opregion_init(vdev, opregion);
ret = vfio_pci_igd_opregion_init(vdev, opregion, &err);
g_free(opregion);
if (ret) {
error_setg_errno(&err, -ret, "IGD OpRegion initialization failed");
goto out_teardown;
}
}

3
hw/vfio/pci.h
View File

@ -164,6 +164,7 @@ void vfio_setup_resetfn_quirk(VFIOPCIDevice *vdev);
int vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp);
int vfio_pci_igd_opregion_init(VFIOPCIDevice *vdev,
struct vfio_region_info *info);
struct vfio_region_info *info,
Error **errp);
#endif /* HW_VFIO_VFIO_PCI_H */