diff options
| author | Juan Quintela <quintela@redhat.com> | 2017-04-24 18:24:28 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-06-13 11:00:45 +0200 |
| commit | 2ce3bf1aa97abb20af3a90131745c9b68e04bedd (patch) | |
| tree | e57e5bfa6d945db578f53ee1501a5131532b2dfd | |
| parent | da6f17903f0cda719d8a14263bcea49dde5193b5 (diff) | |
| download | qemu-2ce3bf1aa97abb20af3a90131745c9b68e04bedd.zip qemu-2ce3bf1aa97abb20af3a90131745c9b68e04bedd.tar.gz qemu-2ce3bf1aa97abb20af3a90131745c9b68e04bedd.tar.bz2 | |
migration: ram_control_* are implemented in qemu_file
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
| -rw-r--r-- | include/migration/migration.h | 18 | ||||
| -rw-r--r-- | 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 |