From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Srvrl-0007pT-Qs for qemu-devel@nongnu.org; Thu, 19 Jul 2012 14:54:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Srvrk-0008Er-Tn for qemu-devel@nongnu.org; Thu, 19 Jul 2012 14:54:25 -0400 Received: from vms173005pub.verizon.net ([206.46.173.5]:43160) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Srvrk-0008EX-PD for qemu-devel@nongnu.org; Thu, 19 Jul 2012 14:54:24 -0400 Received: from wf-rch.minyard.home ([unknown] [173.57.151.210]) by vms173005.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0M7F00CY08HH97W7@vms173005.mailsrvcs.net> for qemu-devel@nongnu.org; Thu, 19 Jul 2012 13:53:47 -0500 (CDT) From: minyard@acm.org Date: Thu, 19 Jul 2012 13:53:18 -0500 Message-id: <1342724013-1633-4-git-send-email-minyard@acm.org> In-reply-to: <1342724013-1633-1-git-send-email-minyard@acm.org> References: <1342724013-1633-1-git-send-email-minyard@acm.org> Subject: [Qemu-devel] [PATCH 03/18] vl: Move init_timer_alarm() earlier List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Corey Minyard From: Corey Minyard The timers may be used in initialization, so move them earlier so they are ready. A reconnect options will be added to qemu-char, and it uses a timer, but the timer alarm wasn't initialized yet. Signed-off-by: Corey Minyard --- vl.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vl.c b/vl.c index 52b6588..0f0bcd9 100644 --- a/vl.c +++ b/vl.c @@ -3245,6 +3245,11 @@ int main(int argc, char **argv, char **envp) qemu_set_version(machine->hw_version); } + if (init_timer_alarm() < 0) { + fprintf(stderr, "could not initialize alarm timer\n"); + exit(1); + } + /* Init CPU def lists, based on config * - Must be called after all the qemu_read_config_file() calls * - Must be called before list_cpus() @@ -3422,11 +3427,6 @@ int main(int argc, char **argv, char **envp) os_set_line_buffering(); - if (init_timer_alarm() < 0) { - fprintf(stderr, "could not initialize alarm timer\n"); - exit(1); - } - #ifdef CONFIG_SPICE /* spice needs the timers to be initialized by this point */ qemu_spice_init(); -- 1.7.4.1