[Qemu-devel] [PATCH 08/19] pc: acpi: memhp: move MHPD.MLCK mutex into NHPT table

[Igor Mammedov]

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

diff --git a/hw/acpi/memory_hotplug_acpi_table.c 
b/hw/acpi/memory_hotplug_acpi_table.c
index c99a5c3..8a9bcd9 100644
--- a/hw/acpi/memory_hotplug_acpi_table.c
+++ b/hw/acpi/memory_hotplug_acpi_table.c
@@ -76,6 +76,8 @@ void build_mhpt(GArray *table_data, GArray *linker, uint32_t 
nr_mem,
 
         /* present, functioning, decoding, not shown in UI */
         aml_append(ctrl_dev, aml_name_decl("_STA", aml_int(0xB)));
+
+        aml_append(ctrl_dev, aml_mutex(stringify(MEMORY_SLOT_LOCK), 0));
     }
     aml_append(table, ctrl_dev);
 
diff --git a/hw/i386/acpi-dsdt-mem-hotplug.dsl 
b/hw/i386/acpi-dsdt-mem-hotplug.dsl
index b4eacc9..a1e519b 100644
--- a/hw/i386/acpi-dsdt-mem-hotplug.dsl
+++ b/hw/i386/acpi-dsdt-mem-hotplug.dsl
@@ -34,8 +34,7 @@
             External(MEMORY_SLOT_SLECTOR, FieldUnitObj) // DIMM selector, 
write only
             External(MEMORY_SLOT_OST_EVENT, FieldUnitObj) // _OST event code, 
write only
             External(MEMORY_SLOT_OST_STATUS, FieldUnitObj) // _OST status 
code, write only
-
-            Mutex (MEMORY_SLOT_LOCK, 0)
+            External(MEMORY_SLOT_LOCK, MutexObj)
 
             Method(MEMORY_SLOT_SCAN_METHOD, 0) {
                 If (LEqual(MEMORY_SLOTS_NUMBER, Zero)) {
-- 
1.8.3.1