[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v5 13/24] hw: acpi: Do not create hotplug method when
From: |
Samuel Ortiz |
Subject: |
[Qemu-arm] [PATCH v5 13/24] hw: acpi: Do not create hotplug method when handler is not defined |
Date: |
Mon, 5 Nov 2018 02:40:36 +0100 |
CPU and memory ACPI hotplug are not necessarily handled through SCI
events. For example, with Hardware-reduced ACPI, the GED device will
manage ACPI hotplug entirely.
As a consequence, we make the CPU and memory specific events AML
generation optional. The code will only be added when the method name is
not NULL.
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Samuel Ortiz <address@hidden>
---
hw/acpi/cpu.c | 8 +++++---
hw/acpi/memory_hotplug.c | 11 +++++++----
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c
index f10b190019..cd41377b5a 100644
--- a/hw/acpi/cpu.c
+++ b/hw/acpi/cpu.c
@@ -569,9 +569,11 @@ void build_cpus_aml(Aml *table, MachineState *machine,
CPUHotplugFeatures opts,
aml_append(sb_scope, cpus_dev);
aml_append(table, sb_scope);
- method = aml_method(event_handler_method, 0, AML_NOTSERIALIZED);
- aml_append(method, aml_call0("\\_SB.CPUS." CPU_SCAN_METHOD));
- aml_append(table, method);
+ if (event_handler_method) {
+ method = aml_method(event_handler_method, 0, AML_NOTSERIALIZED);
+ aml_append(method, aml_call0("\\_SB.CPUS." CPU_SCAN_METHOD));
+ aml_append(table, method);
+ }
g_free(cphp_res_path);
}
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index 8c7c1013f3..db2c4df961 100644
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -715,10 +715,13 @@ void build_memory_hotplug_aml(Aml *table, uint32_t nr_mem,
}
aml_append(table, dev_container);
- method = aml_method(event_handler_method, 0, AML_NOTSERIALIZED);
- aml_append(method,
- aml_call0(MEMORY_DEVICES_CONTAINER "." MEMORY_SLOT_SCAN_METHOD));
- aml_append(table, method);
+ if (event_handler_method) {
+ method = aml_method(event_handler_method, 0, AML_NOTSERIALIZED);
+ aml_append(method,
+ aml_call0(MEMORY_DEVICES_CONTAINER "."
+ MEMORY_SLOT_SCAN_METHOD));
+ aml_append(table, method);
+ }
g_free(mhp_res_path);
}
--
2.19.1
- Re: [Qemu-arm] [Qemu-devel] [PATCH v5 10/24] hw: acpi: Export the PCI host and holes getters, (continued)
[Qemu-arm] [PATCH v5 12/24] hw: acpi: Export the MCFG getter, Samuel Ortiz, 2018/11/04
[Qemu-arm] [PATCH v5 11/24] hw: acpi: Export and generalize the PCI host AML API, Samuel Ortiz, 2018/11/04
[Qemu-arm] [PATCH v5 13/24] hw: acpi: Do not create hotplug method when handler is not defined,
Samuel Ortiz <=
[Qemu-arm] [PATCH v5 16/24] hw: acpi: Fix memory hotplug AML generation error, Samuel Ortiz, 2018/11/04
[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