From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=34778 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGWI7-0001te-VR for qemu-devel@nongnu.org; Mon, 24 May 2010 07:57:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OGWI5-00006o-Vq for qemu-devel@nongnu.org; Mon, 24 May 2010 07:57:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28932) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGWI5-00006e-Hy for qemu-devel@nongnu.org; Mon, 24 May 2010 07:57:53 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4OBvqKl015747 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 24 May 2010 07:57:52 -0400 Date: Mon, 24 May 2010 14:53:42 +0300 From: "Michael S. Tsirkin" Message-ID: <20100524115342.GA2089@redhat.com> References: <9fed8fc8d5a596bd8fdf125ffadc8f55dc39eb2b.1274688090.git.quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <9fed8fc8d5a596bd8fdf125ffadc8f55dc39eb2b.1274688090.git.quintela@redhat.com> Subject: [Qemu-devel] Re: [PATCH 1/5] Exit if incoming migration fails List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org On Mon, May 24, 2010 at 10:25:25AM +0200, Juan Quintela wrote: > 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); I think we need this message, this is where we know reason for failure is bad protocol. > + 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); > + } Let's put here: 'Migration failed. Exit code %s(%d), exiting.\n' and then exit(ret); > } else if (autostart) { > vm_start(); > } > -- > 1.6.6.1 >