On 01/06/2017 23:29, Juan Quintela wrote: > Signed-off-by: Juan Quintela <quint...@redhat.com>
Reviewed-by: Laurent Vivier <lviv...@redhat.com> > --- > include/migration/migration.h | 18 ------------------ > migration/qemu-file.h | 17 +++++++++++++++++ > 2 files changed, 17 insertions(+), 18 deletions(-) > > diff --git a/include/migration/migration.h b/include/migration/migration.h > index 108212c..cb894b8 100644 > --- a/include/migration/migration.h > +++ b/include/migration/migration.h > @@ -171,24 +171,6 @@ 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 ram_control_before_iterate(QEMUFile *f, uint64_t flags); > -void ram_control_after_iterate(QEMUFile *f, uint64_t flags); > -void ram_control_load_hook(QEMUFile *f, uint64_t flags, void *data); > - > -/* Whenever this is found in the data stream, the flags > - * will be passed to ram_control_load_hook in the incoming-migration > - * side. This lets before_ram_iterate/after_ram_iterate add > - * transport-specific sections to the RAM migration data. > - */ > -#define RAM_SAVE_FLAG_HOOK 0x80 > - > -#define RAM_SAVE_CONTROL_NOT_SUPP -1000 > -#define RAM_SAVE_CONTROL_DELAYED -2000 > - > -size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset, > - ram_addr_t offset, size_t size, > - uint64_t *bytes_sent); > - > void savevm_skip_section_footers(void); > void register_global_state(void); > void global_state_set_optional(void); > diff --git a/migration/qemu-file.h b/migration/qemu-file.h > index 49fd697..aae4e5e 100644 > --- a/migration/qemu-file.h > +++ b/migration/qemu-file.h > @@ -156,5 +156,22 @@ void qemu_file_set_blocking(QEMUFile *f, bool block); > > size_t qemu_get_counted_string(QEMUFile *f, char buf[256]); > > +void ram_control_before_iterate(QEMUFile *f, uint64_t flags); > +void ram_control_after_iterate(QEMUFile *f, uint64_t flags); > +void ram_control_load_hook(QEMUFile *f, uint64_t flags, void *data); > + > +/* Whenever this is found in the data stream, the flags > + * will be passed to ram_control_load_hook in the incoming-migration > + * side. This lets before_ram_iterate/after_ram_iterate add > + * transport-specific sections to the RAM migration data. > + */ > +#define RAM_SAVE_FLAG_HOOK 0x80 > + > +#define RAM_SAVE_CONTROL_NOT_SUPP -1000 > +#define RAM_SAVE_CONTROL_DELAYED -2000 > + > +size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset, > + ram_addr_t offset, size_t size, > + uint64_t *bytes_sent); > > #endif >