From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6oNg-0000JU-KZ for qemu-devel@nongnu.org; Wed, 09 Dec 2015 18:42:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a6oNf-0004ui-Om for qemu-devel@nongnu.org; Wed, 09 Dec 2015 18:42:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:27620) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6oNf-0004uX-KO for qemu-devel@nongnu.org; Wed, 09 Dec 2015 18:42:43 -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 423D449DC2 for ; Wed, 9 Dec 2015 23:42:43 +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 tB9Ng8Va005315 for ; Wed, 9 Dec 2015 18:42:42 -0500 From: Igor Mammedov Date: Thu, 10 Dec 2015 00:41:28 +0100 Message-Id: <1449704528-289297-35-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 34/74] pc: acpi: memhp: move MHPD Device into SSDT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org move remnants of MHPD device from DSDT into SSDT. i.e. Device(MHPD), _UID, _HID Signed-off-by: Igor Mammedov --- hw/acpi/memory_hotplug_acpi_table.c | 6 +++++- hw/i386/acpi-dsdt-mem-hotplug.dsl | 7 ------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/hw/acpi/memory_hotplug_acpi_table.c b/hw/acpi/memory_hotplug_acpi_table.c index 622cd5c..b913edc 100644 --- a/hw/acpi/memory_hotplug_acpi_table.c +++ b/hw/acpi/memory_hotplug_acpi_table.c @@ -39,13 +39,17 @@ void build_memory_hotplug_aml(Aml *ctx, uint32_t nr_mem, /* scope for memory hotplug controller device node */ pci_scope = aml_scope("_SB.PCI0"); - ctrl_dev = aml_scope(stringify(MEMORY_HOTPLUG_DEVICE)); + ctrl_dev = aml_device(stringify(MEMORY_HOTPLUG_DEVICE)); { Aml *a_ctrl_lock = aml_name(stringify(MEMORY_SLOT_LOCK)); Aml *a_slot_selector = aml_name(stringify(MEMORY_SLOT_SLECTOR)); Aml *a_ret_val = aml_local(0); Aml *a_slot_arg0 = aml_arg(0); + aml_append(ctrl_dev, aml_name_decl("_HID", aml_string("PNP0A06"))); + aml_append(ctrl_dev, + aml_name_decl("_UID", aml_string("Memory hotplug resources"))); + /* MHPD._STA() method */ method = aml_method("_STA", 0, AML_NOTSERIALIZED); ifctx = aml_if(aml_equal(a_slots_nr, a_zero)); diff --git a/hw/i386/acpi-dsdt-mem-hotplug.dsl b/hw/i386/acpi-dsdt-mem-hotplug.dsl index 50b7541..20c5ec1 100644 --- a/hw/i386/acpi-dsdt-mem-hotplug.dsl +++ b/hw/i386/acpi-dsdt-mem-hotplug.dsl @@ -14,10 +14,3 @@ */ External(\_SB.PCI0.MEMORY_HOTPLUG_DEVICE.MEMORY_SLOT_SCAN_METHOD, MethodObj) - - Scope(\_SB.PCI0) { - Device(MEMORY_HOTPLUG_DEVICE) { - Name(_HID, "PNP0A06") - Name(_UID, "Memory hotplug resources") - } // Device() - } // Scope() -- 1.8.3.1