From: Gonglei <arei.gonglei@huawei.com>
Date: Tue, 13 May 2014 12:25:38 +0000 (+0800)
Subject: rdma: Fix block during rdma migration
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2a9343470432573acf06379bcbf8e5e6568507e4;p=qemu.git

rdma: Fix block during rdma migration

If the networking break or there's something wrong with rdma
device(ib0 with no IP) during rdma migration, the main_loop of
qemu will be blocked in rdma_destroy_id. I add rdma_ack_cm_event
to fix this bug.

Signed-off-by: Mo Yuxiang <Moyuxiang@huawei.com>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Michael R. Hines <mrhines@us.ibm.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---

diff --git a/migration-rdma.c b/migration-rdma.c
index eeb4302215..f60749b321 100644
--- a/migration-rdma.c
+++ b/migration-rdma.c
@@ -949,6 +949,7 @@ route:
         ERROR(errp, "result not equal to event_addr_resolved %s",
                 rdma_event_str(cm_event->event));
         perror("rdma_resolve_addr");
+        rdma_ack_cm_event(cm_event);
         ret = -EINVAL;
         goto err_resolve_get_addr;
     }