From: Peter Maydell Date: Sat, 24 Mar 2018 16:34:06 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/marcel/tags/rdma-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ed4916e8f88f53a344d4eb636e289c6d5ca34e17;p=qemu.git Merge remote-tracking branch 'remotes/marcel/tags/rdma-pull-request' into staging * fix PVRDMA compilation errors and warnings * implement query_qp for the PVRDMA device * fix make - switch from -I to -iquote # gpg: Signature made Fri 23 Mar 2018 15:39:23 GMT # gpg: using RSA key 36D4C0F0CF2FE46D # gpg: Good signature from "Marcel Apfelbaum " # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: B1C6 3A57 F92E 08F2 640F 31F5 36D4 C0F0 CF2F E46D * remotes/marcel/tags/rdma-pull-request: hw/rdma: Fix 32-bit compilation hw/rdma: Use correct print format in CHK_ATTR macro hw/rdma: Change host_virt to void * hw/rdma: fix clang compilation errors make: switch from -I to -iquote rdma: fix up include directives hw/rdma: Add support for Query QP verb to pvrdma device hw/rdma: Add Query QP operation Signed-off-by: Peter Maydell --- ed4916e8f88f53a344d4eb636e289c6d5ca34e17