From 7be4363a2828021fd486f7f45e792aecaf909454 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 11 May 2010 15:18:38 +0200 Subject: migration: Make *start_outgoing_migration return FdMigrationState Signed-off-by: Juan Quintela Reviewed-by: Anthony Liguori --- migration-fd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'migration-fd.c') diff --git a/migration-fd.c b/migration-fd.c index aee690a..8036a27 100644 --- a/migration-fd.c +++ b/migration-fd.c @@ -50,7 +50,7 @@ static int fd_close(FdMigrationState *s) return 0; } -MigrationState *fd_start_outgoing_migration(Monitor *mon, +FdMigrationState *fd_start_outgoing_migration(Monitor *mon, const char *fdname, int64_t bandwidth_limit, int detach, @@ -91,7 +91,7 @@ MigrationState *fd_start_outgoing_migration(Monitor *mon, } migrate_fd_connect(s); - return &s->mig_state; + return s; err_after_open: close(s->fd); -- cgit v1.1 From 3f77fc557e3e1cb8aab72ca0ca91aac67d478118 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 11 May 2010 15:51:36 +0200 Subject: migration: Fold MigrationState into FdMigrationState Signed-off-by: Juan Quintela Reviewed-by: Anthony Liguori --- migration-fd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'migration-fd.c') diff --git a/migration-fd.c b/migration-fd.c index 8036a27..c3c7b0e 100644 --- a/migration-fd.c +++ b/migration-fd.c @@ -75,12 +75,12 @@ FdMigrationState *fd_start_outgoing_migration(Monitor *mon, s->get_error = fd_errno; s->write = fd_write; s->close = fd_close; - s->mig_state.cancel = migrate_fd_cancel; - s->mig_state.get_status = migrate_fd_get_status; - s->mig_state.release = migrate_fd_release; + s->cancel = migrate_fd_cancel; + s->get_status = migrate_fd_get_status; + s->release = migrate_fd_release; - s->mig_state.blk = blk; - s->mig_state.shared = inc; + s->blk = blk; + s->shared = inc; s->state = MIG_STATE_ACTIVE; s->mon = NULL; -- cgit v1.1 From 22f00a4445fac68b10d1cb669836eeb8d32af56d Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 11 May 2010 15:56:35 +0200 Subject: migration: Rename FdMigrationState MigrationState Signed-off-by: Juan Quintela Reviewed-by: Anthony Liguori --- migration-fd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'migration-fd.c') diff --git a/migration-fd.c b/migration-fd.c index c3c7b0e..e78fd4e 100644 --- a/migration-fd.c +++ b/migration-fd.c @@ -30,17 +30,17 @@ do { } while (0) #endif -static int fd_errno(FdMigrationState *s) +static int fd_errno(MigrationState *s) { return errno; } -static int fd_write(FdMigrationState *s, const void * buf, size_t size) +static int fd_write(MigrationState *s, const void * buf, size_t size) { return write(s->fd, buf, size); } -static int fd_close(FdMigrationState *s) +static int fd_close(MigrationState *s) { DPRINTF("fd_close\n"); if (s->fd != -1) { @@ -50,14 +50,14 @@ static int fd_close(FdMigrationState *s) return 0; } -FdMigrationState *fd_start_outgoing_migration(Monitor *mon, +MigrationState *fd_start_outgoing_migration(Monitor *mon, const char *fdname, int64_t bandwidth_limit, int detach, int blk, int inc) { - FdMigrationState *s; + MigrationState *s; s = g_malloc0(sizeof(*s)); -- cgit v1.1 From 0edda1c42aa49dd3207f3c76bf25fd53ac16345d Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 11 May 2010 16:28:39 +0200 Subject: migration: Refactor MigrationState creation Signed-off-by: Juan Quintela Reviewed-by: Anthony Liguori --- migration-fd.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'migration-fd.c') diff --git a/migration-fd.c b/migration-fd.c index e78fd4e..9d3ca42 100644 --- a/migration-fd.c +++ b/migration-fd.c @@ -59,7 +59,7 @@ MigrationState *fd_start_outgoing_migration(Monitor *mon, { MigrationState *s; - s = g_malloc0(sizeof(*s)); + s = migrate_new(mon, bandwidth_limit, detach, blk, inc); s->fd = monitor_get_fd(mon, fdname); if (s->fd == -1) { @@ -75,20 +75,6 @@ MigrationState *fd_start_outgoing_migration(Monitor *mon, s->get_error = fd_errno; s->write = fd_write; s->close = fd_close; - s->cancel = migrate_fd_cancel; - s->get_status = migrate_fd_get_status; - s->release = migrate_fd_release; - - s->blk = blk; - s->shared = inc; - - s->state = MIG_STATE_ACTIVE; - s->mon = NULL; - s->bandwidth_limit = bandwidth_limit; - - if (!detach) { - migrate_fd_monitor_suspend(s, mon); - } migrate_fd_connect(s); return s; -- cgit v1.1 From 07af4452919fddc6dca6462828b457aad62f6387 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 11 May 2010 22:27:45 +0200 Subject: 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 Reviewed-by: Anthony Liguori --- migration-fd.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'migration-fd.c') diff --git a/migration-fd.c b/migration-fd.c index 9d3ca42..d0aec89 100644 --- a/migration-fd.c +++ b/migration-fd.c @@ -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) -- cgit v1.1