diff mbox series

[v5,2/8] hw/acpi: Do not create memory hotplug method when handler is not defined

Message ID 20190522162252.28568-3-shameerali.kolothum.thodi@huawei.com
State Superseded
Headers show
Series ARM virt: ACPI memory hotplug support | expand

Commit Message

Shameerali Kolothum Thodi May 22, 2019, 4:22 p.m. UTC 
From: Samuel Ortiz <sameo@linux.intel.com>


With Hardware-reduced ACPI, the GED device will manage ACPI
hotplug entirely. As a consequence, make the memory specific
events AML generation optional. The code will only be added
when the method name is not NULL.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>

Reviewed-by: Eric Auger <eric.auger@redhat.com>

---
 hw/acpi/memory_hotplug.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

-- 
2.17.1

Comments

Igor Mammedov June 20, 2019, 12:45 p.m. UTC | #1 
On Wed, 22 May 2019 17:22:46 +0100
Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> wrote:

> From: Samuel Ortiz <sameo@linux.intel.com>

> 

> With Hardware-reduced ACPI, the GED device will manage ACPI

> hotplug entirely. As a consequence, make the memory specific

> events AML generation optional. The code will only be added

> when the method name is not NULL.

> 

> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>

> Reviewed-by: Eric Auger <eric.auger@redhat.com>


Reviewed-by: Igor Mammedov <imammedo@redhat.com>


> ---

>  hw/acpi/memory_hotplug.c | 10 ++++++----

>  1 file changed, 6 insertions(+), 4 deletions(-)

> 

> diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c

> index c724f5f1e4..7e30e6f886 100644

> --- a/hw/acpi/memory_hotplug.c

> +++ b/hw/acpi/memory_hotplug.c

> @@ -719,10 +719,12 @@ 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);

>  }
diff mbox series

Patch

diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index c724f5f1e4..7e30e6f886 100644
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -719,10 +719,12 @@  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);
 }