From patchwork Mon May 24 08:25:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 53403 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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B3711B7D51 for ; Mon, 24 May 2010 18:31:53 +1000 (EST) Received: from localhost ([127.0.0.1]:46188 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGT4g-0006H3-K5 for incoming@patchwork.ozlabs.org; Mon, 24 May 2010 04:31:50 -0400 Received: from [140.186.70.92] (port=57703 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGSyg-0003XY-Hl for qemu-devel@nongnu.org; Mon, 24 May 2010 04:25:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OGSyd-0004Rf-7E for qemu-devel@nongnu.org; Mon, 24 May 2010 04:25:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26958) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGSyc-0004RQ-Iw for qemu-devel@nongnu.org; Mon, 24 May 2010 04:25:35 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4O8PXGh014217 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 24 May 2010 04:25:34 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4O8PTZ1015804; Mon, 24 May 2010 04:25:32 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 24 May 2010 10:25:25 +0200 Message-Id: <9fed8fc8d5a596bd8fdf125ffadc8f55dc39eb2b.1274688090.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 1/5] Exit if incoming migration fails 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 Signed-off-by: Juan Quintela --- migration.c | 14 +++++++------- migration.h | 2 +- vl.c | 5 ++++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/migration.c b/migration.c index 05f6cc5..cf30a8e 100644 --- a/migration.c +++ b/migration.c @@ -36,22 +36,22 @@ static uint32_t max_throttle = (32 << 20); static MigrationState *current_migration; -void qemu_start_incoming_migration(const char *uri) +int qemu_start_incoming_migration(const char *uri) { const char *p; + int ret = -1; if (strstart(uri, "tcp:", &p)) - tcp_start_incoming_migration(p); + ret = tcp_start_incoming_migration(p); #if !defined(WIN32) else if (strstart(uri, "exec:", &p)) - exec_start_incoming_migration(p); + ret = exec_start_incoming_migration(p); else if (strstart(uri, "unix:", &p)) - unix_start_incoming_migration(p); + ret = unix_start_incoming_migration(p); else if (strstart(uri, "fd:", &p)) - fd_start_incoming_migration(p); + ret = fd_start_incoming_migration(p); #endif - else - fprintf(stderr, "unknown migration protocol: %s\n", uri); + return ret; } int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) diff --git a/migration.h b/migration.h index 385423f..dd423a1 100644 --- a/migration.h +++ b/migration.h @@ -50,7 +50,7 @@ struct FdMigrationState void *opaque; }; -void qemu_start_incoming_migration(const char *uri); +int qemu_start_incoming_migration(const char *uri); int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data); diff --git a/vl.c b/vl.c index d77b47c..3dfab9e 100644 --- a/vl.c +++ b/vl.c @@ -3841,7 +3841,10 @@ int main(int argc, char **argv, char **envp) } if (incoming) { - qemu_start_incoming_migration(incoming); + if (qemu_start_incoming_migration(incoming) < 0) { + fprintf(stderr, "unknown migration protocol: %s\n", incoming); + exit(1); + } } else if (autostart) { vm_start(); }