[Xen-changelog] [qemu-upstream-unstable] rdma: silly ipv6 bugfix

[patchbot@xxxxxxx]

commit 260790645e95891cb264c2d657648f43401ac915
Author:     Michael R. Hines <mrhines@xxxxxxxxxx>
AuthorDate: Sun Aug 18 22:27:08 2013 -0400
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Tue Sep 24 18:54:58 2013 -0500

    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@xxxxxxxxxx>
    Signed-off-by: Michael Tokarev <mjt@xxxxxxxxxx>
    (cherry picked from commit c89aa2f1851b08c3efa8a1070c0a6b9a36e1227f)
    
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 migration-rdma.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/migration-rdma.c b/migration-rdma.c
index 3d1266f..f5e75d6 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;
         }
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog