[Qemu-devel] [PATCH] Fix hw/rdma/vmw/pvrdma_cmd.c build

Stephen Kitt posted 1 patch 6 days ago
Failed in applying to current master (apply log)
hw/rdma/vmw/pvrdma_cmd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

[Qemu-devel] [PATCH] Fix hw/rdma/vmw/pvrdma_cmd.c build

Posted by Stephen Kitt 6 days ago
This was broken by the cherry-pick in 41dd30f. Fix by handling errors
as in the rest of the function: "goto out" instead of "return rc".

Signed-off-by: Stephen Kitt <steve@sk2.org>
---
 hw/rdma/vmw/pvrdma_cmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c
index bb9a9f1cd1..a3a86d7c8e 100644
--- a/hw/rdma/vmw/pvrdma_cmd.c
+++ b/hw/rdma/vmw/pvrdma_cmd.c
@@ -514,7 +514,7 @@ static int create_qp(PVRDMADev *dev, union pvrdma_cmd_req *req,
                                      cmd->recv_cq_handle, rings, &resp->qpn);
     if (resp->hdr.err) {
         destroy_qp_rings(rings);
-        return rc;
+        goto out;
     }
 
     resp->max_send_wr = cmd->max_send_wr;
-- 
2.20.1


Re: [Qemu-devel] [PATCH] Fix hw/rdma/vmw/pvrdma_cmd.c build

Posted by Yuval Shaia 2 days ago
On Sun, Aug 11, 2019 at 09:42:47PM +0200, Stephen Kitt wrote:
> This was broken by the cherry-pick in 41dd30f. Fix by handling errors
> as in the rest of the function: "goto out" instead of "return rc".
> 
> Signed-off-by: Stephen Kitt <steve@sk2.org>
> ---
>  hw/rdma/vmw/pvrdma_cmd.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c
> index bb9a9f1cd1..a3a86d7c8e 100644
> --- a/hw/rdma/vmw/pvrdma_cmd.c
> +++ b/hw/rdma/vmw/pvrdma_cmd.c
> @@ -514,7 +514,7 @@ static int create_qp(PVRDMADev *dev, union pvrdma_cmd_req *req,
>                                       cmd->recv_cq_handle, rings, &resp->qpn);
>      if (resp->hdr.err) {
>          destroy_qp_rings(rings);
> -        return rc;
> +        goto out;

This label was removed, can you please check master branch?

>      }
>  
>      resp->max_send_wr = cmd->max_send_wr;
> -- 
> 2.20.1
> 
> 

Re: [Qemu-devel] [PATCH] Fix hw/rdma/vmw/pvrdma_cmd.c build

Posted by Stephen Kitt 2 days ago
On Thu, 15 Aug 2019 13:57:05 +0300, Yuval Shaia <yuval.shaia@oracle.com>
wrote:

> On Sun, Aug 11, 2019 at 09:42:47PM +0200, Stephen Kitt wrote:
> > This was broken by the cherry-pick in 41dd30f. Fix by handling errors
> > as in the rest of the function: "goto out" instead of "return rc".
> > 
> > Signed-off-by: Stephen Kitt <steve@sk2.org>
> > ---
> >  hw/rdma/vmw/pvrdma_cmd.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c
> > index bb9a9f1cd1..a3a86d7c8e 100644
> > --- a/hw/rdma/vmw/pvrdma_cmd.c
> > +++ b/hw/rdma/vmw/pvrdma_cmd.c
> > @@ -514,7 +514,7 @@ static int create_qp(PVRDMADev *dev, union
> > pvrdma_cmd_req *req, cmd->recv_cq_handle, rings, &resp->qpn);
> >      if (resp->hdr.err) {
> >          destroy_qp_rings(rings);
> > -        return rc;
> > +        goto out;  
> 
> This label was removed, can you please check master branch?

Sorry, it wasn’t clear from my message — my patch is against the stable-3.1
branch.

Regards,

Stephen