From patchwork Mon Dec 21 08:09:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 41523 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 41E0EB6F08 for ; Mon, 21 Dec 2009 19:43:20 +1100 (EST) Received: from localhost ([127.0.0.1]:42633 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NMdnH-0003E2-LP for incoming@patchwork.ozlabs.org; Mon, 21 Dec 2009 03:39:07 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NMdKr-0002jg-W1 for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:47 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NMdKk-0002gh-L1 for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:43 -0500 Received: from [199.232.76.173] (port=52814 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NMdKk-0002gS-BF for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:26567) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NMdKj-0003oC-Qw for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:38 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBL89b9p024682 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 21 Dec 2009 03:09:37 -0500 Received: from localhost.localdomain (vpn2-10-119.ams2.redhat.com [10.36.10.119]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBL89V3P011460 for ; Mon, 21 Dec 2009 03:09:36 -0500 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Dec 2009 09:09:16 +0100 Message-Id: <1261382970-23251-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1261382970-23251-1-git-send-email-pbonzini@redhat.com> References: <1261382970-23251-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 05/19] only one flag is needed for alarm_timer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The ALARM_FLAG_DYNTICKS can be testing simply by checking if there is a rearm function. Signed-off-by: Paolo Bonzini --- vl.c | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/vl.c b/vl.c index 58e57c1..efffaf1 100644 --- a/vl.c +++ b/vl.c @@ -779,20 +779,17 @@ struct QEMUTimer { struct qemu_alarm_timer { char const *name; - unsigned int flags; - int (*start)(struct qemu_alarm_timer *t); void (*stop)(struct qemu_alarm_timer *t); void (*rearm)(struct qemu_alarm_timer *t); void *priv; -}; -#define ALARM_FLAG_DYNTICKS 0x1 -#define ALARM_FLAG_EXPIRED 0x2 + unsigned int expired; +}; static inline int alarm_has_dynticks(struct qemu_alarm_timer *t) { - return t && (t->flags & ALARM_FLAG_DYNTICKS); + return t && t->rearm; } static void qemu_rearm_alarm_timer(struct qemu_alarm_timer *t) @@ -928,18 +925,18 @@ static int64_t qemu_icount_round(int64_t count) static struct qemu_alarm_timer alarm_timers[] = { #ifndef _WIN32 #ifdef __linux__ - {"dynticks", ALARM_FLAG_DYNTICKS, dynticks_start_timer, + {"dynticks", dynticks_start_timer, dynticks_stop_timer, dynticks_rearm_timer, NULL}, /* HPET - if available - is preferred */ - {"hpet", 0, hpet_start_timer, hpet_stop_timer, NULL, NULL}, + {"hpet", hpet_start_timer, hpet_stop_timer, NULL, NULL}, /* ...otherwise try RTC */ - {"rtc", 0, rtc_start_timer, rtc_stop_timer, NULL, NULL}, + {"rtc", rtc_start_timer, rtc_stop_timer, NULL, NULL}, #endif - {"unix", 0, unix_start_timer, unix_stop_timer, NULL, NULL}, + {"unix", unix_start_timer, unix_stop_timer, NULL, NULL}, #else - {"dynticks", ALARM_FLAG_DYNTICKS, win32_start_timer, + {"dynticks", win32_start_timer, win32_stop_timer, win32_rearm_timer, &alarm_win32_data}, - {"win32", 0, win32_start_timer, + {"win32", win32_start_timer, win32_stop_timer, NULL, &alarm_win32_data}, #endif {NULL, } @@ -1087,7 +1084,7 @@ void qemu_mod_timer(QEMUTimer *ts, int64_t expire_time) /* Rearm if necessary */ if (pt == &active_timers[ts->clock->type]) { - if ((alarm_timer->flags & ALARM_FLAG_EXPIRED) == 0) { + if (!alarm_timer->expired) { qemu_rearm_alarm_timer(alarm_timer); } /* Interrupt execution to force deadline recalculation. */ @@ -1243,7 +1240,7 @@ static void host_alarm_handler(int host_signum) qemu_timer_expired(active_timers[QEMU_CLOCK_HOST], qemu_get_clock(host_clock))) { qemu_event_increment(); - if (alarm_timer) alarm_timer->flags |= ALARM_FLAG_EXPIRED; + if (alarm_timer) alarm_timer->expired = 1; #ifndef CONFIG_IOTHREAD if (next_cpu) { @@ -1472,6 +1469,7 @@ static void dynticks_rearm_timer(struct qemu_alarm_timer *t) int64_t nearest_delta_us = INT64_MAX; int64_t current_us; + assert(alarm_has_dynticks(t)); if (!active_timers[QEMU_CLOCK_REALTIME] && !active_timers[QEMU_CLOCK_VIRTUAL] && !active_timers[QEMU_CLOCK_HOST]) @@ -1587,6 +1585,7 @@ static void win32_rearm_timer(struct qemu_alarm_timer *t) { struct qemu_alarm_win32 *data = t->priv; + assert(alarm_has_dynticks(t)); if (!active_timers[QEMU_CLOCK_REALTIME] && !active_timers[QEMU_CLOCK_VIRTUAL] && !active_timers[QEMU_CLOCK_HOST]) @@ -3993,8 +3992,8 @@ void main_loop_wait(int timeout) slirp_select_poll(&rfds, &wfds, &xfds, (ret < 0)); /* rearm timer, if not periodic */ - if (alarm_timer->flags & ALARM_FLAG_EXPIRED) { - alarm_timer->flags &= ~ALARM_FLAG_EXPIRED; + if (alarm_timer->expired) { + alarm_timer->expired = 0; qemu_rearm_alarm_timer(alarm_timer); }