i386: Update new x86_apicid parsing rules with die_offset support

[mirror_qemu.git] / replay / replay-time.c

diff --git a/replay/replay-time.c b/replay/replay-time.c
index 6a7565ec8d075f861d641b9887811ece7910f9e0..5154cb0ce9c82586157417766c5d2704a1e8a041 100644 (file)
--- a/replay/replay-time.c
+++ b/replay/replay-time.c
@@ -10,18 +10,19 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "sysemu/replay.h"
 #include "replay-internal.h"
 #include "qemu/error-report.h"
 
-int64_t replay_save_clock(ReplayClockKind kind, int64_t clock)
+int64_t replay_save_clock(ReplayClockKind kind, int64_t clock, int64_t raw_icount)
 {
-
     if (replay_file) {
         g_assert(replay_mutex_locked());
 
-        replay_save_instructions();
+        /* Due to the caller's locking requirements we get the icount from it
+         * instead of using replay_save_instructions().
+         */
+        replay_advance_current_step(raw_icount);
         replay_put_event(EVENT_CLOCK + kind);
         replay_put_qword(clock);
     }