From owner-svn-src-all@FreeBSD.ORG  Tue Jun 22 16:10:48 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 969CA106564A;
	Tue, 22 Jun 2010 16:10:48 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 862988FC08;
	Tue, 22 Jun 2010 16:10:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5MGAm0r092120;
	Tue, 22 Jun 2010 16:10:48 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5MGAmSo092118;
	Tue, 22 Jun 2010 16:10:48 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201006221610.o5MGAmSo092118@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 22 Jun 2010 16:10:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209431 - head/sys/dev/acpica
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Jun 2010 16:10:48 -0000

Author: mav
Date: Tue Jun 22 16:10:48 2010
New Revision: 209431
URL: http://svn.freebsd.org/changeset/base/209431

Log:
  Do not set level-triggered interrupt mode if we are not going to use it.
  This fixes QEMU crash due to unsupported level-triggered HPET interrupts.
  
  Reported by:	kib@

Modified:
  head/sys/dev/acpica/acpi_hpet.c

Modified: head/sys/dev/acpica/acpi_hpet.c
==============================================================================
--- head/sys/dev/acpica/acpi_hpet.c	Tue Jun 22 15:01:23 2010	(r209430)
+++ head/sys/dev/acpica/acpi_hpet.c	Tue Jun 22 16:10:48 2010	(r209431)
@@ -526,6 +526,7 @@ hpet_attach(device_t dev)
 				t->irq = -2;
 		} else
 #endif
+		if (sc->irq >= 0 && (t->vectors & (1 << sc->irq)))
 			t->caps |= (sc->irq << 9) | HPET_TCNF_INT_TYPE;
 		bus_write_4(sc->mem_res, HPET_TIMER_CAP_CNF(i), t->caps);
 		/* Skip event timers without set up IRQ. */