[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/5] migration: remove unnecessary variables len in Q
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 4/5] migration: remove unnecessary variables len in QIOChannelRDMA |
Date: |
Mon, 4 Jun 2018 06:21:55 +0200 |
From: Lidong Chen <address@hidden>
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. Berrangé <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
Signed-off-by: Lidong Chen <address@hidden>
---
migration/rdma.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/migration/rdma.c b/migration/rdma.c
index 7d233b0820..60779221b1 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;
}
/*
--
2.17.0
- [Qemu-devel] [PULL 0/5] Migration pull request, Juan Quintela, 2018/06/04
- [Qemu-devel] [PULL 1/5] migration: introduce decompress-error-check, Juan Quintela, 2018/06/04
- [Qemu-devel] [PULL 2/5] migration: discard non-migratable RAMBlocks, Juan Quintela, 2018/06/04
- [Qemu-devel] [PULL 3/5] migration: Don't activate block devices if using -S, Juan Quintela, 2018/06/04
- [Qemu-devel] [PULL 4/5] migration: remove unnecessary variables len in QIOChannelRDMA,
Juan Quintela <=
- [Qemu-devel] [PULL 5/5] migration: not wait RDMA_CM_EVENT_DISCONNECTED event after rdma_disconnect, Juan Quintela, 2018/06/04
- Re: [Qemu-devel] [PULL 0/5] Migration pull request, no-reply, 2018/06/04
- Re: [Qemu-devel] [PULL 0/5] Migration pull request, Peter Maydell, 2018/06/04