[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/22] vfio/common: Propagate KVM_SET_DEVICE_ATTR error if any
|
From: |
Cédric Le Goater |
|
Subject: |
[PULL 04/22] vfio/common: Propagate KVM_SET_DEVICE_ATTR error if any |
|
Date: |
Wed, 18 Oct 2023 11:45:13 +0200 |
From: Eric Auger <eric.auger@redhat.com>
In the VFIO_SPAPR_TCE_v2_IOMMU container case, when
KVM_SET_DEVICE_ATTR fails, we currently don't propagate the
error as we do on the vfio_spapr_create_window() failure
case. Let's align the code. Take the opportunity to
reword the error message and make it more explicit.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
hw/vfio/common.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index
4e122fc4e4001ee02e24c5593e4d36b428c848e2..c54a72ec803779b45803573c6c633a170c5bad1f
100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -878,11 +878,11 @@ static void vfio_listener_region_add(MemoryListener
*listener,
QLIST_FOREACH(group, &container->group_list, container_next) {
param.groupfd = group->fd;
if (ioctl(vfio_kvm_device_fd, KVM_SET_DEVICE_ATTR, &attr))
{
- error_report("vfio: failed to setup fd %d "
- "for a group with fd %d: %s",
- param.tablefd, param.groupfd,
- strerror(errno));
- return;
+ error_setg_errno(&err, errno,
+ "vfio: failed GROUP_SET_SPAPR_TCE for
"
+ "KVM VFIO device %d and group fd %d",
+ param.tablefd, param.groupfd);
+ goto fail;
}
trace_vfio_spapr_group_attach(param.groupfd,
param.tablefd);
}
--
2.41.0
- [PULL 00/22] vfio queue, Cédric Le Goater, 2023/10/18
- [PULL 02/22] linux-headers: Add iommufd.h, Cédric Le Goater, 2023/10/18
- [PULL 04/22] vfio/common: Propagate KVM_SET_DEVICE_ATTR error if any,
Cédric Le Goater <=
- [PULL 01/22] scripts/update-linux-headers: Add iommufd.h, Cédric Le Goater, 2023/10/18
- [PULL 13/22] vfio/common: Store the parent container in VFIODevice, Cédric Le Goater, 2023/10/18
- [PULL 16/22] vfio/pci: Fix a potential memory leak in vfio_listener_region_add, Cédric Le Goater, 2023/10/18
- [PULL 06/22] vfio/common: Extract out vfio_kvm_device_[add/del]_fd, Cédric Le Goater, 2023/10/18
- [PULL 07/22] vfio/pci: Introduce vfio_[attach/detach]_device, Cédric Le Goater, 2023/10/18
- [PULL 05/22] vfio/common: Introduce vfio_container_add|del_section_window(), Cédric Le Goater, 2023/10/18
- [PULL 03/22] vfio/common: Move IOMMU agnostic helpers to a separate file, Cédric Le Goater, 2023/10/18
- [PULL 12/22] vfio/common: Introduce a per container device list, Cédric Le Goater, 2023/10/18
- [PULL 17/22] vfio/ap: Remove pointless apdev variable, Cédric Le Goater, 2023/10/18
- [PULL 11/22] vfio/common: Move VFIO reset handler registration to a group agnostic function, Cédric Le Goater, 2023/10/18