58fc860e6d
A couple of fixes, including one which gives confidence we can submit to Factory finally. OBS-URL: https://build.opensuse.org/request/show/612290 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=410
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
From 00300f4a36119691fc8689575424d380b2450bf7 Mon Sep 17 00:00:00 2001
|
|
From: Bruce Rogers <brogers@suse.com>
|
|
Date: Fri, 25 May 2018 09:09:04 -0600
|
|
Subject: [PATCH] Revert "replay: avoid recursive call of checkpoints"
|
|
|
|
This reverts commit 66eb7825d0bd84a870a054fb208fe765317109fa.
|
|
|
|
[BR: BSC#1094406]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
replay/replay.c | 14 +-------------
|
|
1 file changed, 1 insertion(+), 13 deletions(-)
|
|
|
|
diff --git a/replay/replay.c b/replay/replay.c
|
|
index eae8daf18a..90f98b7490 100644
|
|
--- a/replay/replay.c
|
|
+++ b/replay/replay.c
|
|
@@ -176,24 +176,13 @@ void replay_shutdown_request(ShutdownCause cause)
|
|
bool replay_checkpoint(ReplayCheckpoint checkpoint)
|
|
{
|
|
bool res = false;
|
|
- static bool in_checkpoint;
|
|
assert(EVENT_CHECKPOINT + checkpoint <= EVENT_CHECKPOINT_LAST);
|
|
+ replay_save_instructions();
|
|
|
|
if (!replay_file) {
|
|
return true;
|
|
}
|
|
|
|
- if (in_checkpoint) {
|
|
- /* If we are already in checkpoint, then there is no need
|
|
- for additional synchronization.
|
|
- Recursion occurs when HW event modifies timers.
|
|
- Timer modification may invoke the checkpoint and
|
|
- proceed to recursion. */
|
|
- return true;
|
|
- }
|
|
- in_checkpoint = true;
|
|
-
|
|
- replay_save_instructions();
|
|
|
|
if (replay_mode == REPLAY_MODE_PLAY) {
|
|
g_assert(replay_mutex_locked());
|
|
@@ -215,7 +204,6 @@ bool replay_checkpoint(ReplayCheckpoint checkpoint)
|
|
res = true;
|
|
}
|
|
out:
|
|
- in_checkpoint = false;
|
|
return res;
|
|
}
|
|
|