* [Qemu-devel] [PATCH] Fix hw/rdma/vmw/pvrdma_cmd.c build @ 2019-08-11 19:42 Stephen Kitt 2019-08-15 10:57 ` Yuval Shaia 0 siblings, 1 reply; 5+ messages in thread From: Stephen Kitt @ 2019-08-11 19:42 UTC (permalink / raw) To: qemu-devel; +Cc: Stephen Kitt 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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] Fix hw/rdma/vmw/pvrdma_cmd.c build 2019-08-11 19:42 [Qemu-devel] [PATCH] Fix hw/rdma/vmw/pvrdma_cmd.c build Stephen Kitt @ 2019-08-15 10:57 ` Yuval Shaia 2019-08-15 12:12 ` Stephen Kitt 0 siblings, 1 reply; 5+ messages in thread From: Yuval Shaia @ 2019-08-15 10:57 UTC (permalink / raw) To: Stephen Kitt; +Cc: qemu-devel 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 > > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] Fix hw/rdma/vmw/pvrdma_cmd.c build 2019-08-15 10:57 ` Yuval Shaia @ 2019-08-15 12:12 ` Stephen Kitt 2019-08-18 12:28 ` Yuval Shaia 0 siblings, 1 reply; 5+ messages in thread From: Stephen Kitt @ 2019-08-15 12:12 UTC (permalink / raw) To: Yuval Shaia; +Cc: qemu-devel [-- Attachment #1: Type: text/plain, Size: 1077 bytes --] 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 [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] Fix hw/rdma/vmw/pvrdma_cmd.c build 2019-08-15 12:12 ` Stephen Kitt @ 2019-08-18 12:28 ` Yuval Shaia 2019-08-18 21:50 ` Philippe Mathieu-Daudé 0 siblings, 1 reply; 5+ messages in thread From: Yuval Shaia @ 2019-08-18 12:28 UTC (permalink / raw) To: Stephen Kitt; +Cc: qemu-devel On Thu, Aug 15, 2019 at 02:12:44PM +0200, Stephen Kitt wrote: > 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. I see, in that case fix make sense. Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com> > > Regards, > > Stephen ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] Fix hw/rdma/vmw/pvrdma_cmd.c build 2019-08-18 12:28 ` Yuval Shaia @ 2019-08-18 21:50 ` Philippe Mathieu-Daudé 0 siblings, 0 replies; 5+ messages in thread From: Philippe Mathieu-Daudé @ 2019-08-18 21:50 UTC (permalink / raw) To: Yuval Shaia, Stephen Kitt; +Cc: qemu-devel, qemu-stable On 8/18/19 2:28 PM, Yuval Shaia wrote: > On Thu, Aug 15, 2019 at 02:12:44PM +0200, Stephen Kitt wrote: >> 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. You want to Cc then ;) Doing it for you. > I see, in that case fix make sense. > > Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com> > >> >> Regards, >> >> Stephen > > > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-08-18 21:51 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-08-11 19:42 [Qemu-devel] [PATCH] Fix hw/rdma/vmw/pvrdma_cmd.c build Stephen Kitt 2019-08-15 10:57 ` Yuval Shaia 2019-08-15 12:12 ` Stephen Kitt 2019-08-18 12:28 ` Yuval Shaia 2019-08-18 21:50 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).