[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/14] migration: ram_control_* are implemented in qe
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 11/14] migration: ram_control_* are implemented in qemu_file |
Date: |
Tue, 13 Jun 2017 11:51:17 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
---
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
--
2.9.4
- [Qemu-devel] [PULL 01/14] migration: isolate return path on src, (continued)
- [Qemu-devel] [PULL 01/14] migration: isolate return path on src, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 03/14] ram: Print block stats also in the complete case, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 04/14] ram: Now POSTCOPY_ACTIVE is the same that STATUS_ACTIVE, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 05/14] migration: Remove MigrationState from migration_channel_incomming(), Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 02/14] migration: Don't try to set *errp directly, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 07/14] migration: Split registration functions from vmstate.h, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 08/14] migration: Move dump_vmsate_json_to_file() to misc.h, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 06/14] migration: Move self_announce_delay() to misc.h, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 09/14] migration: Move constants to savevm.h, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 10/14] migration: Commands are only used inside migration.c, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 11/14] migration: ram_control_* are implemented in qemu_file,
Juan Quintela <=
- [Qemu-devel] [PULL 12/14] migration: create global_state.c, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 13/14] migration: Move remaining exported functions to migration/misc.h, Juan Quintela, 2017/06/13
- [Qemu-devel] [PULL 14/14] migration: Move migration.h to migration/, Juan Quintela, 2017/06/13
- Re: [Qemu-devel] [PULL 00/14] Migration PULL request, Peter Maydell, 2017/06/13