[Qemu-trivial] [PATCH for-1.6] rdma: silly ipv6 bugfix

[Qemu-trivial] [PATCH for-1.6] rdma: silly ipv6 bugfix

[mrhines]

From: "Michael R. Hines" <mrhines@us.ibm.com>

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>
---
 migration-rdma.c |    8 +++++---
 1 file 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;
         }
-- 
1.7.10.4

Re: [Qemu-trivial] [PATCH for-1.6] rdma: silly ipv6 bugfix

[Paolo Bonzini]

Il 19/08/2013 04:27, mrhines@linux.vnet.ibm.com ha scritto:
> From: "Michael R. Hines" <mrhines@us.ibm.com>
> 
> 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.

1.6 has sailed already, so the right thing to do now is to add a

Cc: qemu-stable@nongnu.org

tag before Signed-off-by.  This will ensure that the patch will be
considered for 1.6.1.

I have already CCed the mailing list on this message, so there is
nothing you need to do for this particular patch.

Paolo

> Signed-off-by: Michael R. Hines <mrhines@us.ibm.com>
> ---
>  migration-rdma.c |    8 +++++---
>  1 file 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;
>          }
> 

Re: [Qemu-trivial] [PATCH for-1.6] rdma: silly ipv6 bugfix

[Michael R. Hines]

On 08/19/2013 05:30 AM, Paolo Bonzini wrote:
> Il 19/08/2013 04:27, mrhines@linux.vnet.ibm.com ha scritto:
>> From: "Michael R. Hines" <mrhines@us.ibm.com>
>>
>> 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.
> 1.6 has sailed already, so the right thing to do now is to add a
>
> Cc: qemu-stable@nongnu.org
>
> tag before Signed-off-by.  This will ensure that the patch will be
> considered for 1.6.1.
>
> I have already CCed the mailing list on this message, so there is
> nothing you need to do for this particular patch.
>
> Paolo

Understood. Thank you.

- Michael

Re: [Qemu-trivial] [PATCH for-1.6] rdma: silly ipv6 bugfix

[Michael Tokarev]

19.08.2013 06:27, mrhines@linux.vnet.ibm.com wrote:
> From: "Michael R. Hines" <mrhines@us.ibm.com>
>
> 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.

Thanks, applied to the trivial-patches queue.

/mjt