diff options
| author | Juan Quintela <quintela@redhat.com> | 2017-04-21 17:39:30 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-06-13 11:00:44 +0200 |
| commit | f8d806c992a89728a08b7bb005ffd9e75dac5653 (patch) | |
| tree | 7c276b568cf1b16fa651c37025b8dde9cd96cb08 /include/migration | |
| parent | 543147116e40edcc6ccfc51e7b05a8a8934b48b5 (diff) | |
migration: Move self_announce_delay() to misc.h
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Diffstat (limited to 'include/migration')
| -rw-r--r-- | include/migration/misc.h | 10 | ||||
| -rw-r--r-- | include/migration/vmstate.h | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/migration/misc.h b/include/migration/misc.h index d7892b7956..60486d4066 100644 --- a/include/migration/misc.h +++ b/include/migration/misc.h @@ -26,4 +26,14 @@ void blk_mig_init(void); static inline void blk_mig_init(void) {} #endif +#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 8a3e9e6088..ee91dff0a1 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -1010,8 +1010,6 @@ extern const VMStateInfo vmstate_info_qtailq; #define VMSTATE_END_OF_LIST() \ {} -#define SELF_ANNOUNCE_ROUNDS 5 - int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, void *opaque, int version_id); void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd, @@ -1043,14 +1041,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_check_only_migratable(const VMStateDescription *vmsd); |