From a44e5e1acbbc6fa19485ef79b0ba20b25854db0f Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 29 Jun 2010 14:12:41 -0300 Subject: [PATCH 1/2] Exit if incoming migration fails RH-Author: Juan Quintela Message-id: <32f051a478b89639fd10abfbb545cc7d83a4e681.1277820599.git.quintela@redhat.com> Patchwork-id: 10334 O-Subject: [PATCH 1/2] Exit if incoming migration fails Bugzilla: 570174 RH-Acked-by: Amit Shah RH-Acked-by: Luiz Capitulino RH-Acked-by: Jes Sorensen Signed-off-by: Juan Quintela --- migration.c | 16 ++++++++++------ migration.h | 2 +- vl.c | 7 ++++++- 3 files changed, 17 insertions(+), 8 deletions(-) Signed-off-by: Eduardo Habkost --- migration.c | 16 ++++++++++------ migration.h | 2 +- vl.c | 7 ++++++- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/migration.c b/migration.c index 42a5ed7..c44d845 100644 --- a/migration.c +++ b/migration.c @@ -40,22 +40,26 @@ 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; 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 + else { fprintf(stderr, "unknown migration protocol: %s\n", uri); + ret = -EPROTONOSUPPORT; + } + 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 4e98320..c45784b 100644 --- a/vl.c +++ b/vl.c @@ -6353,7 +6353,12 @@ int main(int argc, char **argv, char **envp) } if (incoming) { - qemu_start_incoming_migration(incoming); + int ret = qemu_start_incoming_migration(incoming); + if (ret < 0) { + fprintf(stderr, "Migration failed. Exit code %s(%d), exiting.\n", + incoming, ret); + exit(ret); + } } else if (autostart) { vm_start(); } -- 1.7.0.3