rdma: qemu_rdma_post_send_control uses wrongly RDMA_WRID_MAX
RDMA_WRID_CONTROL should be used. And remove related work around. Reviewed-by: Michael R. Hines <mrhines@us.ibm.com> Signed-off-by: Isaku Yamahata <yamahata@private.email.ne.jp> Signed-off-by: Michael R. Hines <mrhines@us.ibm.com> Message-id: 1375584894-9917-6-git-send-email-mrhines@linux.vnet.ibm.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
44b5949491
commit
1f22364bb5
|
@ -322,7 +322,7 @@ typedef struct RDMAContext {
|
||||||
char *host;
|
char *host;
|
||||||
int port;
|
int port;
|
||||||
|
|
||||||
RDMAWorkRequestData wr_data[RDMA_WRID_MAX + 1];
|
RDMAWorkRequestData wr_data[RDMA_WRID_MAX];
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This is used by *_exchange_send() to figure out whether or not
|
* This is used by *_exchange_send() to figure out whether or not
|
||||||
|
@ -1399,7 +1399,7 @@ static int qemu_rdma_post_send_control(RDMAContext *rdma, uint8_t *buf,
|
||||||
RDMAControlHeader *head)
|
RDMAControlHeader *head)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
RDMAWorkRequestData *wr = &rdma->wr_data[RDMA_WRID_MAX];
|
RDMAWorkRequestData *wr = &rdma->wr_data[RDMA_WRID_CONTROL];
|
||||||
struct ibv_send_wr *bad_wr;
|
struct ibv_send_wr *bad_wr;
|
||||||
struct ibv_sge sge = {
|
struct ibv_sge sge = {
|
||||||
.addr = (uint64_t)(wr->control),
|
.addr = (uint64_t)(wr->control),
|
||||||
|
@ -2054,7 +2054,7 @@ static void qemu_rdma_cleanup(RDMAContext *rdma)
|
||||||
g_free(rdma->block);
|
g_free(rdma->block);
|
||||||
rdma->block = NULL;
|
rdma->block = NULL;
|
||||||
|
|
||||||
for (idx = 0; idx <= RDMA_WRID_MAX; idx++) {
|
for (idx = 0; idx < RDMA_WRID_MAX; idx++) {
|
||||||
if (rdma->wr_data[idx].control_mr) {
|
if (rdma->wr_data[idx].control_mr) {
|
||||||
rdma->total_registrations--;
|
rdma->total_registrations--;
|
||||||
ibv_dereg_mr(rdma->wr_data[idx].control_mr);
|
ibv_dereg_mr(rdma->wr_data[idx].control_mr);
|
||||||
|
@ -2136,7 +2136,7 @@ static int qemu_rdma_source_init(RDMAContext *rdma, Error **errp, bool pin_all)
|
||||||
goto err_rdma_source_init;
|
goto err_rdma_source_init;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (idx = 0; idx <= RDMA_WRID_MAX; idx++) {
|
for (idx = 0; idx < RDMA_WRID_MAX; idx++) {
|
||||||
ret = qemu_rdma_reg_control(rdma, idx);
|
ret = qemu_rdma_reg_control(rdma, idx);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
ERROR(temp, "rdma migration: error registering %d control!",
|
ERROR(temp, "rdma migration: error registering %d control!",
|
||||||
|
@ -2248,7 +2248,7 @@ static int qemu_rdma_dest_init(RDMAContext *rdma, Error **errp)
|
||||||
struct addrinfo *res;
|
struct addrinfo *res;
|
||||||
char port_str[16];
|
char port_str[16];
|
||||||
|
|
||||||
for (idx = 0; idx <= RDMA_WRID_MAX; idx++) {
|
for (idx = 0; idx < RDMA_WRID_MAX; idx++) {
|
||||||
rdma->wr_data[idx].control_len = 0;
|
rdma->wr_data[idx].control_len = 0;
|
||||||
rdma->wr_data[idx].control_curr = NULL;
|
rdma->wr_data[idx].control_curr = NULL;
|
||||||
}
|
}
|
||||||
|
@ -2705,7 +2705,7 @@ static int qemu_rdma_accept(RDMAContext *rdma)
|
||||||
goto err_rdma_dest_wait;
|
goto err_rdma_dest_wait;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (idx = 0; idx <= RDMA_WRID_MAX; idx++) {
|
for (idx = 0; idx < RDMA_WRID_MAX; idx++) {
|
||||||
ret = qemu_rdma_reg_control(rdma, idx);
|
ret = qemu_rdma_reg_control(rdma, idx);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
fprintf(stderr, "rdma: error registering %d control!\n", idx);
|
fprintf(stderr, "rdma: error registering %d control!\n", idx);
|
||||||
|
|
Loading…
Reference in a new issue