From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43684) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zpdmp-0000OP-Po for qemu-devel@nongnu.org; Fri, 23 Oct 2015 10:57:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zpdmo-0005Yw-UJ for qemu-devel@nongnu.org; Fri, 23 Oct 2015 10:57:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44487) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zpdmo-0005Ym-QN for qemu-devel@nongnu.org; Fri, 23 Oct 2015 10:57:42 -0400 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 75712C0B2E31 for ; Fri, 23 Oct 2015 14:57:42 +0000 (UTC) From: Igor Mammedov Date: Fri, 23 Oct 2015 16:57:20 +0200 Message-Id: <1445612242-79172-18-git-send-email-imammedo@redhat.com> In-Reply-To: <1445612242-79172-1-git-send-email-imammedo@redhat.com> References: <1445612242-79172-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 17/19] pc: acpi: memhp: move MHPD Device along with _UID/_HID into MHPT table List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mst@redhat.com 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 a410619..ea308ab 100644 --- a/hw/acpi/memory_hotplug_acpi_table.c +++ b/hw/acpi/memory_hotplug_acpi_table.c @@ -36,7 +36,7 @@ void build_mhpt(GArray *table_data, GArray *linker, uint32_t nr_mem, /* scope for memory hotplug controller device node */ assert(nr_mem <= ACPI_MAX_RAM_SLOTS); - ctrl_dev = aml_scope("\\_SB.PCI0." stringify(MEMORY_HOTPLUG_DEVICE)); + ctrl_dev = aml_device("\\_SB.PCI0." stringify(MEMORY_HOTPLUG_DEVICE)); { Aml *crs, *field; Aml *a_slot_arg = aml_arg(0); @@ -44,6 +44,10 @@ void build_mhpt(GArray *table_data, GArray *linker, uint32_t nr_mem, Aml *a_ctrl_lock = aml_name(MEMORY_SLOT_LOCK); Aml *a_slot_selector = aml_name(MEMORY_SLOT_SLECTOR); + aml_append(ctrl_dev, aml_name_decl("_HID", aml_string("PNP0A06"))); + aml_append(ctrl_dev, + aml_name_decl("_UID", aml_string("Memory hotplug resources"))); + crs = aml_resource_template(); aml_append(crs, aml_io(AML_DECODE16, io_base, io_base, 0, io_len)); aml_append(ctrl_dev, aml_name_decl("_CRS", crs)); 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