aboutsummaryrefslogtreecommitdiff
path: root/migration
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2017-05-24 09:25:50 +0200
committerJuan Quintela <quintela@redhat.com>2017-06-01 18:31:13 +0200
commitc2355ad47d60d04efb640de57cd719cb24ebe563 (patch)
treee35bfc2bd6d6713e4ba772a8db35496045e73fa4 /migration
parent0f42f65781fd784d91730a1366bffcbb9ff47d98 (diff)
migration: loadvm handlers are not used
So we remove all traces of them. Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Laurent Vivier <lvivier@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration')
-rw-r--r--migration/migration.c2
-rw-r--r--migration/savevm.c26
2 files changed, 0 insertions, 28 deletions
diff --git a/migration/migration.c b/migration/migration.c
index 7087d1abbb..c3218cd4b6 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -122,7 +122,6 @@ MigrationIncomingState *migration_incoming_get_current(void)
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;
@@ -135,7 +134,6 @@ void migration_incoming_state_destroy(void)
struct MigrationIncomingState *mis = migration_incoming_get_current();
qemu_event_destroy(&mis->main_thread_load_event);
- loadvm_free_handlers(mis);
}
diff --git a/migration/savevm.c b/migration/savevm.c
index 07646f4720..d96209b3cb 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1804,13 +1804,6 @@ static int loadvm_process_command(QEMUFile *f)
return 0;
}
-struct LoadStateEntry {
- QLIST_ENTRY(LoadStateEntry) entry;
- SaveStateEntry *se;
- int section_id;
- int version_id;
-};
-
/*
* Read a footer off the wire and check that it matches the expected section
*
@@ -1846,22 +1839,11 @@ static bool check_section_footer(QEMUFile *f, SaveStateEntry *se)
return true;
}
-void loadvm_free_handlers(MigrationIncomingState *mis)
-{
- LoadStateEntry *le, *new_le;
-
- QLIST_FOREACH_SAFE(le, &mis->loadvm_handlers, entry, new_le) {
- QLIST_REMOVE(le, entry);
- g_free(le);
- }
-}
-
static int
qemu_loadvm_section_start_full(QEMUFile *f, MigrationIncomingState *mis)
{
uint32_t instance_id, version_id, section_id;
SaveStateEntry *se;
- LoadStateEntry *le;
char idstr[256];
int ret;
@@ -1900,14 +1882,6 @@ qemu_loadvm_section_start_full(QEMUFile *f, MigrationIncomingState *mis)
return -EINVAL;
}
- /* Add entry */
- le = g_malloc0(sizeof(*le));
-
- le->se = se;
- le->section_id = section_id;
- le->version_id = version_id;
- QLIST_INSERT_HEAD(&mis->loadvm_handlers, le, entry);
-
ret = vmstate_load(f, se, se->load_version_id);
if (ret < 0) {
error_report("error while loading state for instance 0x%x of"