summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorClaudio Fontana2020-07-31 12:23:42 +0200
committerPaolo Bonzini2020-10-05 16:41:22 +0200
commit430065dab060f04a74f915ea1260dcc79701ca75 (patch)
treef445ddeea37071030bd0bbbef143b705b608252a /util
parenticount: rename functions to be consistent with the module name (diff)
downloadqemu-430065dab060f04a74f915ea1260dcc79701ca75.tar.gz
qemu-430065dab060f04a74f915ea1260dcc79701ca75.tar.xz
qemu-430065dab060f04a74f915ea1260dcc79701ca75.zip
cpus: prepare new CpusAccel cpu accelerator interface
The new interface starts unused, will start being used by the next patches. It provides methods for each accelerator to start a vcpu, kick a vcpu, synchronize state, get cpu virtual clock and elapsed ticks. In qemu_wait_io_event, make it clear that APC is used only for HAX on Windows. Signed-off-by: Claudio Fontana <cfontana@suse.de> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'util')
-rw-r--r--util/qemu-timer.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/util/qemu-timer.c b/util/qemu-timer.c
index b69c6bb27b..81c28af517 100644
--- a/util/qemu-timer.c
+++ b/util/qemu-timer.c
@@ -635,13 +635,7 @@ int64_t qemu_clock_get_ns(QEMUClockType type)
return get_clock();
default:
case QEMU_CLOCK_VIRTUAL:
- if (icount_enabled()) {
- return icount_get();
- } else if (qtest_enabled()) { /* for qtest_clock_warp */
- return qtest_get_virtual_clock();
- } else {
- return cpu_get_clock();
- }
+ return cpus_get_virtual_clock();
case QEMU_CLOCK_HOST:
return REPLAY_CLOCK(REPLAY_CLOCK_HOST, get_clock_realtime());
case QEMU_CLOCK_VIRTUAL_RT: