From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=41989 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGyS5-0003J1-60 for qemu-devel@nongnu.org; Tue, 25 May 2010 14:02:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OGyS3-0006b9-Of for qemu-devel@nongnu.org; Tue, 25 May 2010 14:02:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31771) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGyS3-0006aR-HW for qemu-devel@nongnu.org; Tue, 25 May 2010 14:02:03 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4PI21a7025754 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 25 May 2010 14:02:01 -0400 Date: Tue, 25 May 2010 15:01:57 -0300 From: Luiz Capitulino Subject: Re: [Qemu-devel] [PATCH 1/5] Exit if incoming migration fails Message-ID: <20100525150157.6c8d1599@redhat.com> In-Reply-To: <889abbffe3359f5160234e580cb663ec6189174e.1274796992.git.quintela@redhat.com> References: <889abbffe3359f5160234e580cb663ec6189174e.1274796992.git.quintela@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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 Tue, 25 May 2010 16:21:01 +0200 Juan Quintela wrote: > Signed-off-by: Juan Quintela > --- > 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 05f6cc5..9c1d4b6 100644 > --- a/migration.c > +++ b/migration.c > @@ -36,22 +36,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 328395e..d13440d 100644 > --- a/vl.c > +++ b/vl.c > @@ -3823,7 +3823,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); While I agree on the change, I have two comments: 1. By taking a look at the code I have the impression that most of the fun failures will happen on the handler passed to qemu_set_fd_handler2(), do you agree? Any plan to address that? 1. Is exit()ing the best thing to be done? I understand it's the easiest and maybe better than nothing, but wouldn't it be better to enter in paused-forever state so that clients can query and decide what to do? > + } > } else if (autostart) { > vm_start(); > }