From patchwork Thu Jan 13 17:15:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 476201 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 p0DHKSO5015860 for ; Thu, 13 Jan 2011 17:20:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757298Ab1AMRU1 (ORCPT ); Thu, 13 Jan 2011 12:20:27 -0500 Received: from sh.osrg.net ([192.16.179.4]:41980 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757293Ab1AMRUY (ORCPT ); Thu, 13 Jan 2011 12:20:24 -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 p0DHJhlg031762; Fri, 14 Jan 2011 02:19:46 +0900 Received: from localhost (hype-nh0.osrg.net [10.72.1.48]) by fs.osrg.net (Postfix) with ESMTP id C47111B8012; Fri, 14 Jan 2011 02:19:40 +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 19/19] migration: add a parser to accept FT migration incoming mode. Date: Fri, 14 Jan 2011 02:15:41 +0900 Message-Id: <1294938941-9532-20-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.1.2 In-Reply-To: <1294938941-9532-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1294938941-9532-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 32 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 13 Jan 2011 17:20:29 +0000 (UTC) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Fri, 14 Jan 2011 02:19:47 +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.c b/migration.c index d4922ce..1822e97 100644 --- a/migration.c +++ b/migration.c @@ -42,9 +42,16 @@ static MigrationState *current_migration; int qemu_start_incoming_migration(const char *uri) { - const char *p; + const char *p = uri; int ret; + /* check ft_mode option */ + if ((p = strstr(p, "ft_mode"))) { + if (!strcmp(p, "ft_mode")) { + ft_mode = FT_INIT; + } + } + if (strstart(uri, "tcp:", &p)) ret = tcp_start_incoming_migration(p); #if !defined(WIN32)