migration: move migrate_new to do_migrate

Once there, remove all parameters that don't need to be passed to
*start_outgoing_migration() functions

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2010-05-11 22:27:45 +02:00
parent 8b6b99b356
commit 07af445291
6 changed files with 46 additions and 100 deletions

View file

@ -50,21 +50,12 @@ static int fd_close(MigrationState *s)
return 0;
}
MigrationState *fd_start_outgoing_migration(Monitor *mon,
const char *fdname,
int64_t bandwidth_limit,
int detach,
int blk,
int inc)
int fd_start_outgoing_migration(MigrationState *s, const char *fdname)
{
MigrationState *s;
s = migrate_new(mon, bandwidth_limit, detach, blk, inc);
s->fd = monitor_get_fd(mon, fdname);
s->fd = monitor_get_fd(s->mon, fdname);
if (s->fd == -1) {
DPRINTF("fd_migration: invalid file descriptor identifier\n");
goto err_after_alloc;
goto err_after_get_fd;
}
if (fcntl(s->fd, F_SETFL, O_NONBLOCK) == -1) {
@ -77,13 +68,12 @@ MigrationState *fd_start_outgoing_migration(Monitor *mon,
s->close = fd_close;
migrate_fd_connect(s);
return s;
return 0;
err_after_open:
close(s->fd);
err_after_alloc:
g_free(s);
return NULL;
err_after_get_fd:
return -1;
}
static void fd_accept_incoming_migration(void *opaque)