qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH 17/19] pc: acpi: memhp: move MHPD Device along with


From: Igor Mammedov
Subject: [Qemu-devel] [PATCH 17/19] pc: acpi: memhp: move MHPD Device along with _UID/_HID into MHPT table
Date: Fri, 23 Oct 2015 16:57:20 +0200

Signed-off-by: Igor Mammedov <address@hidden>
---
 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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]