diff options
| author | Peter Maydell | 2018-03-24 17:34:06 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-03-24 17:34:06 +0100 |
| commit | ed4916e8f88f53a344d4eb636e289c6d5ca34e17 (patch) | |
| tree | 2b669b6e5513feab52a8d5bf31498e8f66e20c50 /hw/rdma/rdma_backend.h | |
| parent | Merge remote-tracking branch 'remotes/ericb/tags/pull-qapi-2018-03-23' into s... (diff) | |
| parent | hw/rdma: Fix 32-bit compilation (diff) | |
| download | qemu-ed4916e8f88f53a344d4eb636e289c6d5ca34e17.tar.gz qemu-ed4916e8f88f53a344d4eb636e289c6d5ca34e17.tar.xz qemu-ed4916e8f88f53a344d4eb636e289c6d5ca34e17.zip | |
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 <marcel@redhat.com>"
# 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 <peter.maydell@linaro.org>
Diffstat (limited to 'hw/rdma/rdma_backend.h')
| -rw-r--r-- | hw/rdma/rdma_backend.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/rdma/rdma_backend.h b/hw/rdma/rdma_backend.h index 68f2b05ca7..3cd636dd88 100644 --- a/hw/rdma/rdma_backend.h +++ b/hw/rdma/rdma_backend.h @@ -16,7 +16,7 @@ #ifndef RDMA_BACKEND_H #define RDMA_BACKEND_H -#include <qapi/error.h> +#include "qapi/error.h" #include "rdma_rm_defs.h" #include "rdma_backend_defs.h" @@ -61,7 +61,7 @@ int rdma_backend_query_port(RdmaBackendDev *backend_dev, int rdma_backend_create_pd(RdmaBackendDev *backend_dev, RdmaBackendPD *pd); void rdma_backend_destroy_pd(RdmaBackendPD *pd); -int rdma_backend_create_mr(RdmaBackendMR *mr, RdmaBackendPD *pd, uint64_t addr, +int rdma_backend_create_mr(RdmaBackendMR *mr, RdmaBackendPD *pd, void *addr, size_t length, int access); void rdma_backend_destroy_mr(RdmaBackendMR *mr); @@ -83,6 +83,8 @@ int rdma_backend_qp_state_rtr(RdmaBackendDev *backend_dev, RdmaBackendQP *qp, bool use_qkey); int rdma_backend_qp_state_rts(RdmaBackendQP *qp, uint8_t qp_type, uint32_t sq_psn, uint32_t qkey, bool use_qkey); +int rdma_backend_query_qp(RdmaBackendQP *qp, struct ibv_qp_attr *attr, + int attr_mask, struct ibv_qp_init_attr *init_attr); void rdma_backend_destroy_qp(RdmaBackendQP *qp); void rdma_backend_post_send(RdmaBackendDev *backend_dev, |