From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NpJJq-0008Lc-VF for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:15 -0500 Received: from [199.232.76.173] (port=52788 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpJJp-0008Jy-FB for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:13 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NpJJo-0004uy-Ht for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:12 -0500 Received: from ey-out-1920.google.com ([74.125.78.149]:23175) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NpJJn-0004ul-TV for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:12 -0500 Received: by ey-out-1920.google.com with SMTP id 3so528570eyh.2 for ; Wed, 10 Mar 2010 02:39:10 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 10 Mar 2010 11:38:49 +0100 Message-Id: <1268217535-26554-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1268217535-26554-1-git-send-email-pbonzini@redhat.com> References: <1268217535-26554-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 12/18] add qemu_icount_round List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- vl.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/vl.c b/vl.c index d05bae5..2f78817 100644 --- a/vl.c +++ b/vl.c @@ -731,6 +731,11 @@ static void configure_icount(const char *option) qemu_get_clock(vm_clock) + get_ticks_per_sec() / 10); } +static int64_t qemu_icount_round(int64_t count) +{ + return (count + (1 << icount_time_shift) - 1) >> icount_time_shift; +} + static struct qemu_alarm_timer alarm_timers[] = { #ifndef _WIN32 #ifdef __linux__ @@ -3961,9 +3966,7 @@ static int qemu_cpu_exec(CPUState *env) qemu_icount -= (env->icount_decr.u16.low + env->icount_extra); env->icount_decr.u16.low = 0; env->icount_extra = 0; - count = qemu_next_deadline(); - count = (count + (1 << icount_time_shift) - 1) - >> icount_time_shift; + count = qemu_icount_round (qemu_next_deadline()); qemu_icount += count; decr = (count > 0xffff) ? 0xffff : count; count -= decr; @@ -4073,9 +4076,7 @@ static int qemu_calculate_timeout(void) if (add > 10000000) add = 10000000; delta += add; - add = (add + (1 << icount_time_shift) - 1) - >> icount_time_shift; - qemu_icount += add; + qemu_icount += qemu_icount_round (add); timeout = delta / 1000000; if (timeout < 0) timeout = 0; -- 1.6.6