@@ -53,7 +53,7 @@
#include "hw/xen/xen_pt.h"
#endif
#include "migration/global_state.h"
-#include "migration/migration.h"
+#include "migration/misc.h"
#include "kvm_i386.h"
#define MAX_IDE_BUS 2
@@ -38,7 +38,7 @@
#include "sysemu/cpus.h"
#include "sysemu/hw_accel.h"
#include "kvm_ppc.h"
-#include "migration/migration.h"
+#include "migration/misc.h"
#include "migration/global_state.h"
#include "migration/register.h"
#include "mmu-hash64.h"
@@ -127,8 +127,6 @@ void migrate_set_state(int *state, int old_state, int new_state);
void migration_fd_process_incoming(QEMUFile *f);
-void qemu_start_incoming_migration(const char *uri, Error **errp);
-
uint64_t migrate_max_downtime(void);
void migrate_fd_error(MigrationState *s, const Error *error);
@@ -140,7 +138,6 @@ 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_is_idle(void);
bool migration_has_finished(MigrationState *);
bool migration_has_failed(MigrationState *);
/* True if outgoing migration has entered postcopy phase */
@@ -176,7 +173,4 @@ void migrate_send_rp_pong(MigrationIncomingState *mis,
void migrate_send_rp_req_pages(MigrationIncomingState *mis, const char* rbname,
ram_addr_t start, size_t len);
-void savevm_skip_section_footers(void);
-void savevm_skip_configuration(void);
-
#endif
@@ -35,5 +35,11 @@ int64_t self_announce_delay(int round)
/* migration/savevm.c */
void dump_vmstate_json_to_file(FILE *out_fp);
+void savevm_skip_section_footers(void);
+void savevm_skip_configuration(void);
+
+/* migration/migration.c */
+void qemu_start_incoming_migration(const char *uri, Error **errp);
+bool migration_is_idle(void);
#endif
@@ -24,6 +24,7 @@
#include "ram.h"
#include "rdma.h"
#include "migration/global_state.h"
+#include "migration/misc.h"
#include "migration/migration.h"
#include "savevm.h"
#include "qemu-file-channel.h"
@@ -29,7 +29,7 @@
#include "qemu/error-report.h"
#include "qemu/help_option.h"
#include "sysemu/block-backend.h"
-#include "migration/migration.h"
+#include "migration/misc.h"
/*
* Aliases were a bad idea from the start. Let's keep them
@@ -92,7 +92,6 @@ int main(int argc, char **argv)
#include "sysemu/tpm.h"
#include "sysemu/dma.h"
#include "audio/audio.h"
-#include "migration/migration.h"
#include "sysemu/cpus.h"
#include "migration/colo.h"
#include "sysemu/kvm.h"
@@ -13,7 +13,7 @@
#include "qmp-commands.h"
#include "sysemu/char.h"
#include "sysemu/accel.h"
-#include "migration/migration.h"
+#include "migration/misc.h"
#include "migration/global_state.h"
//#define DEBUG_XEN
Signed-off-by: Juan Quintela <quintela@redhat.com> --- hw/i386/pc_piix.c | 2 +- hw/ppc/spapr.c | 2 +- include/migration/migration.h | 6 ------ include/migration/misc.h | 6 ++++++ migration/migration.c | 1 + qdev-monitor.c | 2 +- vl.c | 1 - xen-common.c | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-)