From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=33298 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PrRUZ-0007Lf-By for qemu-devel@nongnu.org; Mon, 21 Feb 2011 03:51:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PrRUU-0001X9-5g for qemu-devel@nongnu.org; Mon, 21 Feb 2011 03:51:35 -0500 Received: from mail-wy0-f173.google.com ([74.125.82.173]:52350) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PrRUU-0001Wp-1Q for qemu-devel@nongnu.org; Mon, 21 Feb 2011 03:51:34 -0500 Received: by mail-wy0-f173.google.com with SMTP id 29so1155761wyb.4 for ; Mon, 21 Feb 2011 00:51:33 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 21 Feb 2011 09:51:24 +0100 Message-Id: <1298278286-9158-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1298278286-9158-1-git-send-email-pbonzini@redhat.com> References: <1298278286-9158-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 2/4] qemu_next_deadline should not consider host-time timers List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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; -- 1.7.3.5