diff options
| author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2019-02-27 13:24:08 +0000 |
|---|---|---|
| committer | Jason Wang <jasowang@redhat.com> | 2019-03-05 11:27:41 +0800 |
| commit | 7659505c1680643d13ad7675f9e649d388303059 (patch) | |
| tree | 502da4c1b4ba4b5397727810385c2fe8ca6eb4ad /include | |
| parent | 9d8c6a258c70d8ff494489140a4fcb3a965909b2 (diff) | |
| download | qemu-7659505c1680643d13ad7675f9e649d388303059.zip | |
migration: Switch to using announce timer
Switch the announcements to using the new announce timer.
Move the code that does it to announce.c rather than savevm
because it really has nothing to do with the actual migration.
Migration starts the announce from bh's and so they're all
in the main thread/bql, and so there's never any racing with
the timers themselves.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/migration/misc.h | 10 | ||||
| -rw-r--r-- | include/net/announce.h | 2 | ||||
| -rw-r--r-- | include/sysemu/sysemu.h | 2 |
3 files changed, 2 insertions, 12 deletions
diff --git a/include/migration/misc.h b/include/migration/misc.h index e837ab3042..0471e04d1f 100644 --- a/include/migration/misc.h +++ b/include/migration/misc.h @@ -29,16 +29,6 @@ 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; -} - AnnounceParameters *migrate_announce_params(void); /* migration/savevm.c */ diff --git a/include/net/announce.h b/include/net/announce.h index b89f1c28b5..892d302b65 100644 --- a/include/net/announce.h +++ b/include/net/announce.h @@ -36,4 +36,6 @@ void qemu_announce_timer_reset(AnnounceTimer *timer, QEMUTimerCB *cb, void *opaque); +void qemu_announce_self(AnnounceTimer *timer, AnnounceParameters *params); + #endif diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 4b5a6b77f9..89604a8328 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -81,8 +81,6 @@ extern bool machine_init_done; void qemu_add_machine_init_done_notifier(Notifier *notify); void qemu_remove_machine_init_done_notifier(Notifier *notify); -void qemu_announce_self(void); - extern int autostart; typedef enum { |