cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
958e1b
From 68dbf16886540b4ec6edc46409f5adf0b97f1dcf Mon Sep 17 00:00:00 2001
958e1b
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
958e1b
Date: Mon, 20 Oct 2014 14:55:55 +0200
958e1b
Subject: [PATCH 43/43] rdma: Fix block during rdma migration
958e1b
958e1b
Message-id: <1413816955-4190-2-git-send-email-dgilbert@redhat.com>
958e1b
Patchwork-id: 61746
958e1b
O-Subject: [RHEL-7.1 qemu-kvm PATCH 1/1] rdma: Fix block during rdma migration
958e1b
Bugzilla: 1152969
958e1b
RH-Acked-by: Juan Quintela <quintela@redhat.com>
958e1b
RH-Acked-by: Amit Shah <amit.shah@redhat.com>
958e1b
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
958e1b
958e1b
From: Gonglei <arei.gonglei@huawei.com>
958e1b
958e1b
If the networking break or there's something wrong with rdma
958e1b
device(ib0 with no IP) during rdma migration, the main_loop of
958e1b
qemu will be blocked in rdma_destroy_id. I add rdma_ack_cm_event
958e1b
to fix this bug.
958e1b
958e1b
Signed-off-by: Mo Yuxiang <Moyuxiang@huawei.com>
958e1b
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
958e1b
Reviewed-by: Michael R. Hines <mrhines@us.ibm.com>
958e1b
Signed-off-by: Juan Quintela <quintela@redhat.com>
958e1b
(cherry picked from commit 2a9343470432573acf06379bcbf8e5e6568507e4)
958e1b
---
958e1b
 migration-rdma.c | 1 +
958e1b
 1 file changed, 1 insertion(+)
958e1b
958e1b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
958e1b
---
958e1b
 migration-rdma.c | 1 +
958e1b
 1 file changed, 1 insertion(+)
958e1b
958e1b
diff --git a/migration-rdma.c b/migration-rdma.c
958e1b
index ba4ad76..5596571 100644
958e1b
--- a/migration-rdma.c
958e1b
+++ b/migration-rdma.c
958e1b
@@ -949,6 +949,7 @@ route:
958e1b
         ERROR(errp, "result not equal to event_addr_resolved %s",
958e1b
                 rdma_event_str(cm_event->event));
958e1b
         perror("rdma_resolve_addr");
958e1b
+        rdma_ack_cm_event(cm_event);
958e1b
         ret = -EINVAL;
958e1b
         goto err_resolve_get_addr;
958e1b
     }
958e1b
-- 
958e1b
1.8.3.1
958e1b