From patchwork Fri Dec 24 03:18:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 431711 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBO3KYWR031083 for ; Fri, 24 Dec 2010 03:20:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753125Ab0LXDU1 (ORCPT ); Thu, 23 Dec 2010 22:20:27 -0500 Received: from sh.osrg.net ([192.16.179.4]:51233 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752703Ab0LXDTu (ORCPT ); Thu, 23 Dec 2010 22:19:50 -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 oBO3JNCT004723; Fri, 24 Dec 2010 12:19:23 +0900 Received: from localhost (hype-nh0.osrg.net [10.72.1.48]) by fs.osrg.net (Postfix) with ESMTP id 26B3A3E0435; Fri, 24 Dec 2010 12:19:20 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: avi@redhat.com, anthony@codemonkey.ws, aliguori@us.ibm.com, mtosatti@redhat.com, dlaor@redhat.com, mst@redhat.com, kwolf@redhat.com, ananth@in.ibm.com, psuriset@linux.vnet.ibm.com, vatsa@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, ohmura.kei@lab.ntt.co.jp, Yoshiaki Tamura Subject: [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. Date: Fri, 24 Dec 2010 12:18:26 +0900 Message-Id: <1293160708-30881-18-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.1.2 In-Reply-To: <1293160708-30881-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1293160708-30881-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 93 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 24 Dec 2010 03:20:34 +0000 (UTC) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Fri, 24 Dec 2010 12:19:25 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96.5 at sh X-Virus-Status: Clean Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/migration-tcp.c b/migration-tcp.c index 96e2411..d5926fb 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 @@ -56,7 +58,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 +153,16 @@ 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 tcp_accept_incoming_migration(void *opaque) { struct sockaddr_in addr; @@ -175,8 +188,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); + event_tap_schedule_replay(); + ft_mode = FT_TRANSACTION_RECV; + + return; + } + qemu_fclose(f); + out: close(c); out2: