[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/16] vfio: Avoid error_propagate() after migrate_add_blocker()
From: |
Markus Armbruster |
Subject: |
[PATCH 07/16] vfio: Avoid error_propagate() after migrate_add_blocker() |
Date: |
Tue, 20 Jul 2021 14:53:59 +0200 |
When migrate_add_blocker(blocker, &errp) is followed by
error_propagate(errp, err), we can often just as well do
migrate_add_blocker(..., errp). This is the case in
vfio_migration_probe().
Prior art: commit 386f6c07d2 "error: Avoid error_propagate() after
migrate_add_blocker()".
Cc: Kirti Wankhede <kwankhede@nvidia.com>
Cc: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/vfio/migration.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
index 82f654afb6..ff6b45de6b 100644
--- a/hw/vfio/migration.c
+++ b/hw/vfio/migration.c
@@ -858,7 +858,6 @@ int vfio_migration_probe(VFIODevice *vbasedev, Error **errp)
{
VFIOContainer *container = vbasedev->group->container;
struct vfio_region_info *info = NULL;
- Error *local_err = NULL;
int ret = -ENOTSUP;
if (!vbasedev->enable_migration || !container->dirty_pages_supported) {
@@ -885,9 +884,8 @@ add_blocker:
"VFIO device doesn't support migration");
g_free(info);
- ret = migrate_add_blocker(vbasedev->migration_blocker, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
+ ret = migrate_add_blocker(vbasedev->migration_blocker, errp);
+ if (ret < 0) {
error_free(vbasedev->migration_blocker);
vbasedev->migration_blocker = NULL;
}
--
2.31.1
- [PATCH 09/16] migration: Unify failure check for migrate_add_blocker(), (continued)
- [PATCH 09/16] migration: Unify failure check for migrate_add_blocker(), Markus Armbruster, 2021/07/20
- [PATCH 10/16] migration: Handle migration_incoming_setup() errors consistently, Markus Armbruster, 2021/07/20
- [PATCH 03/16] spapr: Explain purpose of ->fwnmi_migration_blocker more clearly, Markus Armbruster, 2021/07/20
- [PATCH 08/16] whpx nvmm: Drop useless migrate_del_blocker(), Markus Armbruster, 2021/07/20
- [PATCH 07/16] vfio: Avoid error_propagate() after migrate_add_blocker(),
Markus Armbruster <=
- [PATCH 05/16] vhost-scsi: Plug memory leak on migrate_add_blocker() failure, Markus Armbruster, 2021/07/20
- [PATCH 11/16] microvm: Drop dead error handling in microvm_machine_state_init(), Markus Armbruster, 2021/07/20
- [PATCH 04/16] multi-process: Fix pci_proxy_dev_realize() error handling, Markus Armbruster, 2021/07/20