* Juan Quintela (quint...@redhat.com) wrote:
> Signed-off-by: Juan Quintela <quint...@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> ---
> migration/migration.c | 38 +++++++++++++++++---------------------
> migration/savevm.c | 3 ++-
> 2 files changed, 19 insertions(+), 22 deletions(-)
>
> diff --git a/migration/migration.c b/migration/migration.c
> index 991313a..314c5c0 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -100,32 +100,28 @@ MigrationState *migrate_get_current(void)
> return ¤t_migration;
> }
>
> -/* For incoming */
> -static MigrationIncomingState *mis_current;
> -
> MigrationIncomingState *migration_incoming_get_current(void)
> {
> - return mis_current;
> -}
> + static bool once;
> + static MigrationIncomingState mis_current;
>
> -MigrationIncomingState *migration_incoming_state_new(QEMUFile* f)
> -{
> - mis_current = g_new0(MigrationIncomingState, 1);
> - mis_current->from_src_file = f;
> - mis_current->state = MIGRATION_STATUS_NONE;
> - QLIST_INIT(&mis_current->loadvm_handlers);
> - qemu_mutex_init(&mis_current->rp_mutex);
> - qemu_event_init(&mis_current->main_thread_load_event, false);
> -
> - return mis_current;
> + if (!once) {
> + mis_current.state = MIGRATION_STATUS_NONE;
> + memset(&mis_current, 0, sizeof(MigrationIncomingState));
> + QLIST_INIT(&mis_current.loadvm_handlers);
> + qemu_mutex_init(&mis_current.rp_mutex);
> + qemu_event_init(&mis_current.main_thread_load_event, false);
> + once = true;
> + }
> + return &mis_current;
> }
>
> void migration_incoming_state_destroy(void)
> {
> - qemu_event_destroy(&mis_current->main_thread_load_event);
> - loadvm_free_handlers(mis_current);
> - g_free(mis_current);
> - mis_current = NULL;
> + struct MigrationIncomingState *mis = migration_incoming_get_current();
> +
> + qemu_event_destroy(&mis->main_thread_load_event);
> + loadvm_free_handlers(mis);
> }
>
>
> @@ -373,11 +369,11 @@ static void process_incoming_migration_bh(void *opaque)
> static void process_incoming_migration_co(void *opaque)
> {
> QEMUFile *f = opaque;
> - MigrationIncomingState *mis;
> + MigrationIncomingState *mis = migration_incoming_get_current();
> PostcopyState ps;
> int ret;
>
> - mis = migration_incoming_state_new(f);
> + mis->from_src_file = f;
> postcopy_state_set(POSTCOPY_INCOMING_NONE);
> migrate_set_state(&mis->state, MIGRATION_STATUS_NONE,
> MIGRATION_STATUS_ACTIVE);
> diff --git a/migration/savevm.c b/migration/savevm.c
> index 16ba443..49137a1 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -2091,6 +2091,7 @@ int load_vmstate(const char *name)
> QEMUFile *f;
> int ret;
> AioContext *aio_context;
> + MigrationIncomingState *mis = migration_incoming_get_current();
>
> if (!bdrv_all_can_snapshot(&bs)) {
> error_report("Device '%s' is writable but does not support
> snapshots.",
> @@ -2141,7 +2142,7 @@ int load_vmstate(const char *name)
> }
>
> qemu_system_reset(VMRESET_SILENT);
> - migration_incoming_state_new(f);
> + mis->from_src_file = f;
>
> aio_context_acquire(aio_context);
> ret = qemu_loadvm_state(f);
> --
> 2.5.5
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
