Re: [Qemu-devel] [PATCH 4/5] pvrdma: release ring object in case of an error

[Yuval Shaia <yuval.shaia@oracle.com>]

On Wed, Dec 12, 2018 at 03:09:19PM +0530, P J P wrote:
> +-- On Wed, 12 Dec 2018, P J P wrote --+
> | | Also, can you rebase this patch on top of the patchset i posted last week:
> | | https://patchwork.kernel.org/patch/10705439/
> | 
> | Okay, I'll send revised patch set. Thanks so much for the prompt review.
> 
> I tried to git apply above patch-set over v3.1.0-rc2, v3.1.0-rc0, v3.0.0. But 
> it does not seem to apply cleanly.
> 
> ===
> $ git branch rdma v3.1.0-rc0
> $ git checkout rdma 
> Switched to branch 'rdma'
> $ git apply --check /tmp/add-support-for-RDMA-MAD.patch
> error: patch failed: Makefile.objs:1
> error: Makefile.objs: patch does not apply
> error: patch failed: hw/rdma/vmw/pvrdma_cmd.c:224
> error: hw/rdma/vmw/pvrdma_cmd.c: patch does not apply
> ===
> 
> I skipped one of the makefile.objs/.json patch, applied others and then 
> hand-fixed one of the patch pvrdma_cmd.c.
> 
> After that when I try to build QEMU, it fails with
> 
> ===
>  $ ./configure --prefix=/tmp/ --enable-debug
>       --target-list='x86_64-softmmu x86_64-linux-user'
>       --enable-rdma --with-sdlabi=2.0
>  $ make
> ../qemu/hw/rdma/rdma_backend.c:1132:5: error: implicit declaration of function 
> ‘qapi_event_send_rdma_gid_status_changed’ [-Werror=implicit-function-declaration]  qapi_event_send_rdma_gid_status_changed(ifname, true,
> ...
> ../qemu/hw/rdma/rdma_backend.c:22:10: fatal error: qapi/qapi-events-rdma.h: No 
> such file or directory
>  #include "qapi/qapi-events-rdma.h"
>           ^~~~~~~~~~~~~~~~~~~~~~~~~
> compilation terminated.
> ===
> 
> Not sure if other patches are required. Any idea?

Ok, you rebased your patches on latest upstream, lets deal with merge
conflicts later.

Marcel, any idea?
Can Prasad take from your tree?

Thanks,

> 
> Thank you.
> --
> Prasad J Pandit / Red Hat Product Security Team
> 47AF CE69 3A90 54AA 9045 1053 DD13 3D32 FE5B 041F