[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 43/49] hw: acpi: Fix memory hotplug AML generation
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 43/49] hw: acpi: Fix memory hotplug AML generation error |
Date: |
Tue, 15 Jan 2019 15:06:10 -0500 |
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>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <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 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);
--
MST
- [Qemu-devel] [PULL v2 36/49] hw/misc/edu: add msi_uninit() for pci_edu_uninit(), (continued)
- [Qemu-devel] [PULL v2 36/49] hw/misc/edu: add msi_uninit() for pci_edu_uninit(), Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 34/49] globals: Allow global properties to be optional, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 21/49] virtio: split virtio rng bits from virtio-pci, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 22/49] virtio: split virtio balloon bits from virtio-pci, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 42/49] tpm: clear RAM when "memory overwrite" requested, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 24/49] virtio: split vhost user blk bits from virtio-pci, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 32/49] virtio: split virtio crypto bits from virtio-pci.h, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 40/49] acpi: build TPM Physical Presence interface, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 41/49] acpi: add ACPI memory clear interface, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 20/49] virtio: split virtio input bits from virtio-pci, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 43/49] hw: acpi: Fix memory hotplug AML generation error,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 23/49] virtio: split virtio 9p bits from virtio-pci, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 30/49] virtio: split virtio serial bits from virtio-pci, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 49/49] migration: Use strnlen() for fixed-size string, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 44/49] acpi: update expected files, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 45/49] qemu/compiler: Define QEMU_NONSTRING, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 47/49] hw/acpi: Use QEMU_NONSTRING for non NUL-terminated arrays, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 48/49] migration: Fix stringop-truncation warning, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 46/49] block/sheepdog: Use QEMU_NONSTRING for non NUL-terminated arrays, Michael S. Tsirkin, 2019/01/15
- Re: [Qemu-devel] [PULL v2 00/49] pci, pc, virtio: fixes, features, Peter Maydell, 2019/01/17