[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/9] migration/rdma: Don't moan about disconnects at the end
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 5/9] migration/rdma: Don't moan about disconnects at the end |
Date: |
Wed, 25 Sep 2019 16:01:26 +0100 |
From: "Dr. David Alan Gilbert" <address@hidden>
If we've already finished the migration or something has
already gone wrong, don't moan about the migration stream disconnecting.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/rdma.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/migration/rdma.c b/migration/rdma.c
index 78e6b72bac..0fcf02f48e 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -3253,10 +3253,14 @@ static void rdma_cm_poll_handler(void *opaque)
if (cm_event->event == RDMA_CM_EVENT_DISCONNECTED ||
cm_event->event == RDMA_CM_EVENT_DEVICE_REMOVAL) {
- error_report("receive cm event, cm event is %d", cm_event->event);
- rdma->error_state = -EPIPE;
- if (rdma->return_path) {
- rdma->return_path->error_state = -EPIPE;
+ if (!rdma->error_state &&
+ migration_incoming_get_current()->state !=
+ MIGRATION_STATUS_COMPLETED) {
+ error_report("receive cm event, cm event is %d", cm_event->event);
+ rdma->error_state = -EPIPE;
+ if (rdma->return_path) {
+ rdma->return_path->error_state = -EPIPE;
+ }
}
if (mis->migration_incoming_co) {
--
2.21.0
- [PULL 0/9] migration queue, Dr. David Alan Gilbert (git), 2019/09/25
- [PULL 1/9] migration: fix vmdesc leak on vmstate_save() error, Dr. David Alan Gilbert (git), 2019/09/25
- [PULL 2/9] migration/postcopy: not necessary to do discard when canonicalizing bitmap, Dr. David Alan Gilbert (git), 2019/09/25
- [PULL 3/9] migration/postcopy: unsentmap is not necessary for postcopy, Dr. David Alan Gilbert (git), 2019/09/25
- [PULL 4/9] migration: remove sent parameter in get_queued_page_not_dirty, Dr. David Alan Gilbert (git), 2019/09/25
- [PULL 5/9] migration/rdma: Don't moan about disconnects at the end,
Dr. David Alan Gilbert (git) <=
- [PULL 6/9] migration/rdma.c: Swap synchronize_rcu for call_rcu, Dr. David Alan Gilbert (git), 2019/09/25
- [PULL 7/9] tests/migration: Fail on unexpected migration states, Dr. David Alan Gilbert (git), 2019/09/25
- [PULL 8/9] tests/migration/postcopy: trim migration bandwidth, Dr. David Alan Gilbert (git), 2019/09/25
- [PULL 9/9] migration/postcopy: Recognise the recovery states as 'in_postcopy', Dr. David Alan Gilbert (git), 2019/09/25
- Re: [PULL 0/9] migration queue, Peter Maydell, 2019/09/26