summary refs log tree commit diff stats
path: root/hw/i386/acpi-build.c
diff options
context:
space:
mode:
authorIgor Mammedov <imammedo@redhat.com>2015-12-28 18:02:23 +0100
committerMichael S. Tsirkin <mst@redhat.com>2016-01-09 23:20:17 +0200
commitfbd7a6b8e2f68970370665187893a3c80c69d555 (patch)
tree939373d07b27df9a4111060d36251ae67404ddda /hw/i386/acpi-build.c
parent1295e21a17083a2babfcf12511c1b2ebfdcc978d (diff)
downloadfocaccia-qemu-fbd7a6b8e2f68970370665187893a3c80c69d555.tar.gz
focaccia-qemu-fbd7a6b8e2f68970370665187893a3c80c69d555.zip
pc: acpi: cpuhp: move CPEJ() method to 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/i386/acpi-build.c')
-rw-r--r--hw/i386/acpi-build.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 42e60c1d3a..53b29163a2 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1080,6 +1080,7 @@ build_ssdt(GArray *table_data, GArray *linker,
     /* Reserve space for header */
     acpi_data_push(ssdt->buf, sizeof(AcpiTableHeader));
 
+    build_cpu_hotplug_aml(ssdt);
     build_memory_hotplug_aml(ssdt, nr_mem, pm->mem_hp_io_base,
                              pm->mem_hp_io_len);
 
@@ -1326,7 +1327,7 @@ build_ssdt(GArray *table_data, GArray *linker,
 
             method = aml_method("_EJ0", 1, AML_NOTSERIALIZED);
             aml_append(method,
-                aml_return(aml_call2("CPEJ", aml_int(i), aml_arg(0)))
+                aml_return(aml_call2(CPU_EJECT_METHOD, aml_int(i), aml_arg(0)))
             );
             aml_append(dev, method);