summaryrefslogtreecommitdiff
path: root/hw/i386
diff options
context:
space:
mode:
authorGabriel L. Somlo <gsomlo@gmail.com>2014-02-07 10:30:40 -0500
committerMichael S. Tsirkin <mst@redhat.com>2014-02-10 11:09:33 +0200
commit417c45ab2f847c0a47b1232f611aa886df6a97d5 (patch)
treed8f44cb1590b9b014a0232336e3f0bcee006e202 /hw/i386
parent5e95494380ecf83c97d28f72134ab45e0cace8f9 (diff)
downloadqemu-417c45ab2f847c0a47b1232f611aa886df6a97d5.tar.gz
ACPI: Remove commented-out code from HPET._CRS
IRQNoFlags on HPET._CRS crashes WinXP because it causes the HPET to conflict with the system timer and/or the RTC. It only occurs on Apple hardware, and even there it is exposed fully only when OS X is detected (via _OSI). Recent OS X versions work on QEMU without this statement, so at this time there is no need to find a better way to conditionally include the statement. This patch removes the commented out (and wrong, should have been {0, 8}) statement from HPET._CRS. Signed-off-by: Gabriel Somlo <somlo@cmu.edu> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-By: Igor Mammedov <imammedo@redhat.com>
Diffstat (limited to 'hw/i386')
-rw-r--r--hw/i386/acpi-dsdt-hpet.dsl3
1 files changed, 0 insertions, 3 deletions
diff --git a/hw/i386/acpi-dsdt-hpet.dsl b/hw/i386/acpi-dsdt-hpet.dsl
index dfde174317..44961b87a1 100644
--- a/hw/i386/acpi-dsdt-hpet.dsl
+++ b/hw/i386/acpi-dsdt-hpet.dsl
@@ -39,9 +39,6 @@ Scope(\_SB) {
Return (0x0F)
}
Name(_CRS, ResourceTemplate() {
-#if 0 /* This makes WinXP BSOD for not yet figured reasons. */
- IRQNoFlags() {2, 8}
-#endif
Memory32Fixed(ReadOnly,
0xFED00000, // Address Base
0x00000400, // Address Length