{"id":810551,"url":"http://patchwork.ozlabs.org/api/patches/810551/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906115143.27451-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":"<20170906115143.27451-18-quintela@redhat.com>","list_archive_url":null,"date":"2017-09-06T11:51:38","name":"[v7,17/22] migration: Send the fd number which we are going to use for this page","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"9246c2b8c19f5bc41beb3d8148f54ae6d4968f84","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-18-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/810551/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810551/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-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.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 3xnMkK6K6Pz9sNc\n\tfor ;\n\tWed, 6 Sep 2017 22:06:17 +1000 (AEST)","from localhost ([::1]:35705 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpZ60-0001mg-0W\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 08:06:16 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:60421)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpYsi-0007gn-1k\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:32 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpYsh-0008BD-2Y\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:32 -0400","from mx1.redhat.com ([209.132.183.28]:54650)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpYsg-0008At-T0\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:31 -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 D944C81138\n\tfor ; Wed, 6 Sep 2017 11:52:29 +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 4716619E3F;\n\tWed, 6 Sep 2017 11:52:28 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com D944C81138","From":"Juan Quintela ","To":"qemu-devel@nongnu.org","Date":"Wed, 6 Sep 2017 13:51:38 +0200","Message-Id":"<20170906115143.27451-18-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.27]);\n\tWed, 06 Sep 2017 11:52:30 +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 17/22] migration: Send the fd number which\n\twe are going to use for this page","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 are still sending the page through the main channel, that would\nchange later in the series\n\nSigned-off-by: Juan Quintela \nReviewed-by: Dr. David Alan Gilbert \n---\n migration/ram.c | 13 +++++++++++--\n 1 file changed, 11 insertions(+), 2 deletions(-)","diff":"diff --git a/migration/ram.c b/migration/ram.c\nindex 4329039f8c..7eba87b84c 100644\n--- a/migration/ram.c\n+++ b/migration/ram.c\n@@ -587,7 +587,7 @@ static uint16_t multifd_send_page(uint8_t *address, bool last_page)\n qemu_mutex_unlock(&p->mutex);\n qemu_sem_post(&p->sem);\n \n- return 0;\n+ return i;\n }\n \n struct MultiFDRecvParams {\n@@ -1176,6 +1176,7 @@ static int ram_multifd_page(RAMState *rs, PageSearchStatus *pss,\n bool last_stage)\n {\n int pages;\n+ uint16_t fd_num;\n uint8_t *p;\n RAMBlock *block = pss->block;\n ram_addr_t offset = pss->page << TARGET_PAGE_BITS;\n@@ -1187,8 +1188,10 @@ static int ram_multifd_page(RAMState *rs, PageSearchStatus *pss,\n ram_counters.transferred +=\n save_page_header(rs, rs->f, block,\n offset | RAM_SAVE_FLAG_MULTIFD_PAGE);\n+ fd_num = multifd_send_page(p, rs->migration_dirty_pages == 1);\n+ qemu_put_be16(rs->f, fd_num);\n+ ram_counters.transferred += 2; /* size of fd_num */\n qemu_put_buffer(rs->f, p, TARGET_PAGE_SIZE);\n- multifd_send_page(p, rs->migration_dirty_pages == 1);\n ram_counters.transferred += TARGET_PAGE_SIZE;\n pages = 1;\n ram_counters.normal++;\n@@ -2938,6 +2941,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)\n while (!postcopy_running && !ret && !(flags & RAM_SAVE_FLAG_EOS)) {\n ram_addr_t addr, total_ram_bytes;\n void *host = NULL;\n+ uint16_t fd_num;\n uint8_t ch;\n \n addr = qemu_get_be64(f);\n@@ -3048,6 +3052,11 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)\n break;\n \n case RAM_SAVE_FLAG_MULTIFD_PAGE:\n+ fd_num = qemu_get_be16(f);\n+ if (fd_num != 0) {\n+ /* this is yet an unused variable, changed later */\n+ fd_num = fd_num;\n+ }\n qemu_get_buffer(f, host, TARGET_PAGE_SIZE);\n break;\n \n","prefixes":["v7","17/22"]}