Failed in applying to current master (
apply log)
configure | 55 ++++++++++++++-
hw/rdma/Makefile.objs | 2 +-
hw/rdma/rdma_backend.c | 105 +++++++++++++++++++++------
hw/rdma/rdma_backend.h | 4 +-
hw/rdma/rdma_backend_defs.h | 3 +-
hw/rdma/rdma_rm.c | 63 ++++++++---------
hw/rdma/rdma_rm_defs.h | 10 +--
hw/rdma/rdma_utils.c | 4 ++
hw/rdma/rdma_utils.h | 16 +++--
hw/rdma/vmw/pvrdma.h | 3 +
hw/rdma/vmw/pvrdma_cmd.c | 9 +--
hw/rdma/vmw/pvrdma_main.c | 137 +++++++++++++++++++++---------------
hw/rdma/vmw/pvrdma_qp_ops.c | 5 +-
13 files changed, 280 insertions(+), 136 deletions(-)