Provide a vfio error handling callback, that can be used by devices to handle PCI errors for passthrough devices.
Signed-off-by: Farhan Ali <[email protected]> --- hw/vfio/pci.c | 27 +++++++++++++++++++++------ hw/vfio/pci.h | 1 + 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 428ab2f069..a2f489b34d 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -3244,21 +3244,36 @@ void vfio_pci_put_device(VFIOPCIDevice *vdev) static void vfio_err_notifier_handler(void *opaque) { VFIOPCIDevice *vdev = opaque; + Error *err = NULL; if (!event_notifier_test_and_clear(&vdev->err_notifier)) { return; } /* - * TBD. Retrieve the error details and decide what action - * needs to be taken. One of the actions could be to pass - * the error to the guest and have the guest driver recover - * from the error. This requires that PCIe capabilities be - * exposed to the guest. For now, we just terminate the + * We can retrieve the error details and decide what action + * needs to be taken in err_handler(). One of the actions could + * be to pass the error to the guest and have the guest driver + * recover from the error. This requires that PCIe capabilities be + * exposed to the guest. + * + * If err_handler() is not implemented/fails, we just terminate the * guest to contain the error. */ - error_report("%s(%s) Unrecoverable error detected. Please collect any data possible and then kill the guest", __func__, vdev->vbasedev.name); + if (vdev->err_handler && vdev->err_handler(vdev, &err)) { + return; + } + + if (err) { + error_prepend(&err, "Unrecoverable PCIe error detected for device %s", + vdev->vbasedev.name); + error_report_err(err); + } else { + error_printf("Unrecoverable PCIe error detected for device %s", + vdev->vbasedev.name); + } + error_printf("Please collect any data possible and then kill the guest"); vm_stop(RUN_STATE_INTERNAL_ERROR); } diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h index c9ab949870..c067bbbebc 100644 --- a/hw/vfio/pci.h +++ b/hw/vfio/pci.h @@ -146,6 +146,7 @@ struct VFIOPCIDevice { EventNotifier err_notifier; EventNotifier req_notifier; int (*resetfn)(struct VFIOPCIDevice *); + bool (*err_handler)(struct VFIOPCIDevice *, Error **); uint32_t vendor_id; uint32_t device_id; uint32_t sub_vendor_id; -- 2.43.0
