diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-01-22 13:20:14 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-01-23 10:08:05 +0000 |
| commit | ee86981bda9ecd40c8daf81b7307b1d2aff68174 (patch) | |
| tree | e4a3a109a9c40705cdc42035aa8db9c64a9e005c /migration/migration.h | |
| parent | ee264eb32c14f076c964fc34ee66f6f95cce2080 (diff) | |
| download | qemu-ee86981bda9ecd40c8daf81b7307b1d2aff68174.tar.gz | |
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 <peter.maydell@linaro.org>
Diffstat (limited to 'migration/migration.h')
| -rw-r--r-- | migration/migration.h | 13 |
1 files changed, 0 insertions, 13 deletions
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, |