@@ -1469,10 +1469,13 @@ VFIOGroup *vfio_get_group(int groupid, AddressSpace *as, Error **errp)
}
if (!(status.flags & VFIO_GROUP_FLAGS_VIABLE)) {
- error_setg(errp, "group %d is not viable", groupid);
- error_append_hint(errp,
+ Error *err = NULL;
+
+ error_setg(&err, "group %d is not viable", groupid);
+ error_append_hint(&err,
"Please ensure all devices within the iommu_group "
"are bound to their vfio bus driver.\n");
+ error_propagate(errp, err);
goto close_fd_exit;
}
@@ -1531,11 +1534,14 @@ int vfio_get_device(VFIOGroup *group, const char *name,
fd = ioctl(group->fd, VFIO_GROUP_GET_DEVICE_FD, name);
if (fd < 0) {
- error_setg_errno(errp, errno, "error getting device from group %d",
+ Error *err = NULL;
+
+ error_setg_errno(&err, errno, "error getting device from group %d",
group->groupid);
- error_append_hint(errp,
+ error_append_hint(&err,
"Verify all devices in group %d are bound to vfio-<bus> "
"or pci-stub and not already in use\n", group->groupid);
+ error_propagate(errp, err);
return fd;
}
@@ -2527,10 +2527,13 @@ static void vfio_populate_device(VFIOPCIDevice *vdev, Error **errp)
g_free(reg_info);
if (vdev->features & VFIO_FEATURE_ENABLE_VGA) {
- ret = vfio_populate_vga(vdev, errp);
+ Error *err = NULL;
+
+ ret = vfio_populate_vga(vdev, &err);
if (ret) {
- error_append_hint(errp, "device does not support "
+ error_append_hint(&err, "device does not support "
"requested feature x-vga\n");
+ error_propagate(errp, err);
return;
}
}
@@ -2714,9 +2717,10 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
if (!vdev->vbasedev.sysfsdev) {
if (!(~vdev->host.domain || ~vdev->host.bus ||
~vdev->host.slot || ~vdev->host.function)) {
- error_setg(errp, "No provided host device");
- error_append_hint(errp, "Use -device vfio-pci,host=DDDD:BB:DD.F "
+ error_setg(&err, "No provided host device");
+ error_append_hint(&err, "Use -device vfio-pci,host=DDDD:BB:DD.F "
"or -device vfio-pci,sysfsdev=PATH_TO_DEVICE\n");
+ error_propagate(errp, err);
return;
}
vdev->vbasedev.sysfsdev =
Ensure that hints are added even if errp is &error_fatal or &error_abort. Signed-off-by: Greg Kurz <groug@kaod.org> --- hw/vfio/common.c | 14 ++++++++++---- hw/vfio/pci.c | 12 ++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-)