From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 6 Aug 2019 22:16:19 +0000 (-0400)
Subject: pvrdma: Fix compilation error
X-Git-Tag: v3.1.1.1~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab630a065a3344c84ec1b280696800fd62afda03;p=thirdparty%2Fqemu.git

pvrdma: Fix compilation error

  In function ‘create_qp’:
  hw/rdma/vmw/pvrdma_cmd.c:517:16: error: ‘rc’ undeclared

The backport of 509f57c98 in 41dd30ff6 mishandled the conflict

Signed-off-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c
index bb9a9f1cd17..a3a86d7c8e1 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;