From patchwork Mon Jan 23 21:32:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 718797 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3v6lQd2wGdz9t17 for ; Tue, 24 Jan 2017 08:52:09 +1100 (AEDT) Received: from localhost ([::1]:44665 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVmX1-0001Pu-2v for incoming@patchwork.ozlabs.org; Mon, 23 Jan 2017 16:52:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33884) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVmEM-0002Nu-23 for qemu-devel@nongnu.org; Mon, 23 Jan 2017 16:32:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cVmEL-0003Ce-4M for qemu-devel@nongnu.org; Mon, 23 Jan 2017 16:32:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59146) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cVmEK-0003CV-VB for qemu-devel@nongnu.org; Mon, 23 Jan 2017 16:32:49 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 29D3B4E326 for ; Mon, 23 Jan 2017 21:32:49 +0000 (UTC) Received: from emacs.mitica (ovpn-116-156.ams2.redhat.com [10.36.116.156]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v0NLWOdw018711; Mon, 23 Jan 2017 16:32:47 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 23 Jan 2017 22:32:19 +0100 Message-Id: <1485207141-1941-16-git-send-email-quintela@redhat.com> In-Reply-To: <1485207141-1941-1-git-send-email-quintela@redhat.com> References: <1485207141-1941-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 23 Jan 2017 21:32:49 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 15/17] migration: Test new fd infrastructure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: amit.shah@redhat.com, dgilbert@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We just send the address through the alternate channels and test that it is ok. Signed-off-by: Juan Quintela --- migration/ram.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index 4e530ea..95af694 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -432,8 +432,22 @@ static void *multifd_send_thread(void *opaque) qemu_mutex_lock(¶ms->mutex); while (!params->quit){ if (params->pages.num) { + int i; + int num; + + num = params->pages.num; params->pages.num = 0; qemu_mutex_unlock(¶ms->mutex); + + for(i=0; i < num; i++) { + if (qio_channel_write(params->c, + (const char *)¶ms->pages.address[i], + sizeof(uint8_t *), &error_abort) + != sizeof(uint8_t*)) { + /* Shuoudn't ever happen */ + exit(-1); + } + } qemu_mutex_lock(&multifd_send_mutex); params->done = true; qemu_cond_signal(&multifd_send_cond); @@ -594,6 +608,7 @@ QemuCond multifd_recv_cond; static void *multifd_recv_thread(void *opaque) { MultiFDRecvParams *params = opaque; + uint8_t *recv_address; char start; qio_channel_read(params->c, &start, 1, &error_abort); @@ -605,8 +620,29 @@ static void *multifd_recv_thread(void *opaque) qemu_mutex_lock(¶ms->mutex); while (!params->quit){ if (params->pages.num) { + int i; + int num; + + num = params->pages.num; params->pages.num = 0; qemu_mutex_unlock(¶ms->mutex); + + for(i = 0; i < num; i++) { + if (qio_channel_read(params->c, + (char *)&recv_address, + sizeof(uint8_t*), &error_abort) + != sizeof(uint8_t *)) { + /* shouldn't ever happen */ + exit(-1); + } + if (recv_address != params->pages.address[i]) { + printf("We received %p what we were expecting %p (%d)\n", + recv_address, + params->pages.address[i], i); + exit(-1); + } + } + qemu_mutex_lock(&multifd_recv_mutex); params->done = true; qemu_cond_signal(&multifd_recv_cond);