From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ds5PW-0006dp-UM for qemu-devel@nongnu.org; Wed, 13 Sep 2017 07:00:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ds5PT-00074R-08 for qemu-devel@nongnu.org; Wed, 13 Sep 2017 07:00:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43596) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ds5PS-00073e-Eg for qemu-devel@nongnu.org; Wed, 13 Sep 2017 07:00:46 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 69EB7155DF for ; Wed, 13 Sep 2017 11:00:45 +0000 (UTC) From: Juan Quintela Date: Wed, 13 Sep 2017 12:59:50 +0200 Message-Id: <20170913105953.13760-18-quintela@redhat.com> In-Reply-To: <20170913105953.13760-1-quintela@redhat.com> References: <20170913105953.13760-1-quintela@redhat.com> Subject: [Qemu-devel] [PATCH v8 17/20] 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 -- Use qio_channel_*all functions --- migration/ram.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index d6aa516f6d..1b1e346ae0 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -496,8 +496,24 @@ static void *multifd_send_thread(void *opaque) break; } if (p->pages.num) { + Error *local_err = NULL; + size_t ret; + int i; + int num; + + num = p->pages.num; p->pages.num = 0; qemu_mutex_unlock(&p->mutex); + + for (i = 0; i < num; i++) { + ret = qio_channel_write_all(p->c, + (const char *)&p->pages.iov[i].iov_base, + sizeof(uint8_t *), &local_err); + if (ret != 0) { + terminate_multifd_send_threads(local_err); + return NULL; + } + } qemu_mutex_lock(&multifd_send_state->mutex); p->done = true; qemu_mutex_unlock(&multifd_send_state->mutex); @@ -679,6 +695,7 @@ int multifd_load_cleanup(Error **errp) static void *multifd_recv_thread(void *opaque) { MultiFDRecvParams *p = opaque; + uint8_t *recv_address; qemu_sem_post(&p->ready); while (true) { @@ -688,7 +705,29 @@ static void *multifd_recv_thread(void *opaque) break; } if (p->pages.num) { + Error *local_err = NULL; + size_t ret; + int i; + int num; + + num = p->pages.num; p->pages.num = 0; + + for (i = 0; i < num; i++) { + ret = qio_channel_read_all(p->c, (char *)&recv_address, + sizeof(uint8_t *), &local_err); + if (ret != 0) { + terminate_multifd_recv_threads(local_err); + return NULL; + } + if (recv_address != p->pages.iov[i].iov_base) { + error_setg(&local_err, "received %p and expecting %p (%d)", + recv_address, p->pages.iov[i].iov_base, i); + terminate_multifd_recv_threads(local_err); + return NULL; + } + } + p->done = true; qemu_mutex_unlock(&p->mutex); qemu_sem_post(&p->ready); -- 2.13.5