{"id":810550,"url":"http://patchwork.ozlabs.org/api/patches/810550/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906115143.27451-20-quintela@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170906115143.27451-20-quintela@redhat.com>","list_archive_url":null,"date":"2017-09-06T11:51:40","name":"[v7,19/22] migration: Test new fd infrastructure","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"1a079e4c4bff3c90a17e50feb51df798c3df7094","submitter":{"id":2643,"url":"http://patchwork.ozlabs.org/api/people/2643/?format=json","name":"Juan Quintela","email":"quintela@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906115143.27451-20-quintela@redhat.com/mbox/","series":[{"id":1773,"url":"http://patchwork.ozlabs.org/api/series/1773/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1773","date":"2017-09-06T11:51:21","name":"Multifd","version":7,"mbox":"http://patchwork.ozlabs.org/series/1773/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810550/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810550/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=quintela@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xnMkK44qqz9sCZ\n\tfor ;\n\tWed, 6 Sep 2017 22:06:14 +1000 (AEST)","from localhost ([::1]:35704 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpZ5w-0001kD-Jx\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 08:06:12 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:60513)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpYso-0007nb-LU\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:41 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpYsn-0008EN-Sy\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:38 -0400","from mx1.redhat.com ([209.132.183.28]:42044)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpYsn-0008Do-Jv\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:37 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 9A720C047B62\n\tfor ; Wed, 6 Sep 2017 11:52:36 +0000 (UTC)","from secure.mitica (ovpn-117-188.ams2.redhat.com [10.36.117.188])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id AEEFA5B818;\n\tWed, 6 Sep 2017 11:52:34 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 9A720C047B62","From":"Juan Quintela ","To":"qemu-devel@nongnu.org","Date":"Wed, 6 Sep 2017 13:51:40 +0200","Message-Id":"<20170906115143.27451-20-quintela@redhat.com>","In-Reply-To":"<20170906115143.27451-1-quintela@redhat.com>","References":"<20170906115143.27451-1-quintela@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tWed, 06 Sep 2017 11:52:36 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v7 19/22] migration: Test new fd infrastructure","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"We just send the address through the alternate channels and test that it\nis ok.\n\nSigned-off-by: Juan Quintela \n---\n migration/ram.c | 39 +++++++++++++++++++++++++++++++++++++++\n 1 file changed, 39 insertions(+)","diff":"diff --git a/migration/ram.c b/migration/ram.c\nindex b897d490f2..348ce1141a 100644\n--- a/migration/ram.c\n+++ b/migration/ram.c\n@@ -496,8 +496,24 @@ static void *multifd_send_thread(void *opaque)\n break;\n }\n if (p->pages.num) {\n+ Error *local_err = NULL;\n+ size_t ret;\n+ int i;\n+ int num;\n+\n+ num = p->pages.num;\n p->pages.num = 0;\n qemu_mutex_unlock(&p->mutex);\n+\n+ for (i = 0; i < num; i++) {\n+ ret = qio_channel_write(p->c,\n+ (const char *)&p->pages.iov[i].iov_base,\n+ sizeof(uint8_t *), &local_err);\n+ if (ret != sizeof(uint8_t *)) {\n+ terminate_multifd_send_threads(local_err);\n+ return NULL;\n+ }\n+ }\n qemu_mutex_lock(&multifd_send_state->mutex);\n p->done = true;\n qemu_mutex_unlock(&multifd_send_state->mutex);\n@@ -669,6 +685,7 @@ int multifd_load_cleanup(Error **errp)\n static void *multifd_recv_thread(void *opaque)\n {\n MultiFDRecvParams *p = opaque;\n+ uint8_t *recv_address;\n \n qemu_sem_post(&p->ready);\n while (true) {\n@@ -678,7 +695,29 @@ static void *multifd_recv_thread(void *opaque)\n break;\n }\n if (p->pages.num) {\n+ Error *local_err = NULL;\n+ size_t ret;\n+ int i;\n+ int num;\n+\n+ num = p->pages.num;\n p->pages.num = 0;\n+\n+ for (i = 0; i < num; i++) {\n+ ret = qio_channel_read(p->c, (char *)&recv_address,\n+ sizeof(uint8_t *), &local_err);\n+ if (ret != sizeof(uint8_t *)) {\n+ terminate_multifd_recv_threads(local_err);\n+ return NULL;\n+ }\n+ if (recv_address != p->pages.iov[i].iov_base) {\n+ error_setg(&local_err, \"received %p and expecting %p (%d)\\n\",\n+ recv_address, p->pages.iov[i].iov_base, i);\n+ terminate_multifd_recv_threads(local_err);\n+ return NULL;\n+ }\n+ }\n+\n p->done = true;\n qemu_mutex_unlock(&p->mutex);\n qemu_sem_post(&p->ready);\n","prefixes":["v7","19/22"]}