diff options
| author | Claudio Fontana <cfontana@suse.de> | 2020-08-31 16:18:34 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-05 16:41:22 +0200 |
| commit | 8191d3684157884bf7e6eff0d247d7e91a1cc543 (patch) | |
| tree | 2a5292952ebe51bd915d2064dd0d0feed884f711 /util | |
| parent | 740b175973427bcfa32ad894bb1f83b96d184c28 (diff) | |
| download | qemu-8191d3684157884bf7e6eff0d247d7e91a1cc543.zip qemu-8191d3684157884bf7e6eff0d247d7e91a1cc543.tar.gz qemu-8191d3684157884bf7e6eff0d247d7e91a1cc543.tar.bz2 | |
icount: rename functions to be consistent with the module name
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'util')
| -rw-r--r-- | util/main-loop.c | 2 | ||||
| -rw-r--r-- | util/qemu-timer.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/util/main-loop.c b/util/main-loop.c index 0c5fe01..6470f8e 100644 --- a/util/main-loop.c +++ b/util/main-loop.c @@ -526,7 +526,7 @@ void main_loop_wait(int nonblocking) * CPU thread can infinitely wait for event after * missing the warp */ - qemu_start_warp_timer(); + icount_start_warp_timer(); } qemu_clock_run_all_timers(); } diff --git a/util/qemu-timer.c b/util/qemu-timer.c index 0674046..b69c6bb 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -419,7 +419,7 @@ static void timerlist_rearm(QEMUTimerList *timer_list) { /* Interrupt execution to force deadline recalculation. */ if (icount_enabled() && timer_list->clock->type == QEMU_CLOCK_VIRTUAL) { - qemu_start_warp_timer(); + icount_start_warp_timer(); } timerlist_notify(timer_list); } @@ -636,7 +636,7 @@ int64_t qemu_clock_get_ns(QEMUClockType type) default: case QEMU_CLOCK_VIRTUAL: if (icount_enabled()) { - return cpu_get_icount(); + return icount_get(); } else if (qtest_enabled()) { /* for qtest_clock_warp */ return qtest_get_virtual_clock(); } else { |