[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 16/19] migration: Test new fd infrastructure
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH v6 16/19] migration: Test new fd infrastructure |
Date: |
Tue, 8 Aug 2017 18:22:21 +0200 |
We just send the address through the alternate channels and test that it
is ok.
Signed-off-by: Juan Quintela <address@hidden>
---
migration/ram.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/migration/ram.c b/migration/ram.c
index eb0015e..42ad126 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -479,8 +479,26 @@ static void *multifd_send_thread(void *opaque)
break;
}
if (p->pages.num) {
+ int i;
+ int num;
+
+ num = p->pages.num;
p->pages.num = 0;
qemu_mutex_unlock(&p->mutex);
+
+ for (i = 0; i < num; i++) {
+ if (qio_channel_write(p->c,
+ (const char *)&p->pages.iov[i].iov_base,
+ sizeof(uint8_t *), &error_abort)
+ != sizeof(uint8_t *)) {
+ MigrationState *s = migrate_get_current();
+
+ migrate_set_state(&s->state, MIGRATION_STATUS_ACTIVE,
+ MIGRATION_STATUS_FAILED);
+ terminate_multifd_send_threads();
+ return NULL;
+ }
+ }
qemu_mutex_lock(&multifd_send_state->mutex);
p->done = true;
qemu_mutex_unlock(&multifd_send_state->mutex);
@@ -640,6 +658,7 @@ void multifd_load_cleanup(void)
static void *multifd_recv_thread(void *opaque)
{
MultiFDRecvParams *p = opaque;
+ uint8_t *recv_address;
qemu_sem_post(&p->ready);
while (true) {
@@ -649,7 +668,38 @@ static void *multifd_recv_thread(void *opaque)
break;
}
if (p->pages.num) {
+ int i;
+ int num;
+
+ num = p->pages.num;
p->pages.num = 0;
+
+ for (i = 0; i < num; i++) {
+ if (qio_channel_read(p->c,
+ (char *)&recv_address,
+ sizeof(uint8_t *), &error_abort)
+ != sizeof(uint8_t *)) {
+ MigrationState *s = migrate_get_current();
+
+ migrate_set_state(&s->state, MIGRATION_STATUS_ACTIVE,
+ MIGRATION_STATUS_FAILED);
+ terminate_multifd_recv_threads();
+ return NULL;
+ }
+ if (recv_address != p->pages.iov[i].iov_base) {
+ MigrationState *s = migrate_get_current();
+
+ printf("We received %p what we were expecting %p (%d)\n",
+ recv_address,
+ p->pages.iov[i].iov_base, i);
+
+ migrate_set_state(&s->state, MIGRATION_STATUS_ACTIVE,
+ MIGRATION_STATUS_FAILED);
+ terminate_multifd_recv_threads();
+ return NULL;
+ }
+ }
+
p->done = true;
qemu_mutex_unlock(&p->mutex);
qemu_sem_post(&p->ready);
--
2.9.4
- [Qemu-devel] [PATCH v6 07/19] migration: Create x-multifd-threads parameter, (continued)
- [Qemu-devel] [PATCH v6 07/19] migration: Create x-multifd-threads parameter, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 08/19] migration: Create x-multifd-group parameter, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 09/19] migration: Create multifd migration threads, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 10/19] migration: Split migration_fd_process_incoming, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 11/19] migration: Start of multiple fd work, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 12/19] migration: Create ram_multifd_page, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 13/19] migration: Really use multiple pages at a time, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 14/19] migration: Send the fd number which we are going to use for this page, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 15/19] migration: Create thread infrastructure for multifd recv side, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 17/19] migration: Rename initial_bytes, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 16/19] migration: Test new fd infrastructure,
Juan Quintela <=
- [Qemu-devel] [PATCH v6 18/19] migration: Transfer pages over new channels, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 19/19] migration: Flush receive queue, Juan Quintela, 2017/08/08
- Re: [Qemu-devel] [PATCH v6 00/19] Multifd, no-reply, 2017/08/08
- [Qemu-devel] [PATCH v6 00/19] Multifd, Juan Quintela, 2017/08/08