From patchwork Fri Nov 2 13:14:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 196556 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 3F4122C0093 for ; Sat, 3 Nov 2012 00:14:42 +1100 (EST) Received: from localhost ([::1]:53967 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUH56-0003Y4-5k for incoming@patchwork.ozlabs.org; Fri, 02 Nov 2012 09:14:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49789) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUH4m-0003QM-6I for qemu-devel@nongnu.org; Fri, 02 Nov 2012 09:14:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TUH4l-0007pZ-4C for qemu-devel@nongnu.org; Fri, 02 Nov 2012 09:14:20 -0400 Received: from mail-ea0-f173.google.com ([209.85.215.173]:40968) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUH4k-0007np-Uu for qemu-devel@nongnu.org; Fri, 02 Nov 2012 09:14:19 -0400 Received: by mail-ea0-f173.google.com with SMTP id a1so1421427eaa.4 for ; Fri, 02 Nov 2012 06:14:18 -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=K1CVxiA4MbiwnazVH2dTFpU+yEVP+plGlbAZGQIFK0g7pa6L838iNl0W+02lSplyWY Bo1pGQgtUIgwPu4HaPJIVU1L1CFLkcUXeDohsosC9s5QRMI5Wv0dkmIP5xQVoiiOeKVD saERFms7Xsf46/aUsXhW71M+8SJmNFfoxHqr+crYSbkeT76rlZ5Bzvp1/knz2k90nD/4 K/EjExNLLvqpv4qN+iusawRXhHe2GqnKmrJ7TdKwx7bWLZmsuh5U9NTOUZKxiEPWHAYE OvdL3hK5GFz3m0zClFU8hAtHsTinLRzPonM1U67/STPa4FUTOsMXAzTCJNXkeYvxFpEj a+kA== Received: by 10.14.182.5 with SMTP id n5mr6702519eem.5.1351862058669; Fri, 02 Nov 2012 06:14:18 -0700 (PDT) Received: from yakj.lan (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id o47sm22953076eem.11.2012.11.02.06.14.17 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 06:14:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 2 Nov 2012 14:14:06 +0100 Message-Id: <1351862047-23172-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1351862047-23172-1-git-send-email-pbonzini@redhat.com> References: <1351862047-23172-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.215.173 Cc: blauwirbel@gmail.com, jan.kiszka@siemens.com, peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH 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)