{"id":810532,"url":"http://patchwork.ozlabs.org/api/patches/810532/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906115143.27451-3-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-3-quintela@redhat.com>","list_archive_url":null,"date":"2017-09-06T11:51:23","name":"[v7,02/22] migration: Create migration_ioc_process_incoming()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"962f000cd2f0d66d9e765a956a7b4506b414d980","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-3-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/810532/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810532/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-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.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 3xnMTW3TyWz9sBW\n\tfor ;\n\tWed, 6 Sep 2017 21:55:11 +1000 (AEST)","from localhost ([::1]:35583 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpYvF-0000v6-IT\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 07:55:09 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:60127)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpYs8-0007Du-D3\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:51:57 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpYs7-0007uR-CX\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:51:56 -0400","from mx1.redhat.com ([209.132.183.28]:47510)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpYs7-0007uC-4K\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:51:55 -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 1ECD35D5EB\n\tfor ; Wed, 6 Sep 2017 11:51:54 +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 BF6A319EF5;\n\tWed, 6 Sep 2017 11:51:52 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 1ECD35D5EB","From":"Juan Quintela ","To":"qemu-devel@nongnu.org","Date":"Wed, 6 Sep 2017 13:51:23 +0200","Message-Id":"<20170906115143.27451-3-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.39]);\n\tWed, 06 Sep 2017 11:51:54 +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 02/22] migration: Create\n\tmigration_ioc_process_incoming()","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 pass the ioc instead of the fd. This will allow us to have more\nthan one channel open. We also make sure that we set the\nfrom_src_file sooner, so we don't need to pass it as a parameter.\n\nSigned-off-by: Juan Quintela \nReviewed-by: Daniel P. Berrange \n---\n migration/channel.c | 3 +--\n migration/migration.c | 23 +++++++++++++++++++----\n migration/migration.h | 2 ++\n 3 files changed, 22 insertions(+), 6 deletions(-)","diff":"diff --git a/migration/channel.c b/migration/channel.c\nindex 3b7252f5a2..edceebdb7b 100644\n--- a/migration/channel.c\n+++ b/migration/channel.c\n@@ -36,8 +36,7 @@ void migration_channel_process_incoming(QIOChannel *ioc)\n error_report_err(local_err);\n }\n } else {\n- QEMUFile *f = qemu_fopen_channel_input(ioc);\n- migration_fd_process_incoming(f);\n+ migration_ioc_process_incoming(ioc);\n }\n }\n \ndiff --git a/migration/migration.c b/migration/migration.c\nindex 1a2b3ebd1a..d16d8a63ec 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -306,17 +306,16 @@ static void process_incoming_migration_bh(void *opaque)\n \n static void process_incoming_migration_co(void *opaque)\n {\n- QEMUFile *f = opaque;\n MigrationIncomingState *mis = migration_incoming_get_current();\n PostcopyState ps;\n int ret;\n \n- mis->from_src_file = f;\n+ assert(mis->from_src_file);\n mis->largest_page_size = qemu_ram_pagesize_largest();\n postcopy_state_set(POSTCOPY_INCOMING_NONE);\n migrate_set_state(&mis->state, MIGRATION_STATUS_NONE,\n MIGRATION_STATUS_ACTIVE);\n- ret = qemu_loadvm_state(f);\n+ ret = qemu_loadvm_state(mis->from_src_file);\n \n ps = postcopy_state_get();\n trace_process_incoming_migration_co_end(ret, ps);\n@@ -364,12 +363,28 @@ static void process_incoming_migration_co(void *opaque)\n \n void migration_fd_process_incoming(QEMUFile *f)\n {\n- Coroutine *co = qemu_coroutine_create(process_incoming_migration_co, f);\n+ Coroutine *co = qemu_coroutine_create(process_incoming_migration_co, NULL);\n+ MigrationIncomingState *mis = migration_incoming_get_current();\n \n+ if (!mis->from_src_file) {\n+ mis->from_src_file = f;\n+ }\n qemu_file_set_blocking(f, false);\n qemu_coroutine_enter(co);\n }\n \n+void migration_ioc_process_incoming(QIOChannel *ioc)\n+{\n+ MigrationIncomingState *mis = migration_incoming_get_current();\n+\n+ if (!mis->from_src_file) {\n+ QEMUFile *f = qemu_fopen_channel_input(ioc);\n+ mis->from_src_file = f;\n+ migration_fd_process_incoming(f);\n+ }\n+ /* We still only have a single channel. Nothing to do here yet */\n+}\n+\n /*\n * Send a 'SHUT' message on the return channel with the given value\n * to indicate that we've finished with the RP. Non-0 value indicates\ndiff --git a/migration/migration.h b/migration/migration.h\nindex 148c9facbc..99c398d484 100644\n--- a/migration/migration.h\n+++ b/migration/migration.h\n@@ -20,6 +20,7 @@\n #include \"exec/cpu-common.h\"\n #include \"qemu/coroutine_int.h\"\n #include \"hw/qdev.h\"\n+#include \"io/channel.h\"\n \n /* State for the incoming migration */\n struct MigrationIncomingState {\n@@ -152,6 +153,7 @@ struct MigrationState\n void migrate_set_state(int *state, int old_state, int new_state);\n \n void migration_fd_process_incoming(QEMUFile *f);\n+void migration_ioc_process_incoming(QIOChannel *ioc);\n \n uint64_t migrate_max_downtime(void);\n \n","prefixes":["v7","02/22"]}