diff options
| author | Peter Maydell | 2020-12-11 16:01:05 +0100 |
|---|---|---|
| committer | Peter Maydell | 2020-12-11 16:01:05 +0100 |
| commit | ee1318922288077d52585d7d7cd7c9a77a26a1e5 (patch) | |
| tree | 3845564f28a99621f35be1b817451050580c540f /softmmu | |
| parent | Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into ... (diff) | |
| parent | accel/tcg: rename tcg-cpus functions to match module name (diff) | |
| download | qemu-ee1318922288077d52585d7d7cd7c9a77a26a1e5.tar.gz qemu-ee1318922288077d52585d7d7cd7c9a77a26a1e5.tar.xz qemu-ee1318922288077d52585d7d7cd7c9a77a26a1e5.zip | |
Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-tcg-20201210' into staging
Split CpusAccel for tcg variants
# gpg: Signature made Fri 11 Dec 2020 01:07:33 GMT
# gpg: using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg: issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F
* remotes/rth-gitlab/tags/pull-tcg-20201210:
accel/tcg: rename tcg-cpus functions to match module name
accel/tcg: split tcg_start_vcpu_thread
accel/tcg: split CpusAccel into three TCG variants
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'softmmu')
| -rw-r--r-- | softmmu/icount.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/softmmu/icount.c b/softmmu/icount.c index 020a201a01..dbcd8c3594 100644 --- a/softmmu/icount.c +++ b/softmmu/icount.c @@ -396,7 +396,7 @@ void icount_start_warp_timer(void) void icount_account_warp_timer(void) { - if (!icount_enabled() || !icount_sleep) { + if (!icount_sleep) { return; } |