[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 07/17] vfio/pci: Pass an error object to vfio_pci
From: |
Eric Auger |
Subject: |
[Qemu-devel] [PATCH v5 07/17] vfio/pci: Pass an error object to vfio_pci_igd_opregion_init |
Date: |
Thu, 6 Oct 2016 16:07:28 +0000 |
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 <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
---
v4 -> v5:
- fix indentation at vfio_pci_igd_opregion_init declaration
---
hw/vfio/pci-quirks.c | 10 +++++-----
hw/vfio/pci.c | 3 +--
hw/vfio/pci.h | 3 ++-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
index 806ea5d..2cbda08 100644
--- a/hw/vfio/pci-quirks.c
+++ b/hw/vfio/pci-quirks.c
@@ -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;
}
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index e2cf6ac..3d84126 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -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;
}
}
diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
index 87a62f9..a8366bb 100644
--- a/hw/vfio/pci.h
+++ b/hw/vfio/pci.h
@@ -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 */
--
1.9.1
- [Qemu-devel] [PATCH v5 00/17] Convert VFIO-PCI to realize, Eric Auger, 2016/10/06
- [Qemu-devel] [PATCH v5 01/17] vfio/pci: Use local error object in vfio_initfn, Eric Auger, 2016/10/06
- [Qemu-devel] [PATCH v5 02/17] vfio/pci: Pass an error object to vfio_populate_vga, Eric Auger, 2016/10/06
- [Qemu-devel] [PATCH v5 04/17] vfio/pci: Pass an error object to vfio_msix_early_setup, Eric Auger, 2016/10/06
- [Qemu-devel] [PATCH v5 03/17] vfio/pci: Pass an error object to vfio_populate_device, Eric Auger, 2016/10/06
- [Qemu-devel] [PATCH v5 05/17] vfio/pci: Pass an error object to vfio_intx_enable, Eric Auger, 2016/10/06
- [Qemu-devel] [PATCH v5 07/17] vfio/pci: Pass an error object to vfio_pci_igd_opregion_init,
Eric Auger <=
- [Qemu-devel] [PATCH v5 08/17] vfio: Pass an Error object to vfio_connect_container, Eric Auger, 2016/10/06
- Re: [Qemu-devel] [PATCH v5 08/17] vfio: Pass an Error object to vfio_connect_container, Markus Armbruster, 2016/10/07
- Re: [Qemu-devel] [PATCH v5 08/17] vfio: Pass an Error object to vfio_connect_container, Auger Eric, 2016/10/07
- Re: [Qemu-devel] [PATCH v5 08/17] vfio: Pass an Error object to vfio_connect_container, Alexey Kardashevskiy, 2016/10/09
- Re: [Qemu-devel] [PATCH v5 08/17] vfio: Pass an Error object to vfio_connect_container, David Gibson, 2016/10/10
- Re: [Qemu-devel] [PATCH v5 08/17] vfio: Pass an Error object to vfio_connect_container, Auger Eric, 2016/10/10
- Re: [Qemu-devel] [PATCH v5 08/17] vfio: Pass an Error object to vfio_connect_container, Markus Armbruster, 2016/10/10
- Re: [Qemu-devel] [PATCH v5 08/17] vfio: Pass an Error object to vfio_connect_container, Auger Eric, 2016/10/10
- Re: [Qemu-devel] [PATCH v5 08/17] vfio: Pass an Error object to vfio_connect_container, David Gibson, 2016/10/10
- Re: [Qemu-devel] [PATCH v5 08/17] vfio: Pass an Error object to vfio_connect_container, Markus Armbruster, 2016/10/10