motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

replay: pass raw icount value to replay_save_clock

Browse source 
This avoids lock recursion when REPLAY_CLOCK is called inside the
timers spinlock.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2018-10-08 13:24:14 +02:00
parent 0c2ed83fa4
commit 74c0b816ad
7 changed files with 38 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

25
replay/replay-internal.c
View file

@ -217,20 +217,25 @@ void replay_mutex_unlock(void)
}
}
void replay_advance_current_step(uint64_t current_step)
{
int diff = (int)(replay_get_current_step() - replay_state.current_step);
/* Time can only go forward */
assert(diff >= 0);
if (diff > 0) {
replay_put_event(EVENT_INSTRUCTION);
replay_put_dword(diff);
replay_state.current_step += diff;
}
}
/*! Saves cached instructions. */
void replay_save_instructions(void)
{
if (replay_file && replay_mode == REPLAY_MODE_RECORD) {
g_assert(replay_mutex_locked());
int diff = (int)(replay_get_current_step() - replay_state.current_step);
/* Time can only go forward */
assert(diff >= 0);
if (diff > 0) {
replay_put_event(EVENT_INSTRUCTION);
replay_put_dword(diff);
replay_state.current_step += diff;
}
replay_advance_current_step(replay_get_current_step());
}
}