[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 27/41] migration: Move self_announce_delay() to misc
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 27/41] migration: Move self_announce_delay() to misc.h |
Date: |
Wed, 26 Apr 2017 00:04:37 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/net/virtio-net.c | 1 +
include/migration/misc.h | 10 ++++++++++
include/migration/vmstate.h | 10 ----------
migration/savevm.c | 1 +
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 7d091c9..2259156 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -25,6 +25,7 @@
#include "qapi/qmp/qjson.h"
#include "qapi-event.h"
#include "hw/virtio/virtio-access.h"
+#include "migration/misc.h"
#define VIRTIO_NET_VM_VERSION 11
diff --git a/include/migration/misc.h b/include/migration/misc.h
index 9e64c16..45ef9c9 100644
--- a/include/migration/misc.h
+++ b/include/migration/misc.h
@@ -22,4 +22,14 @@ void ram_mig_init(void);
void blk_mig_init(void);
+#define SELF_ANNOUNCE_ROUNDS 5
+
+static inline
+int64_t self_announce_delay(int round)
+{
+ assert(round < SELF_ANNOUNCE_ROUNDS && round > 0);
+ /* delay 50ms, 150ms, 250ms, ... */
+ return 50 + (SELF_ANNOUNCE_ROUNDS - round - 1) * 100;
+}
+
#endif
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index e9f5bc8..655558d 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -1000,8 +1000,6 @@ extern const VMStateInfo vmstate_info_qtailq;
#define VMSTATE_END_OF_LIST() \
{}
-#define SELF_ANNOUNCE_ROUNDS 5
-
void loadvm_free_handlers(MigrationIncomingState *mis);
int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
@@ -1035,14 +1033,6 @@ void vmstate_register_ram(struct MemoryRegion *memory,
DeviceState *dev);
void vmstate_unregister_ram(struct MemoryRegion *memory, DeviceState *dev);
void vmstate_register_ram_global(struct MemoryRegion *memory);
-static inline
-int64_t self_announce_delay(int round)
-{
- assert(round < SELF_ANNOUNCE_ROUNDS && round > 0);
- /* delay 50ms, 150ms, 250ms, ... */
- return 50 + (SELF_ANNOUNCE_ROUNDS - round - 1) * 100;
-}
-
void dump_vmstate_json_to_file(FILE *out_fp);
bool vmstate_device_is_migratable(const VMStateDescription *vmsd);
diff --git a/migration/savevm.c b/migration/savevm.c
index a80bc83..6aeebb8 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -37,6 +37,7 @@
#include "qemu/timer.h"
#include "migration/migration.h"
#include "migration/snapshot.h"
+#include "migration/misc.h"
#include "ram.h"
#include "qemu-file-channel.h"
#include "qemu-file.h"
--
2.9.3
- [Qemu-devel] [PATCH 17/41] migration: Create savevm.h for functions exported from savevm.c, (continued)
- [Qemu-devel] [PATCH 17/41] migration: Create savevm.h for functions exported from savevm.c, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 18/41] migration: Split qemu-file.h, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 19/41] migration: Remove unneeded includes of migration/vmstate.h, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 20/41] migration: Export exec.c functions in its own file, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 21/41] migration: Export fd.c functions in its own file, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 22/41] migration: Export socket.c functions in its own file, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 23/41] migration: Export tls.c functions in its own file, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 24/41] migration: Export ram.c functions in its own file, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 25/41] migration: Export rdma.c functions in its own file, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 27/41] migration: Move self_announce_delay() to misc.h,
Juan Quintela <=
- [Qemu-devel] [PATCH 28/41] migration: Split registration functions from vmstate.h, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 26/41] migration: Move include/migration/block.h into migration/, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 29/41] migration: loadvm_free_handlers is only used in migration/, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 30/41] migration: Move dump_vmsate_json_to_file() to misc.h, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 32/41] migration: Move constants to savevm.h, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 31/41] migration: Move postcopy stuff to postcopy-ram.c, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 33/41] migration: Commands are only used inside migration.c, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 34/41] migration: ram_control_* are implemented in qemu_file, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 35/41] migration: create global_state.c, Juan Quintela, 2017/04/25