From patchwork Fri Jan 14 17:33:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 78984 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]) by ozlabs.org (Postfix) with ESMTP id 5EA69B6F1E for ; Sat, 15 Jan 2011 05:11:34 +1100 (EST) Received: from localhost ([127.0.0.1]:38374 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pdo0V-0002s1-6K for incoming@patchwork.ozlabs.org; Fri, 14 Jan 2011 13:04:15 -0500 Received: from [140.186.70.92] (port=59825 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PdnXr-0004LV-O7 for qemu-devel@nongnu.org; Fri, 14 Jan 2011 12:34:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PdnXn-00018J-LL for qemu-devel@nongnu.org; Fri, 14 Jan 2011 12:34:39 -0500 Received: from sh.osrg.net ([192.16.179.4]:35711) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PdnXm-00017i-Uo for qemu-devel@nongnu.org; Fri, 14 Jan 2011 12:34:35 -0500 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 p0EHYGsa007210; Sat, 15 Jan 2011 02:34:18 +0900 Received: from localhost (hype-nh0.osrg.net [10.72.1.48]) by fs.osrg.net (Postfix) with ESMTP id 14A753E042D; Sat, 15 Jan 2011 02:34:15 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Date: Sat, 15 Jan 2011 02:33:26 +0900 Message-Id: <1295026408-11122-18-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.1.2 In-Reply-To: <1295026408-11122-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1295026408-11122-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 123 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Sat, 15 Jan 2011 02:34:19 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96.5 at sh X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: kwolf@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, ananth@in.ibm.com, mst@redhat.com, dlaor@redhat.com, vatsa@linux.vnet.ibm.com, Yoshiaki Tamura , blauwirbel@gmail.com, ohmura.kei@lab.ntt.co.jp, avi@redhat.com, psuriset@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 17/19] migration-tcp: 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() sets ft_trans_incoming() as a callback, and call qemu_file_get_notify() to receive 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. vm_change_state_handler is added to turn off ft_mode when cont is pressed. Signed-off-by: Yoshiaki Tamura --- migration-tcp.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 66 insertions(+), 1 deletions(-) diff --git a/migration-tcp.c b/migration-tcp.c index 55777c8..84076d6 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -18,6 +18,8 @@ #include "sysemu.h" #include "buffered_file.h" #include "block.h" +#include "ft_trans_file.h" +#include "event-tap.h" //#define DEBUG_MIGRATION_TCP @@ -29,6 +31,8 @@ do { } while (0) #endif +static VMChangeStateEntry *vmstate; + static int socket_errno(FdMigrationState *s) { return socket_error(); @@ -56,7 +60,8 @@ static int socket_read(FdMigrationState *s, const void * buf, size_t size) 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; } @@ -150,6 +155,36 @@ MigrationState *tcp_start_outgoing_migration(Monitor *mon, return &s->mig_state; } +static void ft_trans_incoming(void *opaque) +{ + QEMUFile *f = opaque; + + qemu_file_get_notify(f); + if (qemu_file_has_error(f)) { + ft_mode = FT_ERROR; + qemu_fclose(f); + } +} + +static void ft_trans_reset(void *opaque, int running, int reason) +{ + QEMUFile *f = opaque; + + if (running) { + if (ft_mode != FT_ERROR) { + qemu_fclose(f); + } + ft_mode = FT_OFF; + qemu_del_vm_change_state_handler(vmstate); + } +} + +static void ft_trans_schedule_replay(QEMUFile *f) +{ + event_tap_schedule_replay(); + vmstate = qemu_add_vm_change_state_handler(ft_trans_reset, f); +} + static void tcp_accept_incoming_migration(void *opaque) { struct sockaddr_in addr; @@ -175,8 +210,38 @@ static void tcp_accept_incoming_migration(void *opaque) goto out; } + if (ft_mode == FT_INIT) { + autostart = 0; + } + process_incoming_migration(f); + + if (ft_mode == FT_INIT) { + int ret; + + socket_set_nodelay(c); + + f = qemu_fopen_ft_trans(s, c); + if (f == NULL) { + fprintf(stderr, "could not qemu_fopen_ft_trans\n"); + goto out; + } + + /* need to wait sender to setup */ + ret = qemu_ft_trans_begin(f); + if (ret < 0) { + goto out; + } + + qemu_set_fd_handler2(c, NULL, ft_trans_incoming, NULL, f); + ft_trans_schedule_replay(f); + ft_mode = FT_TRANSACTION_RECV; + + return; + } + qemu_fclose(f); + out: close(c); out2: