[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 3/6] migration: remove unnecessary variables len
From: |
Lidong Chen |
Subject: |
[Qemu-devel] [PATCH v3 3/6] migration: remove unnecessary variables len in QIOChannelRDMA |
Date: |
Sat, 5 May 2018 22:35:33 +0800 |
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 <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Daniel P. address@hidden>
---
migration/rdma.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/migration/rdma.c b/migration/rdma.c
index c745427..f5c1d02 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -404,7 +404,6 @@ struct QIOChannelRDMA {
QIOChannel parent;
RDMAContext *rdma;
QEMUFile *file;
- size_t len;
bool blocking; /* XXX we don't actually honour this yet */
};
@@ -2640,6 +2639,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();
@@ -2659,10 +2659,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);
@@ -2672,8 +2672,8 @@ static ssize_t qio_channel_rdma_writev(QIOChannel *ioc,
return ret;
}
- data += rioc->len;
- done += rioc->len;
+ data += len;
+ done += len;
}
}
@@ -2768,8 +2768,7 @@ static ssize_t qio_channel_rdma_readv(QIOChannel *ioc,
}
}
}
- rioc->len = done;
- return rioc->len;
+ return done;
}
/*
--
1.8.3.1
- [Qemu-devel] [PATCH v3 0/6] Enable postcopy RDMA live migration, Lidong Chen, 2018/05/05
- [Qemu-devel] [PATCH v3 1/6] migration: disable RDMA WRITE after postcopy started, Lidong Chen, 2018/05/05
- [Qemu-devel] [PATCH v3 2/6] migration: create a dedicated connection for rdma return path, Lidong Chen, 2018/05/05
- [Qemu-devel] [PATCH v3 3/6] migration: remove unnecessary variables len in QIOChannelRDMA,
Lidong Chen <=
- [Qemu-devel] [PATCH v3 4/6] migration: avoid concurrent invoke channel_close by different threads, Lidong Chen, 2018/05/05
- [Qemu-devel] [PATCH v3 6/6] migration: Stop rdma yielding during incoming postcopy, Lidong Chen, 2018/05/05
- [Qemu-devel] [PATCH v3 5/6] migration: implement bi-directional RDMA QIOChannel, Lidong Chen, 2018/05/05