summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael R. Hines <mrhines@us.ibm.com>2013-08-18 22:27:08 -0400
committerMichael Roth <mdroth@linux.vnet.ibm.com>2013-09-24 18:54:58 -0500
commit260790645e95891cb264c2d657648f43401ac915 (patch)
treebb2fab8708326eb5d9ef3ec07a6e3e446c53bbdb
parent52f99b02e5ff1004fb3b41846d2c34f190127456 (diff)
downloadqemu-260790645e95891cb264c2d657648f43401ac915.tar.gz
rdma: silly ipv6 bugfix
My bad - but it's very important for us to warn the user that IPv6 is broken on RoCE in linux right now, until linux releases a fixed version. Signed-off-by: Michael R. Hines <mrhines@us.ibm.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> (cherry picked from commit c89aa2f1851b08c3efa8a1070c0a6b9a36e1227f) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--migration-rdma.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/migration-rdma.c b/migration-rdma.c
index 3d1266f40a..f5e75d600d 100644
--- a/migration-rdma.c
+++ b/migration-rdma.c
@@ -920,9 +920,11 @@ static int qemu_rdma_resolve_host(RDMAContext *rdma, Error **errp)
ret = rdma_resolve_addr(rdma->cm_id, NULL, e->ai_dst_addr,
RDMA_RESOLVE_TIMEOUT_MS);
if (!ret) {
- ret = qemu_rdma_broken_ipv6_kernel(errp, rdma->cm_id->verbs);
- if (ret) {
- continue;
+ if (e->ai_family == AF_INET6) {
+ ret = qemu_rdma_broken_ipv6_kernel(errp, rdma->cm_id->verbs);
+ if (ret) {
+ continue;
+ }
}
goto route;
}