After this, nothing outside of migration uses migration.h Signed-off-by: Juan Quintela <quint...@redhat.com> --- include/migration/migration.h | 7 ------- include/migration/misc.h | 8 +++++++- ui/spice-core.c | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/include/migration/migration.h b/include/migration/migration.h index 1e18b24..735f565 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -133,17 +133,10 @@ void migrate_fd_error(MigrationState *s, const Error *error); void migrate_fd_connect(MigrationState *s); -void add_migration_state_change_notifier(Notifier *notify); -void remove_migration_state_change_notifier(Notifier *notify); MigrationState *migrate_init(void); bool migration_is_blocked(Error **errp); -bool migration_in_setup(MigrationState *); -bool migration_has_finished(MigrationState *); -bool migration_has_failed(MigrationState *); /* True if outgoing migration has entered postcopy phase */ bool migration_in_postcopy(void); -/* ...and after the device transmission */ -bool migration_in_postcopy_after_devices(MigrationState *); MigrationState *migrate_get_current(void); bool migrate_release_ram(void); diff --git a/include/migration/misc.h b/include/migration/misc.h index 6709b15..28f69be 100644 --- a/include/migration/misc.h +++ b/include/migration/misc.h @@ -41,5 +41,11 @@ void savevm_skip_configuration(void); /* migration/migration.c */ void qemu_start_incoming_migration(const char *uri, Error **errp); bool migration_is_idle(void); - +void add_migration_state_change_notifier(Notifier *notify); +void remove_migration_state_change_notifier(Notifier *notify); +bool migration_in_setup(MigrationState *); +bool migration_has_finished(MigrationState *); +bool migration_has_failed(MigrationState *); +/* ...and after the device transmission */ +bool migration_in_postcopy_after_devices(MigrationState *); #endif diff --git a/ui/spice-core.c b/ui/spice-core.c index 804abc5..a087ad5 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -35,7 +35,7 @@ #include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" #include "qemu/notify.h" -#include "migration/migration.h" +#include "migration/misc.h" #include "hw/hw.h" #include "ui/spice-display.h" #include "qapi-event.h" -- 2.9.3
