From ee86981bda9ecd40c8daf81b7307b1d2aff68174 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Mon, 22 Jan 2018 13:20:14 +0000 Subject: migration: Revert postcopy-blocktime commit set This reverts commits ca6011c migration: add postcopy total blocktime into query-migrate 5f32dc8 migration: add blocktime calculation into migration-test 2f7dae9 migration: postcopy_blocktime documentation 3be98be migration: calculate vCPU blocktime on dst side 01a87f0 migration: add postcopy blocktime ctx into MigrationIncomingState 31bf06a migration: introduce postcopy-blocktime capability as they don't build on ppc32 due to trying to do atomic accesses on types that are larger than the host pointer type. Signed-off-by: Peter Maydell --- migration/migration.h | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'migration/migration.h') diff --git a/migration/migration.h b/migration/migration.h index f2bc1aaf85..786d971ce2 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -22,8 +22,6 @@ #include "hw/qdev.h" #include "io/channel.h" -struct PostcopyBlocktimeContext; - /* State for the incoming migration */ struct MigrationIncomingState { QEMUFile *from_src_file; @@ -61,20 +59,10 @@ struct MigrationIncomingState { /* The coroutine we should enter (back) after failover */ Coroutine *migration_incoming_co; QemuSemaphore colo_incoming_sem; - - /* - * PostcopyBlocktimeContext to keep information for postcopy - * live migration, to calculate vCPU block time - * */ - struct PostcopyBlocktimeContext *blocktime_ctx; }; MigrationIncomingState *migration_incoming_get_current(void); void migration_incoming_state_destroy(void); -/* - * Functions to work with blocktime context - */ -void fill_destination_postcopy_migration_info(MigrationInfo *info); #define TYPE_MIGRATION "migration" @@ -235,7 +223,6 @@ int migrate_compress_level(void); int migrate_compress_threads(void); int migrate_decompress_threads(void); bool migrate_use_events(void); -bool migrate_postcopy_blocktime(void); /* Sending on the return path - generic and then for each message type */ void migrate_send_rp_shut(MigrationIncomingState *mis, -- cgit v1.2.1