summaryrefslogtreecommitdiffstats
path: root/hw/acpi/memory_hotplug.c
diff options
context:
space:
mode:
authorYang Zhong2018-11-05 02:40:39 +0100
committerMichael S. Tsirkin2019-01-18 03:10:57 +0100
commite674132ae759c182d46b2e2d4cb9390d145eb6f5 (patch)
tree61aa5f5aff4bab4d135b29112ba249f4b45d5efa /hw/acpi/memory_hotplug.c
parenttpm: clear RAM when "memory overwrite" requested (diff)
downloadqemu-e674132ae759c182d46b2e2d4cb9390d145eb6f5.tar.gz
qemu-e674132ae759c182d46b2e2d4cb9390d145eb6f5.tar.xz
qemu-e674132ae759c182d46b2e2d4cb9390d145eb6f5.zip
hw: acpi: Fix memory hotplug AML generation error
When using the generated memory hotplug AML, the iasl compiler would give the following error: dsdt.dsl 266: Return (MOST (_UID, Arg0, Arg1, Arg2)) Error 6080 - Called method returns no value ^ Signed-off-by: Yang Zhong <yang.zhong@intel.com> Reviewed-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.c')
-rw-r--r--hw/acpi/memory_hotplug.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index 8c7c1013f3..921cad2c5e 100644
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -686,15 +686,15 @@ void build_memory_hotplug_aml(Aml *table, uint32_t nr_mem,
method = aml_method("_OST", 3, AML_NOTSERIALIZED);
s = MEMORY_SLOT_OST_METHOD;
- aml_append(method, aml_return(aml_call4(
- s, aml_name("_UID"), aml_arg(0), aml_arg(1), aml_arg(2)
- )));
+ aml_append(method,
+ aml_call4(s, aml_name("_UID"), aml_arg(0),
+ aml_arg(1), aml_arg(2)));
aml_append(dev, method);
method = aml_method("_EJ0", 1, AML_NOTSERIALIZED);
s = MEMORY_SLOT_EJECT_METHOD;
- aml_append(method, aml_return(aml_call2(
- s, aml_name("_UID"), aml_arg(0))));
+ aml_append(method,
+ aml_call2(s, aml_name("_UID"), aml_arg(0)));
aml_append(dev, method);
aml_append(dev_container, dev);