mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add -incoming defer

Browse Source 
-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 <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2015-02-19 11:40:27 +00:00 committed by Juan Quintela
parent 2dfe7d07e2
commit adde220a93
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
migration/migration.c
View File

@ -49,6 +49,8 @@ enum {
static NotifierList migration_state_notifiers = static NotifierList migration_state_notifiers =
NOTIFIER_LIST_INITIALIZER(migration_state_notifiers); NOTIFIER_LIST_INITIALIZER(migration_state_notifiers);
static bool deferred_incoming;
/* When we add fault tolerance, we could have several /* When we add fault tolerance, we could have several
migrations at once. For now we don't need to add migrations at once. For now we don't need to add
dynamic creation of migration */ dynamic creation of migration */
@ -65,25 +67,40 @@ MigrationState *migrate_get_current(void)
return &current_migration; return &current_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) void qemu_start_incoming_migration(const char *uri, Error **errp)
{ {
const char *p; 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); tcp_start_incoming_migration(p, errp);
#ifdef CONFIG_RDMA #ifdef CONFIG_RDMA
else if (strstart(uri, "rdma:", &p)) } else if (strstart(uri, "rdma:", &p)) {
rdma_start_incoming_migration(p, errp); rdma_start_incoming_migration(p, errp);
#endif #endif
#if !defined(WIN32) #if !defined(WIN32)
else if (strstart(uri, "exec:", &p)) } else if (strstart(uri, "exec:", &p)) {
exec_start_incoming_migration(p, errp); exec_start_incoming_migration(p, errp);
else if (strstart(uri, "unix:", &p)) } else if (strstart(uri, "unix:", &p)) {
unix_start_incoming_migration(p, errp); unix_start_incoming_migration(p, errp);
else if (strstart(uri, "fd:", &p)) } else if (strstart(uri, "fd:", &p)) {
fd_start_incoming_migration(p, errp); fd_start_incoming_migration(p, errp);
#endif #endif
else { } else {
error_setg(errp, "unknown migration protocol: %s", uri); error_setg(errp, "unknown migration protocol: %s", uri);
} }
} }