From patchwork Tue Aug 7 15:51:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 175679 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CE0C42C0098 for ; Wed, 8 Aug 2012 01:53:28 +1000 (EST) Received: from localhost ([::1]:36945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sym63-0004Wz-15 for incoming@patchwork.ozlabs.org; Tue, 07 Aug 2012 11:53:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sym57-00025T-Mo for qemu-devel@nongnu.org; Tue, 07 Aug 2012 11:52:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sym51-0005KE-4G for qemu-devel@nongnu.org; Tue, 07 Aug 2012 11:52:29 -0400 Received: from mail-yx0-f173.google.com ([209.85.213.173]:41636) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sym50-0005K1-UY for qemu-devel@nongnu.org; Tue, 07 Aug 2012 11:52:23 -0400 Received: by yenm4 with SMTP id m4so1353453yen.4 for ; Tue, 07 Aug 2012 08:52:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=SPoTLfTEmTnYvL+6YmjSpQs4egXd/59+KKKUAkotAs0=; b=StLvJO8EoBgz4+grj0L/B+WIMpHbr4C3FEjebMAJxsKOA1gw/UKQvTTThAmcNebzZC xDJdRhkjLbxWA73WBpN/BS8d0zOxpGS3BC3D2UJzX7ZHFIeAAx+kSzGentdqJvVLyoVU 0EhdOkBLDKJmxucCy+58l7zHXVzpveHUrYDnK+E8TikQ42oABYV7UkQNbFgU31mov1AP rvkx0dJNIGggM/GR7rUW0bHn6xi/GSflzy13BYiKhxHpYdFtF2fJeoivdi2g3Xq26aIq uNekJU84aH7Blxi9GD1BbJWsryH0oLj2lqyvdu5FDF24k6U40254iBIg8QavBiwNxHs2 idbw== Received: by 10.66.88.39 with SMTP id bd7mr26992925pab.50.1344354742050; Tue, 07 Aug 2012 08:52:22 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id op10sm7982776pbc.75.2012.08.07.08.52.18 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Aug 2012 08:52:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 7 Aug 2012 17:51:47 +0200 Message-Id: <1344354707-27315-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1344354707-27315-1-git-send-email-pbonzini@redhat.com> References: <1344354707-27315-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.213.173 Cc: owasserm@redhat.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH 6/6] migration: move process_incoming_migration to a coroutine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- migration-exec.c | 2 +- migration-fd.c | 2 +- migration-tcp.c | 2 +- migration-unix.c | 2 +- migration.c | 17 ++++++++++++++++- migration.h | 2 +- 6 file modificati, 21 inserzioni(+), 6 rimozioni(-) diff --git a/migration-exec.c b/migration-exec.c index 84796be..e8ed144 100644 --- a/migration-exec.c +++ b/migration-exec.c @@ -98,7 +98,7 @@ static void exec_accept_incoming_migration(void *opaque) QEMUFile *f = opaque; qemu_set_fd_handler2(qemu_stdio_fd(f), NULL, NULL, NULL, NULL); - process_incoming_migration(f); + process_incoming_migration(f, qemu_stdio_fd(f)); } int exec_start_incoming_migration(const char *command) diff --git a/migration-fd.c b/migration-fd.c index 21ad196..e9a06d9 100644 --- a/migration-fd.c +++ b/migration-fd.c @@ -104,7 +104,7 @@ static void fd_accept_incoming_migration(void *opaque) QEMUFile *f = opaque; qemu_set_fd_handler2(qemu_stdio_fd(f), NULL, NULL, NULL, NULL); - process_incoming_migration(f); + process_incoming_migration(f, qemu_stdio_fd(f)); } int fd_start_incoming_migration(const char *infd) diff --git a/migration-tcp.c b/migration-tcp.c index 62c9309..765970c 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -135,7 +135,7 @@ static void tcp_accept_incoming_migration(void *opaque) goto out; } - process_incoming_migration(f); + process_incoming_migration(f, c); return; out: diff --git a/migration-unix.c b/migration-unix.c index d8d5dfa..071d4fb 100644 --- a/migration-unix.c +++ b/migration-unix.c @@ -145,7 +145,7 @@ static void unix_accept_incoming_migration(void *opaque) goto out; } - process_incoming_migration(f); + process_incoming_migration(f, c); return; out: diff --git a/migration.c b/migration.c index a27ceb3..d821971 100644 --- a/migration.c +++ b/migration.c @@ -82,8 +82,9 @@ int qemu_start_incoming_migration(const char *uri, Error **errp) return ret; } -void process_incoming_migration(QEMUFile *f) +static void process_incoming_migration_co(void *opaque) { + QEMUFile *f = opaque; int ret; ret = qemu_loadvm_state(f); @@ -106,6 +107,20 @@ void process_incoming_migration(QEMUFile *f) } } +static void enter_migration_coroutine(void *opaque) +{ + Coroutine *co = opaque; + qemu_coroutine_enter(co, NULL); +} + +void process_incoming_migration(QEMUFile *f, int fd) +{ + Coroutine *co = qemu_coroutine_create(process_incoming_migration_co); + socket_set_nonblock(fd); + qemu_set_fd_handler(fd, enter_migration_coroutine, NULL, co); + qemu_coroutine_enter(co, f); +} + /* amount of nanoseconds we are willing to wait for migration to be down. * the choice of nanoseconds is because it is the maximum resolution that * get_clock() can achieve. It is an internal measure. All user-visible diff --git a/migration.h b/migration.h index 57572a6..4a35ea7 100644 --- a/migration.h +++ b/migration.h @@ -41,7 +41,7 @@ struct MigrationState int64_t total_time; }; -void process_incoming_migration(QEMUFile *f); +void process_incoming_migration(QEMUFile *f, int fd); int qemu_start_incoming_migration(const char *uri, Error **errp);