From patchwork Wed Nov 9 11:46:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 124535 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7A6841007D9 for ; Wed, 9 Nov 2011 22:47:19 +1100 (EST) Received: from localhost ([::1]:39485 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RO6cd-0000G3-2B for incoming@patchwork.ozlabs.org; Wed, 09 Nov 2011 06:47:15 -0500 Received: from eggs.gnu.org ([140.186.70.92]:34633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RO6cV-0000Fn-QH for qemu-devel@nongnu.org; Wed, 09 Nov 2011 06:47:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RO6cU-00054j-Sh for qemu-devel@nongnu.org; Wed, 09 Nov 2011 06:47:07 -0500 Received: from mail-gy0-f173.google.com ([209.85.160.173]:38656) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RO6cU-00054e-Kq for qemu-devel@nongnu.org; Wed, 09 Nov 2011 06:47:06 -0500 Received: by gyb11 with SMTP id 11so1815879gyb.4 for ; Wed, 09 Nov 2011 03:47:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer; bh=33BH6rRLJKapShXh0jfbTQMSOnVhfBzHjsNskGT01aU=; b=h8oZpPZknXiwa7c4qvXNudYbhZriqqRmHysTasLSY8BBBIUul7VPy3cOOyNStiegTS J8lGIj6tE4WddFrM+RQyZ52kQwtQ8Eh8b2Ex4XqNGHTFky+aNDKscT9kBAgRZ5WpYn3S igpUXyvADSMDwsmsKCJKpBkNqTkfRjtu+b56c= Received: by 10.50.140.1 with SMTP id rc1mr2129519igb.25.1320839226000; Wed, 09 Nov 2011 03:47:06 -0800 (PST) Received: from localhost.localdomain (93-34-178-161.ip50.fastwebnet.it. [93.34.178.161]) by mx.google.com with ESMTPS id ew6sm3682720igc.4.2011.11.09.03.47.03 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 09 Nov 2011 03:47:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 9 Nov 2011 12:46:56 +0100 Message-Id: <1320839216-19509-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.160.173 Subject: [Qemu-devel] [PATCH] win32: remove broken timers 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 The non-dynticks timer variations are broken, so they can be removed. Signed-off-by: Paolo Bonzini Reviewed-by: Stefan Weil --- qemu-timer.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/qemu-timer.c b/qemu-timer.c index f11a28d..cd026c6 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -183,10 +183,8 @@ static struct qemu_alarm_timer alarm_timers[] = { #endif {"unix", unix_start_timer, unix_stop_timer, unix_rearm_timer}, #else - {"mmtimer", mm_start_timer, mm_stop_timer, NULL}, - {"mmtimer2", mm_start_timer, mm_stop_timer, mm_rearm_timer}, + {"mmtimer", mm_start_timer, mm_stop_timer, mm_rearm_timer}, {"dynticks", win32_start_timer, win32_stop_timer, win32_rearm_timer}, - {"win32", win32_start_timer, win32_stop_timer, NULL}, #endif {NULL, } };