diff options
author | Lidong Chen <jemmy858585@gmail.com> | 2018-05-30 17:43:27 +0800 |
---|---|---|
committer | Juan Quintela <quintela@redhat.com> | 2018-06-04 05:46:15 +0200 |
commit | f38f6d4155c0c5a3e96d81183362a40e2cc09b4c (patch) | |
tree | 86a6cfe1dc90157a9be4250e4bc290bfad08c91b /migration/rdma.c | |
parent | 0f073f44df109ea0910d67caede70dec95956ff6 (diff) | |
download | qemu-f38f6d4155c0c5a3e96d81183362a40e2cc09b4c.zip qemu-f38f6d4155c0c5a3e96d81183362a40e2cc09b4c.tar.gz qemu-f38f6d4155c0c5a3e96d81183362a40e2cc09b4c.tar.bz2 |
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: Lidong Chen <lidongchen@tencent.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Lidong Chen <jemmy858585@gmail.com>
Diffstat (limited to 'migration/rdma.c')
-rw-r--r-- | migration/rdma.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/migration/rdma.c b/migration/rdma.c index 7d233b0..6077922 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -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; } /* |