ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration/rdma: Don't moan about disconnects at the end 

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 <dgilbert@redhat.com>
Message-Id: <20190913163507.1403-2-dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2019-09-13 17:35:06 +01:00
parent 64737606e8
commit de8434a35a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
migration/rdma.c
View File

@ -3253,11 +3253,15 @@ static void rdma_cm_poll_handler(void *opaque)
if (cm_event->event == RDMA_CM_EVENT_DISCONNECTED || if (cm_event->event == RDMA_CM_EVENT_DISCONNECTED ||
cm_event->event == RDMA_CM_EVENT_DEVICE_REMOVAL) { cm_event->event == RDMA_CM_EVENT_DEVICE_REMOVAL) {
if (!rdma->error_state &&
migration_incoming_get_current()->state !=
MIGRATION_STATUS_COMPLETED) {
error_report("receive cm event, cm event is %d", cm_event->event); error_report("receive cm event, cm event is %d", cm_event->event);
rdma->error_state = -EPIPE; rdma->error_state = -EPIPE;
if (rdma->return_path) { if (rdma->return_path) {
rdma->return_path->error_state = -EPIPE; rdma->return_path->error_state = -EPIPE;
} }
}
if (mis->migration_incoming_co) { if (mis->migration_incoming_co) {
qemu_coroutine_enter(mis->migration_incoming_co); qemu_coroutine_enter(mis->migration_incoming_co);