From patchwork Thu Nov 25 06:07:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 356042 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 oAP6rOYc000411 for ; Thu, 25 Nov 2010 06:53:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751761Ab0KYGwy (ORCPT ); Thu, 25 Nov 2010 01:52:54 -0500 Received: from sh.osrg.net ([192.16.179.4]:33348 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751536Ab0KYGwp (ORCPT ); Thu, 25 Nov 2010 01:52:45 -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 oAP6q2hc003259; Thu, 25 Nov 2010 15:52:03 +0900 Received: from localhost (hype-nh0.osrg.net [10.72.1.48]) by fs.osrg.net (Postfix) with ESMTP id 924203E0438; Thu, 25 Nov 2010 15:51:57 +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, 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 21/21] migration: add a parser to accept FT migration incoming mode. Date: Thu, 25 Nov 2010 15:07:00 +0900 Message-Id: <1290665220-26478-22-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.1.2 In-Reply-To: <1290665220-26478-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1290665220-26478-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.3 (demeter1.kernel.org [140.211.167.41]); Thu, 25 Nov 2010 06:53:25 +0000 (UTC) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Thu, 25 Nov 2010 15:52:04 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96.4 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 f0cfa37..58f1158 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)