Received: from eggs.gnu.org ([2001:4830:134:3::10]:34730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOiSN-00052h-4E for qemu-devel@nongnu.org; Fri, 20 Feb 2015 02:57:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YOiSH-0007v2-WE for qemu-devel@nongnu.org; Fri, 20 Feb 2015 02:57:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36624) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOiSH-0007uy-OS for qemu-devel@nongnu.org; Fri, 20 Feb 2015 02:56:57 -0500 From: Markus Armbruster References: <1424346029-5410-1-git-send-email-dgilbert@redhat.com> <1424346029-5410-2-git-send-email-dgilbert@redhat.com> Date: Fri, 20 Feb 2015 08:56:51 +0100 In-Reply-To: <1424346029-5410-2-git-send-email-dgilbert@redhat.com> (David Alan Gilbert's message of "Thu, 19 Feb 2015 11:40:27 +0000") Message-ID: <87wq3d9fss.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH v3 1/3] Add -incoming defer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert (git)" Cc: quintela@redhat.com, liang.z.li@intel.com, mjt@tls.msk.ru, qemu-devel@nongnu.org, amit.shah@redhat.com, pbonzini@redhat.com "Dr. David Alan Gilbert (git)" writes: > From: "Dr. David Alan Gilbert" > > -incoming defer causes qemu to wait for an incoming migration > to be specified later. The monitor can be used to set migration > capabilities that may affect the incoming connection process. > > Signed-off-by: Dr. David Alan Gilbert > Reviewed-by: Juan Quintela > --- > migration/migration.c | 29 +++++++++++++++++++++++------ > 1 file changed, 23 insertions(+), 6 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index b3adbc6..f3d49d5 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -49,6 +49,8 @@ enum { > static NotifierList migration_state_notifiers = > NOTIFIER_LIST_INITIALIZER(migration_state_notifiers); > > +static bool deferred_incoming; > + > /* When we add fault tolerance, we could have several > migrations at once. For now we don't need to add > dynamic creation of migration */ > @@ -65,25 +67,40 @@ MigrationState *migrate_get_current(void) > return ¤t_migration; > } > > +/* > + * Called on -incoming with a defer: uri. The colon in "defer:" is inaccurate, because... > + * The migration can be started later after any parameters have been > + * changed. > + */ > +static void deferred_incoming_migration(Error **errp) > +{ > + if (deferred_incoming) { > + error_setg(errp, "Incoming migration already deferred"); > + } > + deferred_incoming = true; > +} > + > void qemu_start_incoming_migration(const char *uri, Error **errp) > { > const char *p; > > - if (strstart(uri, "tcp:", &p)) > + if (!strcmp(uri, "defer")) { ... you recognize exactly "defer" here. Which makes it not an URI. > + deferred_incoming_migration(errp); > + } else if (strstart(uri, "tcp:", &p)) { > tcp_start_incoming_migration(p, errp); > #ifdef CONFIG_RDMA > - else if (strstart(uri, "rdma:", &p)) > + } else if (strstart(uri, "rdma:", &p)) { > rdma_start_incoming_migration(p, errp); > #endif > #if !defined(WIN32) > - else if (strstart(uri, "exec:", &p)) > + } else if (strstart(uri, "exec:", &p)) { > exec_start_incoming_migration(p, errp); > - else if (strstart(uri, "unix:", &p)) > + } else if (strstart(uri, "unix:", &p)) { > unix_start_incoming_migration(p, errp); > - else if (strstart(uri, "fd:", &p)) > + } else if (strstart(uri, "fd:", &p)) { > fd_start_incoming_migration(p, errp); > #endif > - else { > + } else { > error_setg(errp, "unknown migration protocol: %s", uri); > } > } How did you test the new error? I tried, but ran into this preexisting bug: $ qemu-system-x86_64 -nodefaults -S -display none -incoming defer -incoming defer ERROR: invalid runstate transition: 'inmigrate' -> 'inmigrate' Aborted (core dumped) In my opinion, multiple -incoming should behave like command line options usually do: last one wins silently.