diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-06 11:31:40 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-06 11:31:40 +0000 |
| commit | 9319738080faeb09876ce2017fcaea4937c475ee (patch) | |
| tree | bf2b6e1c46b44d0e28fe4de89b034de7f2e8343d /main-loop.c | |
| parent | 3aa88b31290c7cbbbae344efdece659194b95c70 (diff) | |
| parent | ee312992a323530ea2cda8680f3a34746c72db8f (diff) | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream-replay' into staging
So here it is, let's see what happens.
# gpg: Signature made Fri 06 Nov 2015 09:30:34 GMT using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
* remotes/bonzini/tags/for-upstream-replay:
replay: recording of the user input
replay: command line options
replay: replay blockers for devices
replay: initialization and deinitialization
replay: ptimer
bottom halves: introduce bh call function
replay: checkpoints
icount: improve counting for record/replay
replay: shutdown event
replay: recording and replaying clock ticks
replay: asynchronous events infrastructure
replay: interrupts and exceptions
cpu: replay instructions sequence
cpu-exec: allow temporary disabling icount
replay: introduce icount event
replay: introduce mutex to protect the replay log
replay: internal functions for replay log
replay: global variables and function stubs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'main-loop.c')
| -rw-r--r-- | main-loop.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main-loop.c b/main-loop.c index db600a37f1..df28670606 100644 --- a/main-loop.c +++ b/main-loop.c @@ -506,6 +506,9 @@ int main_loop_wait(int nonblocking) slirp_pollfds_poll(gpollfds, (ret < 0)); #endif + /* CPU thread can infinitely wait for event after + missing the warp */ + qemu_clock_warp(QEMU_CLOCK_VIRTUAL); qemu_clock_run_all_timers(); return ret; |