From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50974) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCtxy-00079Y-4B for qemu-devel@nongnu.org; Mon, 10 Feb 2014 11:44:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCtxt-0005RX-7a for qemu-devel@nongnu.org; Mon, 10 Feb 2014 11:44:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:23913) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCtxs-0005RN-T7 for qemu-devel@nongnu.org; Mon, 10 Feb 2014 11:44:13 -0500 Date: Mon, 10 Feb 2014 18:49:06 +0200 From: "Michael S. Tsirkin" Message-ID: <1392050814-31814-21-git-send-email-mst@redhat.com> References: <1392050814-31814-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1392050814-31814-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 20/20] ACPI: Remove commented-out code from HPET._CRS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , "Gabriel L. Somlo" , Gabriel Somlo , Anthony Liguori , Igor Mammedov From: "Gabriel L. Somlo" 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 Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-By: Igor Mammedov --- hw/i386/acpi-dsdt-hpet.dsl | 3 --- 1 file changed, 3 deletions(-) diff --git a/hw/i386/acpi-dsdt-hpet.dsl b/hw/i386/acpi-dsdt-hpet.dsl index dfde174..44961b8 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 -- MST