From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52377) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9XzT-0002Wp-PF for qemu-devel@nongnu.org; Sun, 05 Jun 2016 09:21:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9XzO-0004uu-0D for qemu-devel@nongnu.org; Sun, 05 Jun 2016 09:21:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60690) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9XzN-0004un-RE for qemu-devel@nongnu.org; Sun, 05 Jun 2016 09:21:13 -0400 Date: Sun, 5 Jun 2016 16:21:10 +0300 From: "Michael S. Tsirkin" Message-ID: <1465132825-14242-7-git-send-email-mst@redhat.com> References: <1465132825-14242-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1465132825-14242-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 06/25] pc: acpi: consolidate \GPE._E02 with the rest of CPU hotplug AML List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Igor Mammedov , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost From: Igor Mammedov Signed-off-by: Igor Mammedov Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Marcel Apfelbaum --- 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); -- MST