From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOPTE-0007pw-8Y for qemu-devel@nongnu.org; Thu, 19 Feb 2015 06:40:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YOPTD-0003CJ-72 for qemu-devel@nongnu.org; Thu, 19 Feb 2015 06:40:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41266) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOPTC-0003C5-JV for qemu-devel@nongnu.org; Thu, 19 Feb 2015 06:40:38 -0500 From: "Dr. David Alan Gilbert (git)" Date: Thu, 19 Feb 2015 11:40:27 +0000 Message-Id: <1424346029-5410-2-git-send-email-dgilbert@redhat.com> In-Reply-To: <1424346029-5410-1-git-send-email-dgilbert@redhat.com> References: <1424346029-5410-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v3 1/3] Add -incoming defer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: quintela@redhat.com, liang.z.li@intel.com, mjt@tls.msk.ru, amit.shah@redhat.com, pbonzini@redhat.com 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 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")) { + 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); } } -- 2.1.0