[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/6] migration/rdma: rdma_accept_incoming_migration fix error hand
From: |
Juan Quintela |
Subject: |
[PULL 3/6] migration/rdma: rdma_accept_incoming_migration fix error handling |
Date: |
Thu, 13 Feb 2020 14:20:27 +0100 |
From: "Dr. David Alan Gilbert" <address@hidden>
rdma_accept_incoming_migration is called from an fd handler and
can't return an Error * anywhere.
Currently it's leaking Error's in errp/local_err - there's
no point putting them in there unless we can report them.
Turn most into fprintf's, and the last into an error_reportf_err
where it's coming up from another function.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/rdma.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/migration/rdma.c b/migration/rdma.c
index 2379b8345b..f61587891b 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -3980,13 +3980,13 @@ static void rdma_accept_incoming_migration(void *opaque)
RDMAContext *rdma = opaque;
int ret;
QEMUFile *f;
- Error *local_err = NULL, **errp = &local_err;
+ Error *local_err = NULL;
trace_qemu_rdma_accept_incoming_migration();
ret = qemu_rdma_accept(rdma);
if (ret) {
- ERROR(errp, "RDMA Migration initialization failed!");
+ fprintf(stderr, "RDMA ERROR: Migration initialization failed\n");
return;
}
@@ -3998,13 +3998,16 @@ static void rdma_accept_incoming_migration(void *opaque)
f = qemu_fopen_rdma(rdma, "rb");
if (f == NULL) {
- ERROR(errp, "could not qemu_fopen_rdma!");
+ fprintf(stderr, "RDMA ERROR: could not qemu_fopen_rdma\n");
qemu_rdma_cleanup(rdma);
return;
}
rdma->migration_started_on_destination = 1;
- migration_fd_process_incoming(f, errp);
+ migration_fd_process_incoming(f, &local_err);
+ if (local_err) {
+ error_reportf_err(local_err, "RDMA ERROR:");
+ }
}
void rdma_start_incoming_migration(const char *host_port, Error **errp)
--
2.24.1
- [PULL 0/6] Pull migration patches, Juan Quintela, 2020/02/13
- [PULL 1/6] migration: Maybe VM is paused when migration is cancelled, Juan Quintela, 2020/02/13
- [PULL 2/6] migration: Optimization about wait-unplug migration state, Juan Quintela, 2020/02/13
- [PULL 3/6] migration/rdma: rdma_accept_incoming_migration fix error handling,
Juan Quintela <=
- [PULL 4/6] tests/migration: Add some slack to auto converge, Juan Quintela, 2020/02/13
- [PULL 5/6] migration-test: fix some memleaks in migration-test, Juan Quintela, 2020/02/13
- [PULL 6/6] git: Make submodule check only needed modules, Juan Quintela, 2020/02/13
- Re: [PULL 0/6] Pull migration patches, Peter Maydell, 2020/02/14