diff mbox

[06/33] pc: acpi: consolidate \GPE._E02 with the rest of CPU hotplug AML

Message ID 1463496205-251412-7-git-send-email-imammedo@redhat.com
State New
Headers show

Commit Message

Igor Mammedov May 17, 2016, 2:42 p.m. UTC 
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 hw/acpi/cpu_hotplug_acpi_table.c | 4 ++++
 hw/i386/acpi-build.c             | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Marcel Apfelbaum May 30, 2016, 6:22 p.m. UTC | #1 
On 05/17/2016 05:42 PM, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
>   hw/acpi/cpu_hotplug_acpi_table.c | 4 ++++
>   hw/i386/acpi-build.c             | 4 ----
>   2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/acpi/cpu_hotplug_acpi_table.c b/hw/acpi/cpu_hotplug_acpi_table.c
> index 730f44c..c31f346 100644
> --- a/hw/acpi/cpu_hotplug_acpi_table.c
> +++ b/hw/acpi/cpu_hotplug_acpi_table.c
> @@ -235,4 +235,8 @@ void build_cpu_hotplug_aml(Aml *ctx, MachineState *machine,
>       g_free(apic_ids);
>
>       aml_append(ctx, sb_scope);
> +
> +    method = aml_method("\\_GPE._E02", 0, AML_NOTSERIALIZED);
> +    aml_append(method, aml_call0("\\_SB." CPU_SCAN_METHOD));
> +    aml_append(ctx, method);
>   }
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 822230f..63e2723 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -1952,10 +1952,6 @@ build_dsdt(GArray *table_data, GArray *linker,
>               aml_append(scope, method);
>           }
>
> -        method = aml_method("_E02", 0, AML_NOTSERIALIZED);
> -        aml_append(method, aml_call0("\\_SB." CPU_SCAN_METHOD));
> -        aml_append(scope, method);
> -
>           method = aml_method("_E03", 0, AML_NOTSERIALIZED);
>           aml_append(method, aml_call0(MEMORY_HOTPLUG_HANDLER_PATH));
>           aml_append(scope, method);
>

Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>

Thanks,
Marcel
diff mbox

Patch

diff --git a/hw/acpi/cpu_hotplug_acpi_table.c b/hw/acpi/cpu_hotplug_acpi_table.c
index 730f44c..c31f346 100644
--- a/hw/acpi/cpu_hotplug_acpi_table.c
+++ b/hw/acpi/cpu_hotplug_acpi_table.c
@@ -235,4 +235,8 @@  void build_cpu_hotplug_aml(Aml *ctx, MachineState *machine,
     g_free(apic_ids);
 
     aml_append(ctx, sb_scope);
+
+    method = aml_method("\\_GPE._E02", 0, AML_NOTSERIALIZED);
+    aml_append(method, aml_call0("\\_SB." CPU_SCAN_METHOD));
+    aml_append(ctx, method);
 }
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 822230f..63e2723 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1952,10 +1952,6 @@  build_dsdt(GArray *table_data, GArray *linker,
             aml_append(scope, method);
         }
 
-        method = aml_method("_E02", 0, AML_NOTSERIALIZED);
-        aml_append(method, aml_call0("\\_SB." CPU_SCAN_METHOD));
-        aml_append(scope, method);
-
         method = aml_method("_E03", 0, AML_NOTSERIALIZED);
         aml_append(method, aml_call0(MEMORY_HOTPLUG_HANDLER_PATH));
         aml_append(scope, method);