]> git.proxmox.com Git - mirror_qemu.git/commitdiff
rdma: Fix block during rdma migration
authorGonglei <arei.gonglei@huawei.com>
Tue, 13 May 2014 12:25:38 +0000 (20:25 +0800)
committerJuan Quintela <quintela@redhat.com>
Mon, 16 Jun 2014 02:55:27 +0000 (04:55 +0200)
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>
migration-rdma.c

index eeb4302215c2c4e146884a00eccacfb0035b4832..f60749b32101df2bd5945ca82e075ad01c9ddbb3 100644 (file)
@@ -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;
     }