{"id":813364,"url":"http://patchwork.ozlabs.org/api/patches/813364/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913105953.13760-18-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":"<20170913105953.13760-18-quintela@redhat.com>","list_archive_url":null,"date":"2017-09-13T10:59:50","name":"[v8,17/20] migration: Test new fd infrastructure","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"6a2d6e10727d148e835f511185f9ab7d79a5a4cc","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/20170913105953.13760-18-quintela@redhat.com/mbox/","series":[{"id":2885,"url":"http://patchwork.ozlabs.org/api/series/2885/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2885","date":"2017-09-13T10:59:33","name":"Multifd","version":8,"mbox":"http://patchwork.ozlabs.org/series/2885/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813364/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813364/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","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=<UNKNOWN>)","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.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 3xsfBY6ZY6z9sBW\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 13 Sep 2017 21:12:05 +1000 (AEST)","from localhost ([::1]:41601 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1ds5aN-0007x8-2f\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 07:12:03 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:42458)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <quintela@redhat.com>) id 1ds5PW-0006dp-UM\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 07:00:51 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <quintela@redhat.com>) id 1ds5PT-00074R-08\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 07:00:51 -0400","from mx1.redhat.com ([209.132.183.28]:43596)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <quintela@redhat.com>) id 1ds5PS-00073e-Eg\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 07:00:46 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 69EB7155DF\n\tfor <qemu-devel@nongnu.org>; Wed, 13 Sep 2017 11:00:45 +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 71CC75C545;\n\tWed, 13 Sep 2017 11:00:43 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 69EB7155DF","From":"Juan Quintela <quintela@redhat.com>","To":"qemu-devel@nongnu.org","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>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.29]);\n\tWed, 13 Sep 2017 11:00:45 +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 v8 17/20] migration: Test new fd infrastructure","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","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<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"We just send the address through the alternate channels and test that it\nis ok.\n\nSigned-off-by: Juan Quintela <quintela@redhat.com>\n\n--\n\nUse qio_channel_*all functions\n---\n migration/ram.c | 39 +++++++++++++++++++++++++++++++++++++++\n 1 file changed, 39 insertions(+)","diff":"diff --git a/migration/ram.c b/migration/ram.c\nindex d6aa516f6d..1b1e346ae0 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_all(p->c,\n+                         (const char *)&p->pages.iov[i].iov_base,\n+                         sizeof(uint8_t *), &local_err);\n+                if (ret != 0) {\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@@ -679,6 +695,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@@ -688,7 +705,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_all(p->c, (char *)&recv_address,\n+                                           sizeof(uint8_t *), &local_err);\n+                if (ret != 0) {\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+                               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":["v8","17/20"]}