[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 1/8] multifd: Only send pages when packet are not
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH v2 1/8] multifd: Only send pages when packet are not empty |
Date: |
Wed, 20 Feb 2019 12:56:04 +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>
---
migration/ram.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 59191c1ed2..8b5fd67d66 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1025,9 +1025,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);
@@ -1254,9 +1257,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] [PATCH v2 0/8] migration: Make multifd not experimental, Juan Quintela, 2019/02/20
- [Qemu-devel] [PATCH v2 1/8] multifd: Only send pages when packet are not empty,
Juan Quintela <=
- [Qemu-devel] [PATCH v2 3/8] multifd: Create new next_packet_size field, Juan Quintela, 2019/02/20
- [Qemu-devel] [PATCH v2 2/8] multifd: Rename "size" member to pages_alloc, Juan Quintela, 2019/02/20
- [Qemu-devel] [PATCH v2 4/8] multifd: Drop x-multifd-page-count parameter, Juan Quintela, 2019/02/20
- [Qemu-devel] [PATCH v2 8/8] tests: Add migration multifd test, Juan Quintela, 2019/02/20
- [Qemu-devel] [PATCH v2 5/8] multifd: Be flexible about packet size, Juan Quintela, 2019/02/20