diff options
| author | Peter Xu <peterx@redhat.com> | 2023-02-08 15:28:12 -0500 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2023-02-11 16:51:09 +0100 |
| commit | b28fb58227aa88b940fd45b31b0f66c8e3b8cdc0 (patch) | |
| tree | 285eac265103f2ba375917289b14a7693265d94c /migration | |
| parent | fc063a7b8ac0e1362897f4fb3f5c09dce2b2f5af (diff) | |
| download | qemu-b28fb58227aa88b940fd45b31b0f66c8e3b8cdc0.zip qemu-b28fb58227aa88b940fd45b31b0f66c8e3b8cdc0.tar.gz qemu-b28fb58227aa88b940fd45b31b0f66c8e3b8cdc0.tar.bz2 | |
migration: Add a semaphore to count PONGs
This is mostly useless, but useful for us to know whether the main channel
is correctly established without changing the migration protocol.
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/migration.c | 3 | ||||
| -rw-r--r-- | migration/migration.h | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/migration/migration.c b/migration/migration.c index fb0ecf5..a2e3625 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3025,6 +3025,7 @@ retry: case MIG_RP_MSG_PONG: tmp32 = ldl_be_p(buf); trace_source_return_path_thread_pong(tmp32); + qemu_sem_post(&ms->rp_state.rp_pong_acks); break; case MIG_RP_MSG_REQ_PAGES: @@ -4524,6 +4525,7 @@ static void migration_instance_finalize(Object *obj) qemu_sem_destroy(&ms->postcopy_pause_sem); qemu_sem_destroy(&ms->postcopy_pause_rp_sem); qemu_sem_destroy(&ms->rp_state.rp_sem); + qemu_sem_destroy(&ms->rp_state.rp_pong_acks); qemu_sem_destroy(&ms->postcopy_qemufile_src_sem); error_free(ms->error); } @@ -4570,6 +4572,7 @@ static void migration_instance_init(Object *obj) qemu_sem_init(&ms->postcopy_pause_sem, 0); qemu_sem_init(&ms->postcopy_pause_rp_sem, 0); qemu_sem_init(&ms->rp_state.rp_sem, 0); + qemu_sem_init(&ms->rp_state.rp_pong_acks, 0); qemu_sem_init(&ms->rate_limit_sem, 0); qemu_sem_init(&ms->wait_unplug_sem, 0); qemu_sem_init(&ms->postcopy_qemufile_src_sem, 0); diff --git a/migration/migration.h b/migration/migration.h index c351872..4cb1cb6 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -276,6 +276,12 @@ struct MigrationState { */ bool rp_thread_created; QemuSemaphore rp_sem; + /* + * We post to this when we got one PONG from dest. So far it's an + * easy way to know the main channel has successfully established + * on dest QEMU. + */ + QemuSemaphore rp_pong_acks; } rp_state; double mbps; |