From patchwork Fri Nov 2 14:43:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 196580 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 93C542C00B9 for ; Sat, 3 Nov 2012 02:09:01 +1100 (EST) Received: from localhost ([::1]:42740 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUIUF-0003MF-9i for incoming@patchwork.ozlabs.org; Fri, 02 Nov 2012 10:44:43 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=9CgGq2o4mPe/nCK6dOXYjz7Zd1GXG5RRJJR0W6rM9BU=; b=dwlEG+lJFX57uAPf7WNPB+PDG5hzeqhzvMYnuo5BURxXWBdPnv3WzuEep+rmVGU0u0 s1UvTATlxzYN1jMygzE7kjZlrtzLI1VuhS5K8CPzMk8l2z5Ye3ramAGgVXPNwcLaLxBz 1p9OBTOZZdHGabQylf+E8NGFSoVJBeAS7bCKhWdyv3Wd2SutEKc/8COYV3pMCmsT7UZx /wO7xWhfv6Ze10A5U/S90JzXHQVPWXljfokIAp+5hMt9CA8E+KgbYWgQRAxZ6TWtir0R GbE61cnoWPeRRgC+xYXAGGKEElNxPmu2DjhdhV47Wdkf/ebSm5fZl+HdTYHG/HqEfyzB xn/Q== Received: by 10.68.245.37 with SMTP id xl5mr6672202pbc.120.1351867431521; Fri, 02 Nov 2012 07:43:51 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id nm2sm5857112pbc.43.2012.11.02.07.43.48 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 07:43:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 2 Nov 2012 15:43:23 +0100 Message-Id: <1351867404-25510-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1351867404-25510-1-git-send-email-pbonzini@redhat.com> References: <1351867404-25510-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.160.45 Cc: blauwirbel@gmail.com, jan.kiszka@siemens.com, peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH v2 4/5] vl: unify calls to init_timer_alarm X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.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)