From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUITV-0001Uh-L3 for qemu-devel@nongnu.org; Fri, 02 Nov 2012 10:44:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TUITQ-000582-6y for qemu-devel@nongnu.org; Fri, 02 Nov 2012 10:43:57 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:49132) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUITQ-00052C-0W for qemu-devel@nongnu.org; Fri, 02 Nov 2012 10:43:52 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so2443187pbb.4 for ; Fri, 02 Nov 2012 07:43:51 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 2 Nov 2012 15:43:23 +0100 Message-Id: <1351867404-25510-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1351867404-25510-1-git-send-email-pbonzini@redhat.com> References: <1351867404-25510-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/5] vl: unify calls to init_timer_alarm List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, jan.kiszka@siemens.com, peter.maydell@linaro.org init_timer_alarm was being called twice. This is not needed. Signed-off-by: Paolo Bonzini --- main-loop.c | 5 ++++- vl.c | 5 ----- 2 file modificati, 4 inserzioni(+), 6 rimozioni(-) diff --git a/main-loop.c b/main-loop.c index e43c7c8..234a313 100644 --- a/main-loop.c +++ b/main-loop.c @@ -123,7 +123,10 @@ int qemu_init_main_loop(void) GSource *src; init_clocks(); - init_timer_alarm(); + if (init_timer_alarm() < 0) { + fprintf(stderr, "could not initialize alarm timer\n"); + exit(1); + } qemu_mutex_lock_iothread(); ret = qemu_signal_init(); diff --git a/vl.c b/vl.c index 99681da..e2d5276 100644 --- a/vl.c +++ b/vl.c @@ -3616,11 +3616,6 @@ int main(int argc, char **argv, char **envp) add_device_config(DEV_VIRTCON, "vc:80Cx24C"); } - if (init_timer_alarm() < 0) { - fprintf(stderr, "could not initialize alarm timer\n"); - exit(1); - } - socket_init(); if (qemu_opts_foreach(qemu_find_opts("chardev"), chardev_init_func, NULL, 1) != 0) -- 1.7.12.1