diff options
| author | Peter Maydell | 2018-07-31 12:14:53 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-07-31 12:14:53 +0200 |
| commit | 45a505d0a4b396a013ab086948a8ba6e76096bf4 (patch) | |
| tree | 127dd6c8700b2ed06eeca879901651cc57ea196e /util/qemu-timer.c | |
| parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180731' into staging (diff) | |
| parent | backends/cryptodev: remove dead code (diff) | |
| download | qemu-45a505d0a4b396a013ab086948a8ba6e76096bf4.tar.gz qemu-45a505d0a4b396a013ab086948a8ba6e76096bf4.tar.xz qemu-45a505d0a4b396a013ab086948a8ba6e76096bf4.zip | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
Bug fixes.
# gpg: Signature made Mon 30 Jul 2018 13:00:39 BST
# gpg: using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
backends/cryptodev: remove dead code
timer: remove replay clock probe in deadline calculation
i386: implement MSR_SMI_COUNT for TCG
i386: do not migrate MSR_SMI_COUNT on machine types <2.12
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/qemu-timer.c')
| -rw-r--r-- | util/qemu-timer.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/util/qemu-timer.c b/util/qemu-timer.c index 2ed1bf2778..86bfe84037 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -578,17 +578,10 @@ int64_t timerlistgroup_deadline_ns(QEMUTimerListGroup *tlg) { int64_t deadline = -1; QEMUClockType type; - bool play = replay_mode == REPLAY_MODE_PLAY; for (type = 0; type < QEMU_CLOCK_MAX; type++) { if (qemu_clock_use_for_deadline(type)) { - if (!play || type == QEMU_CLOCK_REALTIME) { - deadline = qemu_soonest_timeout(deadline, - timerlist_deadline_ns(tlg->tl[type])); - } else { - /* Read clock from the replay file and - do not calculate the deadline, based on virtual clock. */ - qemu_clock_get_ns(type); - } + deadline = qemu_soonest_timeout(deadline, + timerlist_deadline_ns(tlg->tl[type])); } } return deadline; |