[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/15] multifd: Only send pages when packet are not e
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 01/15] multifd: Only send pages when packet are not empty |
Date: |
Mon, 25 Mar 2019 18:46:52 +0100 |
We send packages without pages sometimes for sysnchronizanion. The
iov functions do the right thing, but we will be changing this code in
future patches.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/ram.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 35bd6213e9..3034f862c1 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1088,9 +1088,12 @@ static void *multifd_send_thread(void *opaque)
break;
}
- ret = qio_channel_writev_all(p->c, p->pages->iov, used,
&local_err);
- if (ret != 0) {
- break;
+ if (used) {
+ ret = qio_channel_writev_all(p->c, p->pages->iov,
+ used, &local_err);
+ if (ret != 0) {
+ break;
+ }
}
qemu_mutex_lock(&p->mutex);
@@ -1317,9 +1320,12 @@ static void *multifd_recv_thread(void *opaque)
p->num_pages += used;
qemu_mutex_unlock(&p->mutex);
- ret = qio_channel_readv_all(p->c, p->pages->iov, used, &local_err);
- if (ret != 0) {
- break;
+ if (used) {
+ ret = qio_channel_readv_all(p->c, p->pages->iov,
+ used, &local_err);
+ if (ret != 0) {
+ break;
+ }
}
if (flags & MULTIFD_FLAG_SYNC) {
--
2.20.1
- [Qemu-devel] [PULL 09/15] migration: add support for a "tls-authz" migration parameter, (continued)
- [Qemu-devel] [PULL 09/15] migration: add support for a "tls-authz" migration parameter, Juan Quintela, 2019/03/25
- [Qemu-devel] [PULL 10/15] migration/rdma: Check qemu_rdma_init_one_block, Juan Quintela, 2019/03/25
- [Qemu-devel] [PULL 07/15] multifd: Add some padding, Juan Quintela, 2019/03/25
- [Qemu-devel] [PULL 02/15] multifd: Rename "size" member to pages_alloc, Juan Quintela, 2019/03/25
- [Qemu-devel] [PULL 12/15] Migration/colo.c: Add new COLOExitReason to handle all failover state, Juan Quintela, 2019/03/25
- [Qemu-devel] [PULL 11/15] Migration/colo.c: Fix COLO failover status error, Juan Quintela, 2019/03/25
- [Qemu-devel] [PULL 06/15] multifd: Change default packet size, Juan Quintela, 2019/03/25
- [Qemu-devel] [PULL 08/15] multifd: Drop x-, Juan Quintela, 2019/03/25
- [Qemu-devel] [PULL 05/15] multifd: Be flexible about packet size, Juan Quintela, 2019/03/25
- [Qemu-devel] [PULL 03/15] multifd: Create new next_packet_size field, Juan Quintela, 2019/03/25
- [Qemu-devel] [PULL 01/15] multifd: Only send pages when packet are not empty,
Juan Quintela <=
- [Qemu-devel] [PULL 04/15] multifd: Drop x-multifd-page-count parameter, Juan Quintela, 2019/03/25
- Re: [Qemu-devel] [PULL 00/15] Migration patches, Peter Maydell, 2019/03/26