|
 |
0a122b |
From b00c5116a41f106737f011b4c803b7451941a732 Mon Sep 17 00:00:00 2001
|
|
|
0a122b |
Message-Id: <b00c5116a41f106737f011b4c803b7451941a732.1387382496.git.minovotn@redhat.com>
|
|
|
0a122b |
In-Reply-To: <c5386144fbf09f628148101bc674e2421cdd16e3.1387382496.git.minovotn@redhat.com>
|
|
|
0a122b |
References: <c5386144fbf09f628148101bc674e2421cdd16e3.1387382496.git.minovotn@redhat.com>
|
|
|
0a122b |
From: Nigel Croxon <ncroxon@redhat.com>
|
|
|
0a122b |
Date: Thu, 14 Nov 2013 22:53:09 +0100
|
|
|
0a122b |
Subject: [PATCH 33/46] rdma: silly ipv6 bugfix
|
|
|
0a122b |
|
|
|
0a122b |
RH-Author: Nigel Croxon <ncroxon@redhat.com>
|
|
|
0a122b |
Message-id: <1384469598-13137-34-git-send-email-ncroxon@redhat.com>
|
|
|
0a122b |
Patchwork-id: 55715
|
|
|
0a122b |
O-Subject: [RHEL7.0 PATCH 33/42] rdma: silly ipv6 bugfix
|
|
|
0a122b |
Bugzilla: 1011720
|
|
|
0a122b |
RH-Acked-by: Orit Wasserman <owasserm@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Amit Shah <amit.shah@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
Bugzilla: 1011720
|
|
|
0a122b |
https://bugzilla.redhat.com/show_bug.cgi?id=1011720
|
|
|
0a122b |
|
|
|
0a122b |
>From commit ID:
|
|
|
0a122b |
commit c89aa2f1851b08c3efa8a1070c0a6b9a36e1227f
|
|
|
0a122b |
Author: Michael R. Hines <mrhines@us.ibm.com>
|
|
|
0a122b |
Date: Sun Aug 18 22:27:08 2013 -0400
|
|
|
0a122b |
|
|
|
0a122b |
rdma: silly ipv6 bugfix
|
|
|
0a122b |
|
|
|
0a122b |
My bad - but it's very important for us to warn the user that
|
|
|
0a122b |
IPv6 is broken on RoCE in linux right now, until linux releases
|
|
|
0a122b |
a fixed version.
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Michael R. Hines <mrhines@us.ibm.com>
|
|
|
0a122b |
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
|
0a122b |
---
|
|
|
0a122b |
migration-rdma.c | 8 +++++---
|
|
|
0a122b |
1 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
migration-rdma.c | 8 +++++---
|
|
|
0a122b |
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
diff --git a/migration-rdma.c b/migration-rdma.c
|
|
|
0a122b |
index ada488e..943496f 100644
|
|
|
0a122b |
--- a/migration-rdma.c
|
|
|
0a122b |
+++ b/migration-rdma.c
|
|
|
0a122b |
@@ -920,9 +920,11 @@ static int qemu_rdma_resolve_host(RDMAContext *rdma, Error **errp)
|
|
|
0a122b |
ret = rdma_resolve_addr(rdma->cm_id, NULL, e->ai_dst_addr,
|
|
|
0a122b |
RDMA_RESOLVE_TIMEOUT_MS);
|
|
|
0a122b |
if (!ret) {
|
|
|
0a122b |
- ret = qemu_rdma_broken_ipv6_kernel(errp, rdma->cm_id->verbs);
|
|
|
0a122b |
- if (ret) {
|
|
|
0a122b |
- continue;
|
|
|
0a122b |
+ if (e->ai_family == AF_INET6) {
|
|
|
0a122b |
+ ret = qemu_rdma_broken_ipv6_kernel(errp, rdma->cm_id->verbs);
|
|
|
0a122b |
+ if (ret) {
|
|
|
0a122b |
+ continue;
|
|
|
0a122b |
+ }
|
|
|
0a122b |
}
|
|
|
0a122b |
goto route;
|
|
|
0a122b |
}
|
|
|
0a122b |
--
|
|
|
0a122b |
1.7.11.7
|
|
|
0a122b |
|