From patchwork Mon Feb 21 08:51:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/4] qemu_next_deadline should not consider host-time timers Date: Sun, 20 Feb 2011 22:51:24 -0000 From: Paolo Bonzini X-Patchwork-Id: 83812 Message-Id: <1298278286-9158-3-git-send-email-pbonzini@redhat.com> To: qemu-devel@nongnu.org Cc: edgar.iglesias@gmail.com It is purely for icount-based virtual timers. Signed-off-by: Paolo Bonzini --- qemu-timer.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/qemu-timer.c b/qemu-timer.c index 88c7b28..06fa507 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -689,16 +689,11 @@ int64_t qemu_next_deadline(void) /* To avoid problems with overflow limit this to 2^32. */ int64_t delta = INT32_MAX; + assert(use_icount); if (active_timers[QEMU_CLOCK_VIRTUAL]) { delta = active_timers[QEMU_CLOCK_VIRTUAL]->expire_time - qemu_get_clock_ns(vm_clock); } - if (active_timers[QEMU_CLOCK_HOST]) { - int64_t hdelta = active_timers[QEMU_CLOCK_HOST]->expire_time - - qemu_get_clock_ns(host_clock); - if (hdelta < delta) - delta = hdelta; - } if (delta < 0) delta = 0;