summary refs log tree commit diff stats
path: root/hw/acpi/memory_hotplug_acpi_table.c
diff options
context:
space:
mode:
authorIgor Mammedov <imammedo@redhat.com>2015-12-28 18:02:16 +0100
committerMichael S. Tsirkin <mst@redhat.com>2016-01-08 16:01:38 +0200
commite328e316608d696519d8248319ec323868db5dee (patch)
treecc999c88cc5d934b8f602663fc1ba81877b40bf2 /hw/acpi/memory_hotplug_acpi_table.c
parent2fbd884372668a077ecaa9a7f878dff96ccdf286 (diff)
downloadfocaccia-qemu-e328e316608d696519d8248319ec323868db5dee.tar.gz
focaccia-qemu-e328e316608d696519d8248319ec323868db5dee.zip
pc: acpi: memhp: move MHPD.MEJ0 method into SSDT
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>


Diffstat (limited to 'hw/acpi/memory_hotplug_acpi_table.c')
-rw-r--r--hw/acpi/memory_hotplug_acpi_table.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/hw/acpi/memory_hotplug_acpi_table.c b/hw/acpi/memory_hotplug_acpi_table.c
index 4edf68009c..c2bfcd6b8a 100644
--- a/hw/acpi/memory_hotplug_acpi_table.c
+++ b/hw/acpi/memory_hotplug_acpi_table.c
@@ -152,6 +152,19 @@ void build_memory_hotplug_aml(Aml *ctx, uint32_t nr_mem,
             aml_append(method, aml_release(ctrl_lock));
         }
         aml_append(mem_ctrl_dev, method);
+
+        method = aml_method(stringify(MEMORY_SLOT_EJECT_METHOD), 2,
+                            AML_NOTSERIALIZED);
+        {
+            Aml *eject = aml_name(stringify(MEMORY_SLOT_EJECT));
+
+            aml_append(method, aml_acquire(ctrl_lock, 0xFFFF));
+            aml_append(method, aml_store(aml_to_integer(slot_arg0),
+                                         slot_selector));
+            aml_append(method, aml_store(one, eject));
+            aml_append(method, aml_release(ctrl_lock));
+        }
+        aml_append(mem_ctrl_dev, method);
     }
     aml_append(pci_scope, mem_ctrl_dev);
     aml_append(ctx, pci_scope);