From patchwork Tue May 25 08:37:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 102119 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4P8gXOC030583 for ; Tue, 25 May 2010 08:42:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756419Ab0EYIlx (ORCPT ); Tue, 25 May 2010 04:41:53 -0400 Received: from sh.osrg.net ([192.16.179.4]:34887 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756285Ab0EYIkk (ORCPT ); Tue, 25 May 2010 04:40:40 -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 o4P8eJuZ010202; Tue, 25 May 2010 17:40:19 +0900 Received: from localhost (hype-wd0.osrg.net [10.72.1.16]) by fs.osrg.net (Postfix) with ESMTP id 0114A3E030B; Tue, 25 May 2010 17:40:18 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: avi@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, ohmura.kei@lab.ntt.co.jp, Yoshiaki Tamura Subject: [RFC PATCH 20/23] Modify tcp_accept_incoming_migration() to handle ft_mode, and add a hack not to close fd when ft_mode is enabled. Date: Tue, 25 May 2010 17:37:01 +0900 Message-Id: <1274776624-16435-22-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.31.g1df487 In-Reply-To: <1274776624-16435-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1274776624-16435-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 74 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 25 May 2010 08:42:33 +0000 (UTC) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Tue, 25 May 2010 17:40:20 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96 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 767a2f1..a5d9b6d 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 @@ -55,7 +56,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; } @@ -181,6 +183,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");