[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/15] vfio: Avoid error_propagate() after migrate_add_blocker()
From: |
Markus Armbruster |
Subject: |
[PULL 07/15] vfio: Avoid error_propagate() after migrate_add_blocker() |
Date: |
Fri, 27 Aug 2021 06:50:36 +0200 |
When migrate_add_blocker(blocker, &err) 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>
Message-Id: <20210720125408.387910-8-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed by: Kirti Wankhede <kwankhede@nvidia.com>
Acked-by: Michael S. Tsirkin <mst@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
- [PULL 00/15] Error reporting patches for 2021-08-26, Markus Armbruster, 2021/08/27
- [PULL 06/15] i386: Never free migration blocker objects instead of sometimes, Markus Armbruster, 2021/08/27
- [PULL 03/15] spapr: Explain purpose of ->fwnmi_migration_blocker more clearly, Markus Armbruster, 2021/08/27
- [PULL 10/15] migration: Handle migration_incoming_setup() errors consistently, Markus Armbruster, 2021/08/27
- [PULL 09/15] migration: Unify failure check for migrate_add_blocker(), Markus Armbruster, 2021/08/27
- [PULL 15/15] vl: Clean up -smp error handling, Markus Armbruster, 2021/08/27
- [PULL 02/15] spapr: Plug memory leak when we can't add a migration blocker, Markus Armbruster, 2021/08/27
- [PULL 11/15] microvm: Drop dead error handling in microvm_machine_state_init(), Markus Armbruster, 2021/08/27
- [PULL 05/15] vhost-scsi: Plug memory leak on migrate_add_blocker() failure, Markus Armbruster, 2021/08/27
- [PULL 04/15] multi-process: Fix pci_proxy_dev_realize() error handling, Markus Armbruster, 2021/08/27
- [PULL 07/15] vfio: Avoid error_propagate() after migrate_add_blocker(),
Markus Armbruster <=
- [PULL 08/15] whpx nvmm: Drop useless migrate_del_blocker(), Markus Armbruster, 2021/08/27
- [PULL 14/15] Remove superfluous ERRP_GUARD(), Markus Armbruster, 2021/08/27
- [PULL 13/15] vhost: Clean up how VhostOpts method vhost_backend_init() fails, Markus Armbruster, 2021/08/27
- [PULL 12/15] vhost: Clean up how VhostOpts method vhost_get_config() fails, Markus Armbruster, 2021/08/27
- [PULL 01/15] error: Use error_fatal to simplify obvious fatal errors (again), Markus Armbruster, 2021/08/27
- Re: [PULL 00/15] Error reporting patches for 2021-08-26, Peter Maydell, 2021/08/27