From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1df7Kd-000191-7U for qemu-devel@nongnu.org; Tue, 08 Aug 2017 12:26:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1df7KZ-0007Ir-6T for qemu-devel@nongnu.org; Tue, 08 Aug 2017 12:26:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35326) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1df7KY-0007IM-U2 for qemu-devel@nongnu.org; Tue, 08 Aug 2017 12:26:07 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CC9A5356D4 for ; Tue, 8 Aug 2017 16:26:05 +0000 (UTC) From: Juan Quintela Date: Tue, 8 Aug 2017 18:22:21 +0200 Message-Id: <20170808162224.32419-17-quintela@redhat.com> In-Reply-To: <20170808162224.32419-1-quintela@redhat.com> References: <20170808162224.32419-1-quintela@redhat.com> Subject: [Qemu-devel] [PATCH v6 16/19] migration: Test new fd infrastructure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dgilbert@redhat.com, lvivier@redhat.com, peterx@redhat.com We just send the address through the alternate channels and test that it is ok. Signed-off-by: Juan Quintela --- 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