[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/11] cpu-exec: simplify init_delay_params
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 09/11] cpu-exec: simplify init_delay_params |
Date: |
Fri, 30 Jan 2015 16:01:16 +0100 |
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 <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
cpu-exec.c | 6 ++----
cpus.c | 17 -----------------
include/qemu/timer.h | 1 -
3 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/cpu-exec.c b/cpu-exec.c
index 9dd1ca5..fa506e6 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;
diff --git a/cpus.c b/cpus.c
index 3a5323b..0cdd1d7 100644
--- a/cpus.c
+++ b/cpus.c
@@ -229,23 +229,6 @@ int64_t cpu_get_clock(void)
return ti;
}
-/* return the offset between the host clock and virtual CPU clock */
-int64_t cpu_get_clock_offset(void)
-{
- int64_t ti;
- unsigned start;
-
- do {
- start = seqlock_read_begin(&timers_state.vm_clock_seqlock);
- ti = timers_state.cpu_clock_offset;
- if (!timers_state.cpu_ticks_enabled) {
- ti -= get_clock();
- }
- } while (seqlock_read_retry(&timers_state.vm_clock_seqlock, start));
-
- return -ti;
-}
-
/* enable cpu_get_ticks()
* Caller must hold BQL which server as mutex for vm_clock_seqlock.
*/
diff --git a/include/qemu/timer.h b/include/qemu/timer.h
index ca5befb..eba8b21 100644
--- a/include/qemu/timer.h
+++ b/include/qemu/timer.h
@@ -838,7 +838,6 @@ static inline int64_t get_clock(void)
int64_t cpu_get_icount_raw(void);
int64_t cpu_get_icount(void);
int64_t cpu_get_clock(void);
-int64_t cpu_get_clock_offset(void);
int64_t cpu_icount_to_ns(int64_t icount);
/*******************************************/
--
1.8.3.1
- [Qemu-devel] [PULL 00/11] RCU, scsi, modules, icount changes for 2015-01-30, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 02/11] rcu: add rcutorture, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 03/11] rcu: allow nesting of rcu_read_lock/rcu_read_unlock, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 01/11] rcu: add rcu library, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 05/11] memory: remove assertion on memory_region_destroy, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 06/11] memory: protect current_map by RCU, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 08/11] cpu-exec: simplify align_clocks, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 04/11] rcu: add call_rcu, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 09/11] cpu-exec: simplify init_delay_params,
Paolo Bonzini <=
- [Qemu-devel] [PULL 07/11] memory: avoid ref/unref in memory_region_find, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 11/11] configure: Default to enable module build, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 10/11] scsi: Fix scsi_req_cancel_async for no aiocb req, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 00/11] RCU, scsi, modules, icount changes for 2015-01-30, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 02/11] rcu: add rcutorture, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 01/11] rcu: add rcu library, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 04/11] rcu: add call_rcu, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 06/11] memory: protect current_map by RCU, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 07/11] memory: avoid ref/unref in memory_region_find, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 03/11] rcu: allow nesting of rcu_read_lock/rcu_read_unlock, Paolo Bonzini, 2015/01/30