diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-01-28 10:16:37 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-02-02 16:55:11 +0100 |
| commit | 2e91cc62f29a7359d00576a250a10892e00c95b4 (patch) | |
| tree | af765b6027ac51777f5d1d97bcb62f9a4ab98a5b /cpu-exec.c | |
| parent | a498d0ef37cf23e1776240af61f558d113afdf4f (diff) | |
| download | qemu-2e91cc62f29a7359d00576a250a10892e00c95b4.tar.gz qemu-2e91cc62f29a7359d00576a250a10892e00c95b4.tar.bz2 qemu-2e91cc62f29a7359d00576a250a10892e00c95b4.zip | |
cpu-exec: simplify init_delay_params
With the introduction of QEMU_CLOCK_VIRTUAL_RT, the computation of
sc->diff_clk can be simplified nicely:
qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) -
qemu_clock_get_ns(QEMU_CLOCK_REALTIME) +
cpu_get_clock_offset()
= qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) -
(qemu_clock_get_ns(QEMU_CLOCK_REALTIME) - cpu_get_clock_offset())
= qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) -
(qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + timers_state.cpu_clock_offset)
= qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) -
qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL_RT)
Cc: Sebastian Tanase <sebastian.tanase@openwide.fr>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'cpu-exec.c')
| -rw-r--r-- | cpu-exec.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 9dd1ca5bb8..fa506e628a 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -100,10 +100,8 @@ static void init_delay_params(SyncClocks *sc, if (!icount_align_option) { return; } - sc->realtime_clock = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); - sc->diff_clk = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - - sc->realtime_clock + - cpu_get_clock_offset(); + sc->realtime_clock = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL_RT); + sc->diff_clk = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - sc->realtime_clock; sc->last_cpu_icount = cpu->icount_extra + cpu->icount_decr.u16.low; if (sc->diff_clk < max_delay) { max_delay = sc->diff_clk; |