From 05fa7e773aea46aa7b2e47f949c68e740e736502 Mon Sep 17 00:00:00 2001 From: mav Date: Tue, 22 Jun 2010 16:10:48 +0000 Subject: 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@ --- sys/dev/acpica/acpi_hpet.c | 1 + 1 file changed, 1 insertion(+) (limited to 'sys') diff --git a/sys/dev/acpica/acpi_hpet.c b/sys/dev/acpica/acpi_hpet.c index 39ccbe9..68918e1 100644 --- a/sys/dev/acpica/acpi_hpet.c +++ b/sys/dev/acpica/acpi_hpet.c @@ -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. */ -- cgit v1.1