Commit f38f6d41 authored by Lidong Chen's avatar Lidong Chen Committed by Juan Quintela
Browse files

migration: remove unnecessary variables len in QIOChannelRDMA 



Because qio_channel_rdma_writev and qio_channel_rdma_readv maybe invoked
by different threads concurrently, this patch removes unnecessary variables
len in QIOChannelRDMA and use local variable instead.

Signed-off-by: default avatarLidong Chen <lidongchen@tencent.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>

Signed-off-by: default avatarLidong Chen <jemmy858585@gmail.com>
parent 0f073f44

migration/rdma.c

+7 −8
Original line number Diff line number Diff line
@@ -400,7 +400,6 @@ struct QIOChannelRDMA { 
    QIOChannel parent;

    RDMAContext *rdma;

    QEMUFile *file;

    size_t len;

    bool blocking; /* XXX we don't actually honour this yet */

};
@@ -2608,6 +2607,7 @@ static ssize_t qio_channel_rdma_writev(QIOChannel *ioc, 
    int ret;

    ssize_t done = 0;

    size_t i;

    size_t len = 0;



    CHECK_ERROR_STATE();
@@ -2627,10 +2627,10 @@ static ssize_t qio_channel_rdma_writev(QIOChannel *ioc, 
        while (remaining) {

            RDMAControlHeader head;



            rioc->len = MIN(remaining, RDMA_SEND_INCREMENT);

            remaining -= rioc->len;

            len = MIN(remaining, RDMA_SEND_INCREMENT);

            remaining -= len;



            head.len = rioc->len;

            head.len = len;

            head.type = RDMA_CONTROL_QEMU_FILE;



            ret = qemu_rdma_exchange_send(rdma, &head, data, NULL, NULL, NULL);
@@ -2640,8 +2640,8 @@ static ssize_t qio_channel_rdma_writev(QIOChannel *ioc, 
                return ret;

            }



            data += rioc->len;

            done += rioc->len;

            data += len;

            done += len;

        }

    }
@@ -2736,8 +2736,7 @@ static ssize_t qio_channel_rdma_readv(QIOChannel *ioc, 
            }

        }

    }

    rioc->len = done;

    return rioc->len;

    return done;

}



/*