From patchwork Wed Apr 29 21:20:35 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 20832 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n3TLLj80009941 for ; Wed, 29 Apr 2009 21:21:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759489AbZD2VVe (ORCPT ); Wed, 29 Apr 2009 17:21:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758390AbZD2VVd (ORCPT ); Wed, 29 Apr 2009 17:21:33 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:41816 "EHLO e9.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759743AbZD2VVb (ORCPT ); Wed, 29 Apr 2009 17:21:31 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e9.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n3TLAgFD028895 for ; Wed, 29 Apr 2009 17:10:42 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n3TLLUF9147206 for ; Wed, 29 Apr 2009 17:21:30 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n3TLLUlC002574 for ; Wed, 29 Apr 2009 17:21:30 -0400 Received: from localhost.localdomain (sig-9-65-58-151.mts.ibm.com [9.65.58.151]) by d01av01.pok.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n3TLKdgT031204; Wed, 29 Apr 2009 17:21:28 -0400 From: Anthony Liguori To: kvm@vger.kernel.org Cc: Anthony Liguori , Avi Kivity Subject: [PATCH 18/21] Remove host_alarm_timer hacks. Date: Wed, 29 Apr 2009 16:20:35 -0500 Message-Id: <1241040038-17183-19-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1241040038-17183-1-git-send-email-aliguori@us.ibm.com> References: <1241040038-17183-1-git-send-email-aliguori@us.ibm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Signed-off-by: Anthony Liguori --- vl.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/vl.c b/vl.c index 3b0e3dc..848a8f8 100644 --- a/vl.c +++ b/vl.c @@ -1367,8 +1367,7 @@ static void host_alarm_handler(int host_signum) last_clock = ti; } #endif - if (1 || - alarm_has_dynticks(alarm_timer) || + if (alarm_has_dynticks(alarm_timer) || (!use_icount && qemu_timer_expired(active_timers[QEMU_TIMER_VIRTUAL], qemu_get_clock(vm_clock))) ||