From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6oNt-0000bc-EX for qemu-devel@nongnu.org; Wed, 09 Dec 2015 18:42:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a6oNs-0004yU-BS for qemu-devel@nongnu.org; Wed, 09 Dec 2015 18:42:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60922) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6oNs-0004xp-3p for qemu-devel@nongnu.org; Wed, 09 Dec 2015 18:42:56 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id B9DE319CBAA for ; Wed, 9 Dec 2015 23:42:55 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tB9Ng8Vp005315 for ; Wed, 9 Dec 2015 18:42:55 -0500 From: Igor Mammedov Date: Thu, 10 Dec 2015 00:41:43 +0100 Message-Id: <1449704528-289297-50-git-send-email-imammedo@redhat.com> In-Reply-To: <1449704528-289297-1-git-send-email-imammedo@redhat.com> References: <1449704528-289297-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 49/74] pc: acpi: move MOU device from DSDT to SSDT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Igor Mammedov --- hw/i386/acpi-build.c | 5 +++++ hw/i386/acpi-dsdt-isa.dsl | 10 ---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index c485530..e5ec6af 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1210,6 +1210,11 @@ static void build_isa_devices_aml(Aml *table) aml_append(scope, build_eisa_device_aml( "KBD", "PNP0303", crs, true)); + crs = aml_resource_template(); + aml_append(crs, aml_irq_no_flags(12)); + aml_append(scope, build_eisa_device_aml( + "MOU", "PNP0F13", crs, true)); + aml_append(table, scope); } diff --git a/hw/i386/acpi-dsdt-isa.dsl b/hw/i386/acpi-dsdt-isa.dsl index f7a3c0a..8936271 100644 --- a/hw/i386/acpi-dsdt-isa.dsl +++ b/hw/i386/acpi-dsdt-isa.dsl @@ -16,16 +16,6 @@ /* Common legacy ISA style devices. */ Scope(\_SB.PCI0.ISA) { - Device(MOU) { - Name(_HID, EisaId("PNP0F13")) - Method(_STA, 0, NotSerialized) { - Return (0x0f) - } - Name(_CRS, ResourceTemplate() { - IRQNoFlags() { 12 } - }) - } - Device(FDC0) { Name(_HID, EisaId("PNP0700")) Method(_STA, 0, NotSerialized) { -- 1.8.3.1