[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v5 16/24] hw: acpi: Fix memory hotplug AML generation
From: |
Samuel Ortiz |
Subject: |
[Qemu-arm] [PATCH v5 16/24] hw: acpi: Fix memory hotplug AML generation error |
Date: |
Mon, 5 Nov 2018 02:40:39 +0100 |
From: Yang Zhong <address@hidden>
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 <address@hidden>
---
hw/acpi/memory_hotplug.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index db2c4df961..893fc2bd27 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);
--
2.19.1
[Qemu-arm] [PATCH v5 13/24] hw: acpi: Do not create hotplug method when handler is not defined, Samuel Ortiz, 2018/11/04
[Qemu-arm] [PATCH v5 16/24] hw: acpi: Fix memory hotplug AML generation error,
Samuel Ortiz <=
[Qemu-arm] [PATCH v5 14/24] hw: i386: Make the hotpluggable memory size property more generic, Samuel Ortiz, 2018/11/04
[Qemu-arm] [PATCH v5 15/24] hw: i386: Export the i386 ACPI SRAT build method, Samuel Ortiz, 2018/11/04
[Qemu-arm] [PATCH v5 17/24] hw: acpi: Export the PCI hotplug API, Samuel Ortiz, 2018/11/04
[Qemu-arm] [PATCH v5 18/24] hw: i386: Export the MADT build method, Samuel Ortiz, 2018/11/04