[Qemu-devel] [PATCH 07/19] pc: acpi: memhp: move MHPD._STA method into MHPT table

[Igor Mammedov]

Signed-off-by: Igor Mammedov <address@hidden>
---
 hw/acpi/memory_hotplug_acpi_table.c | 3 +++
 hw/i386/acpi-dsdt-mem-hotplug.dsl   | 8 --------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/hw/acpi/memory_hotplug_acpi_table.c 
b/hw/acpi/memory_hotplug_acpi_table.c
index 28da13c..c99a5c3 100644
--- a/hw/acpi/memory_hotplug_acpi_table.c
+++ b/hw/acpi/memory_hotplug_acpi_table.c
@@ -73,6 +73,9 @@ void build_mhpt(GArray *table_data, GArray *linker, uint32_t 
nr_mem,
         aml_append(field, /* _OST status code, write only */
             aml_named_field(stringify(MEMORY_SLOT_OST_STATUS), 32));
         aml_append(ctrl_dev, field);
+
+        /* present, functioning, decoding, not shown in UI */
+        aml_append(ctrl_dev, aml_name_decl("_STA", aml_int(0xB)));
     }
     aml_append(table, ctrl_dev);
 
diff --git a/hw/i386/acpi-dsdt-mem-hotplug.dsl 
b/hw/i386/acpi-dsdt-mem-hotplug.dsl
index c2bb6a1..b4eacc9 100644
--- a/hw/i386/acpi-dsdt-mem-hotplug.dsl
+++ b/hw/i386/acpi-dsdt-mem-hotplug.dsl
@@ -35,14 +35,6 @@
             External(MEMORY_SLOT_OST_EVENT, FieldUnitObj) // _OST event code, 
write only
             External(MEMORY_SLOT_OST_STATUS, FieldUnitObj) // _OST status 
code, write only
 
-            Method(_STA, 0) {
-                If (LEqual(MEMORY_SLOTS_NUMBER, Zero)) {
-                    Return(0x0)
-                }
-                /* present, functioning, decoding, not shown in UI */
-                Return(0xB)
-            }
-
             Mutex (MEMORY_SLOT_LOCK, 0)
 
             Method(MEMORY_SLOT_SCAN_METHOD, 0) {
-- 
1.8.3.1