From patchwork Wed Apr 21 05:57:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 50623 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F2959B7BEE for ; Wed, 21 Apr 2010 16:32:13 +1000 (EST) Received: from localhost ([127.0.0.1]:40694 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4TTm-0005CV-Se for incoming@patchwork.ozlabs.org; Wed, 21 Apr 2010 02:32:10 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4T0n-0003HD-4w for qemu-devel@nongnu.org; Wed, 21 Apr 2010 02:02:13 -0400 Received: from [140.186.70.92] (port=36824 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4T0O-00032w-0m for qemu-devel@nongnu.org; Wed, 21 Apr 2010 02:02:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O4T0B-0006gm-BY for qemu-devel@nongnu.org; Wed, 21 Apr 2010 02:01:47 -0400 Received: from sh.osrg.net ([192.16.179.4]:35940) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4T09-0006eD-AV for qemu-devel@nongnu.org; Wed, 21 Apr 2010 02:01:33 -0400 Received: from fs.osrg.net (postfix@fs.osrg.net [10.0.0.12]) by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id o3L61Q1h004175; Wed, 21 Apr 2010 15:01:27 +0900 Received: from localhost (hype-wd0.osrg.net [10.72.1.16]) by fs.osrg.net (Postfix) with ESMTP id 4AA793E02FF; Wed, 21 Apr 2010 15:01:25 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Date: Wed, 21 Apr 2010 14:57:23 +0900 Message-Id: <1271829445-5328-19-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.31.g1df487 In-Reply-To: <1271829445-5328-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1271829445-5328-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 74 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Wed, 21 Apr 2010 15:01:27 +0900 (JST) X-Virus-Scanned: clamav-milter 0.95.3 at sh X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: aliguori@us.ibm.com, ohmura.kei@lab.ntt.co.jp, mtosatti@redhat.com, Yoshiaki Tamura , yoshikawa.takuya@oss.ntt.co.jp, avi@redhat.com Subject: [Qemu-devel] [RFC PATCH 18/20] Modify tcp_accept_incoming_migration() to handle ft_mode, and add a hack not to close fd when ft_mode is enabled. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When ft_mode is set in the header, tcp_accept_incoming_migration() receives ft_transaction iteratively. We also need a hack no to close fd before moving to ft_transaction mode, so that we can reuse the fd for it. Signed-off-by: Yoshiaki Tamura --- migration-tcp.c | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletions(-) diff --git a/migration-tcp.c b/migration-tcp.c index 94a1a03..e018ed1 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -18,6 +18,7 @@ #include "sysemu.h" #include "buffered_file.h" #include "block.h" +#include "ft_transaction.h" //#define DEBUG_MIGRATION_TCP @@ -60,7 +61,8 @@ static int socket_writev(FdMigrationState *s, const struct iovec *v, int count) static int tcp_close(FdMigrationState *s) { DPRINTF("tcp_close\n"); - if (s->fd != -1) { + /* FIX ME: accessing ft_mode here isn't clean */ + if (s->fd != -1 && ft_mode != FT_INIT) { close(s->fd); s->fd = -1; } @@ -187,6 +189,38 @@ static void tcp_accept_incoming_migration(void *opaque) fprintf(stderr, "load of migration failed\n"); goto out_fopen; } + + /* ft_mode is set by qemu_loadvm_state(). */ + if (ft_mode == FT_INIT) { + /* close normal QEMUFile first before reusing connection. */ + qemu_fclose(f); + socket_set_nodelay(c); + socket_set_timeout(c, 5); + /* don't autostart to avoid split brain. */ + autostart = 0; + + f = qemu_fopen_transaction(c); + if (f == NULL) { + fprintf(stderr, "could not qemu_fopen transaction\n"); + goto out; + } + + /* need to wait sender to setup. */ + if (qemu_transaction_begin(f) < 0) { + goto out_fopen; + } + + /* loop until transaction breaks */ + while ((ft_mode != FT_OFF) && (ret == 0)) { + ret = qemu_loadvm_state(f, 1); + } + + /* if migrate_cancel was called at the sender */ + if (ft_mode == FT_OFF) { + goto out_fopen; + } + } + qemu_announce_self(); DPRINTF("successfully loaded vm state\n");