From 7be4363a2828021fd486f7f45e792aecaf909454 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 11 May 2010 15:18:38 +0200 Subject: [PATCH] migration: Make *start_outgoing_migration return FdMigrationState Signed-off-by: Juan Quintela Reviewed-by: Anthony Liguori --- migration-exec.c | 4 ++-- migration-fd.c | 4 ++-- migration-tcp.c | 4 ++-- migration-unix.c | 4 ++-- migration.c | 4 ++-- migration.h | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/migration-exec.c b/migration-exec.c index 2cfb6f232..759aa7999 100644 --- a/migration-exec.c +++ b/migration-exec.c @@ -61,7 +61,7 @@ static int exec_close(FdMigrationState *s) return ret; } -MigrationState *exec_start_outgoing_migration(Monitor *mon, +FdMigrationState *exec_start_outgoing_migration(Monitor *mon, const char *command, int64_t bandwidth_limit, int detach, @@ -108,7 +108,7 @@ MigrationState *exec_start_outgoing_migration(Monitor *mon, } migrate_fd_connect(s); - return &s->mig_state; + return s; err_after_open: pclose(f); diff --git a/migration-fd.c b/migration-fd.c index aee690aae..8036a27d2 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); diff --git a/migration-tcp.c b/migration-tcp.c index c431e03a4..05a121f1d 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -75,7 +75,7 @@ static void tcp_wait_for_connect(void *opaque) } } -MigrationState *tcp_start_outgoing_migration(Monitor *mon, +FdMigrationState *tcp_start_outgoing_migration(Monitor *mon, const char *host_port, int64_t bandwidth_limit, int detach, @@ -131,7 +131,7 @@ MigrationState *tcp_start_outgoing_migration(Monitor *mon, } else if (ret >= 0) migrate_fd_connect(s); - return &s->mig_state; + return s; } static void tcp_accept_incoming_migration(void *opaque) diff --git a/migration-unix.c b/migration-unix.c index 6dc985d42..0eeedde9b 100644 --- a/migration-unix.c +++ b/migration-unix.c @@ -74,7 +74,7 @@ static void unix_wait_for_connect(void *opaque) } } -MigrationState *unix_start_outgoing_migration(Monitor *mon, +FdMigrationState *unix_start_outgoing_migration(Monitor *mon, const char *path, int64_t bandwidth_limit, int detach, @@ -132,7 +132,7 @@ MigrationState *unix_start_outgoing_migration(Monitor *mon, if (ret >= 0) migrate_fd_connect(s); - return &s->mig_state; + return s; err_after_open: close(s->fd); diff --git a/migration.c b/migration.c index c233b522f..1d0c76064 100644 --- a/migration.c +++ b/migration.c @@ -79,7 +79,7 @@ void process_incoming_migration(QEMUFile *f) int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) { - MigrationState *s = NULL; + FdMigrationState *s = NULL; const char *p; int detach = qdict_get_try_bool(qdict, "detach", 0); int blk = qdict_get_try_bool(qdict, "blk", 0); @@ -124,7 +124,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) current_migration->release(current_migration); } - current_migration = s; + current_migration = &s->mig_state; notifier_list_notify(&migration_state_notifiers, NULL); return 0; } diff --git a/migration.h b/migration.h index 050c56c5a..58354c744 100644 --- a/migration.h +++ b/migration.h @@ -72,7 +72,7 @@ void do_info_migrate(Monitor *mon, QObject **ret_data); int exec_start_incoming_migration(const char *host_port); -MigrationState *exec_start_outgoing_migration(Monitor *mon, +FdMigrationState *exec_start_outgoing_migration(Monitor *mon, const char *host_port, int64_t bandwidth_limit, int detach, @@ -81,7 +81,7 @@ MigrationState *exec_start_outgoing_migration(Monitor *mon, int tcp_start_incoming_migration(const char *host_port); -MigrationState *tcp_start_outgoing_migration(Monitor *mon, +FdMigrationState *tcp_start_outgoing_migration(Monitor *mon, const char *host_port, int64_t bandwidth_limit, int detach, @@ -90,7 +90,7 @@ MigrationState *tcp_start_outgoing_migration(Monitor *mon, int unix_start_incoming_migration(const char *path); -MigrationState *unix_start_outgoing_migration(Monitor *mon, +FdMigrationState *unix_start_outgoing_migration(Monitor *mon, const char *path, int64_t bandwidth_limit, int detach, @@ -99,7 +99,7 @@ MigrationState *unix_start_outgoing_migration(Monitor *mon, int fd_start_incoming_migration(const char *path); -MigrationState *fd_start_outgoing_migration(Monitor *mon, +FdMigrationState *fd_start_outgoing_migration(Monitor *mon, const char *fdname, int64_t bandwidth_limit, int detach, -- 2.39.2