[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 21/21] vfio: Extend vfio_set_migration_error() with Error* arg
From: |
Cédric Le Goater |
Subject: |
[PATCH v2 21/21] vfio: Extend vfio_set_migration_error() with Error* argument |
Date: |
Tue, 27 Feb 2024 19:03:45 +0100 |
vfio_set_migration_error() sets the 'return' error on the migration
stream if a migration is in progress. To improve error reporting, add
a new Error* argument to also set the Error object on the migration
stream, if a migration is progress.
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
hw/vfio/common.c | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index
8fbf04e55d1b304bc80fdd9ef6f5f5089acd3360..5e6353ae468c885af0fa169b671902a518df4c75
100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -148,16 +148,18 @@ bool vfio_viommu_preset(VFIODevice *vbasedev)
return vbasedev->bcontainer->space->as != &address_space_memory;
}
-static void vfio_set_migration_error(int err)
+static void vfio_set_migration_error(int ret, Error *err)
{
MigrationState *ms = migrate_get_current();
if (migration_is_setup_or_active(ms->state)) {
WITH_QEMU_LOCK_GUARD(&ms->qemu_file_lock) {
if (ms->to_dst_file) {
- qemu_file_set_error(ms->to_dst_file, err);
+ qemu_file_set_error_obj(ms->to_dst_file, ret, err);
}
}
+ } else {
+ error_report_err(err);
}
}
@@ -304,9 +306,10 @@ static void vfio_iommu_map_notify(IOMMUNotifier *n,
IOMMUTLBEntry *iotlb)
iova, iova + iotlb->addr_mask);
if (iotlb->target_as != &address_space_memory) {
- error_report("Wrong target AS \"%s\", only system memory is allowed",
- iotlb->target_as->name ? iotlb->target_as->name : "none");
- vfio_set_migration_error(-EINVAL);
+ error_setg(&local_err,
+ "Wrong target AS \"%s\", only system memory is allowed",
+ iotlb->target_as->name ? iotlb->target_as->name : "none");
+ vfio_set_migration_error(-EINVAL, local_err);
return;
}
@@ -339,11 +342,12 @@ static void vfio_iommu_map_notify(IOMMUNotifier *n,
IOMMUTLBEntry *iotlb)
ret = vfio_container_dma_unmap(bcontainer, iova,
iotlb->addr_mask + 1, iotlb);
if (ret) {
- error_report("vfio_container_dma_unmap(%p, 0x%"HWADDR_PRIx", "
- "0x%"HWADDR_PRIx") = %d (%s)",
- bcontainer, iova,
- iotlb->addr_mask + 1, ret, strerror(-ret));
- vfio_set_migration_error(ret);
+ error_setg(&local_err,
+ "vfio_container_dma_unmap(%p, 0x%"HWADDR_PRIx", "
+ "0x%"HWADDR_PRIx") = %d (%s)",
+ bcontainer, iova,
+ iotlb->addr_mask + 1, ret, strerror(-ret));
+ vfio_set_migration_error(ret, local_err);
}
}
out:
@@ -1239,14 +1243,14 @@ static void vfio_iommu_map_dirty_notify(IOMMUNotifier
*n, IOMMUTLBEntry *iotlb)
trace_vfio_iommu_map_dirty_notify(iova, iova + iotlb->addr_mask);
if (iotlb->target_as != &address_space_memory) {
- error_report("Wrong target AS \"%s\", only system memory is allowed",
- iotlb->target_as->name ? iotlb->target_as->name : "none");
+ error_setg(&local_err,
+ "Wrong target AS \"%s\", only system memory is allowed",
+ iotlb->target_as->name ? iotlb->target_as->name : "none");
goto out;
}
rcu_read_lock();
if (!vfio_get_xlat_addr(iotlb, NULL, &translated_addr, NULL, &local_err)) {
- error_report_err(local_err);
goto out_lock;
}
@@ -1257,7 +1261,6 @@ static void vfio_iommu_map_dirty_notify(IOMMUNotifier *n,
IOMMUTLBEntry *iotlb)
"vfio_iommu_map_dirty_notify(%p, 0x%"HWADDR_PRIx", "
"0x%"HWADDR_PRIx") failed :", bcontainer, iova,
iotlb->addr_mask + 1);
- error_report_err(local_err);
}
out_lock:
@@ -1265,7 +1268,7 @@ out_lock:
out:
if (ret) {
- vfio_set_migration_error(ret);
+ vfio_set_migration_error(ret, local_err);
}
}
@@ -1385,8 +1388,7 @@ static void vfio_listener_log_sync(MemoryListener
*listener,
if (vfio_devices_all_dirty_tracking(bcontainer)) {
ret = vfio_sync_dirty_bitmap(bcontainer, section, &local_err);
if (ret) {
- error_report_err(local_err);
- vfio_set_migration_error(ret);
+ vfio_set_migration_error(ret, local_err);
}
}
}
--
2.43.2
- [PATCH v2 01/21] migration: Report error when shutdown fails, (continued)
- [PATCH v2 01/21] migration: Report error when shutdown fails, Cédric Le Goater, 2024/02/27
- [PATCH v2 20/21] vfio: Also trace event failures in vfio_save_complete_precopy(), Cédric Le Goater, 2024/02/27
- [PATCH v2 07/21] migration: Add Error** argument to .load_setup() handler, Cédric Le Goater, 2024/02/27
- [PATCH v2 13/21] vfio: Add Error** argument to vfio_devices_dma_logging_start(), Cédric Le Goater, 2024/02/27
- [PATCH v2 03/21] migration: Add documentation for SaveVMHandlers, Cédric Le Goater, 2024/02/27
- [PATCH v2 06/21] migration: Add Error** argument to .save_setup() handler, Cédric Le Goater, 2024/02/27
- [PATCH v2 05/21] migration: Add Error** argument to qemu_savevm_state_setup(), Cédric Le Goater, 2024/02/27
- [PATCH v2 08/21] memory: Add Error** argument to .log_global*() handlers, Cédric Le Goater, 2024/02/27
- [PATCH v2 16/21] vfio: Add Error** argument to .vfio_save_config() handler, Cédric Le Goater, 2024/02/27
- [PATCH v2 19/21] vfio: Add Error** argument to .get_dirty_bitmap() handler, Cédric Le Goater, 2024/02/27
- [PATCH v2 21/21] vfio: Extend vfio_set_migration_error() with Error* argument,
Cédric Le Goater <=
- [PATCH v2 02/21] migration: Remove SaveStateHandler and LoadStateHandler typedefs, Cédric Le Goater, 2024/02/27
- [PATCH v2 14/21] vfio: Add Error** argument to vfio_devices_dma_logging_stop(), Cédric Le Goater, 2024/02/27
- [PATCH v2 09/21] memory: Add Error** argument to the global_dirty_log routines, Cédric Le Goater, 2024/02/27