From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLDUa-0000VI-4i for qemu-devel@nongnu.org; Tue, 10 Feb 2015 11:16:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLDUT-0001Tm-Vm for qemu-devel@nongnu.org; Tue, 10 Feb 2015 11:16:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48736) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLDUT-0001Td-Mv for qemu-devel@nongnu.org; Tue, 10 Feb 2015 11:16:45 -0500 From: "Dr. David Alan Gilbert (git)" Date: Tue, 10 Feb 2015 16:16:37 +0000 Message-Id: <1423584999-13946-2-git-send-email-dgilbert@redhat.com> In-Reply-To: <1423584999-13946-1-git-send-email-dgilbert@redhat.com> References: <1423584999-13946-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH 1/3] Add -incoming pause 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, amit.shah@redhat.com, pbonzini@redhat.com From: "Dr. David Alan Gilbert" -incoming pause causes qemu to wait for an incoming migration to be specified later. The monitor can be used to set migraiton capabilities that may affect the incoming connection process. Signed-off-by: Dr. David Alan Gilbert --- migration/migration.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index b3adbc6..77263a5 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 paused_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 pause: uri. + * The migration can be started later after any parameters have been + * changed. + */ +static void paused_incoming_migration(Error **errp) +{ + if (paused_incoming) { + error_setg(errp, "Pausing an already paused incoming migration"); + } + paused_incoming = true; +} + void qemu_start_incoming_migration(const char *uri, Error **errp) { const char *p; - if (strstart(uri, "tcp:", &p)) + if (!strcmp(uri, "pause")) { + paused_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