From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7Ryt-00083W-Sy for qemu-devel@nongnu.org; Mon, 30 May 2016 14:32:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b7Ryn-0005Y0-V0 for qemu-devel@nongnu.org; Mon, 30 May 2016 14:32:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41221) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7Ryn-0005Xw-MN for qemu-devel@nongnu.org; Mon, 30 May 2016 14:31:57 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4D55764097 for ; Mon, 30 May 2016 18:31:57 +0000 (UTC) References: <1463496205-251412-1-git-send-email-imammedo@redhat.com> <1463496205-251412-11-git-send-email-imammedo@redhat.com> From: Marcel Apfelbaum Message-ID: <574C8716.2050709@redhat.com> Date: Mon, 30 May 2016 21:31:50 +0300 MIME-Version: 1.0 In-Reply-To: <1463496205-251412-11-git-send-email-imammedo@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 10/33] pc: acpi: simplify build_legacy_cpu_hotplug_aml() signature List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov , qemu-devel@nongnu.org Cc: mst@redhat.com, rkrcmar@redhat.com, ehabkost@redhat.com, drjones@redhat.com, armbru@redhat.com On 05/17/2016 05:43 PM, Igor Mammedov wrote: > since IO block used by CPU hotplug is fixed size and > initialized it the same file as build_legacy_cpu_hotplug_aml() > just use ACPI_GPE_PROC_LEN directly instead of passing > it around in several files. > > Signed-off-by: Igor Mammedov > --- > hw/acpi/cpu_hotplug.c | 6 +++--- > hw/i386/acpi-build.c | 5 +---- > include/hw/acpi/cpu_hotplug.h | 2 +- > 3 files changed, 5 insertions(+), 8 deletions(-) > > diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c > index 2d4e034..36ea6c2 100644 > --- a/hw/acpi/cpu_hotplug.c > +++ b/hw/acpi/cpu_hotplug.c > @@ -87,7 +87,7 @@ void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner, > } > > void build_legacy_cpu_hotplug_aml(Aml *ctx, MachineState *machine, > - uint16_t io_base, uint16_t io_len) > + uint16_t io_base) > { > Aml *dev; > Aml *crs; > @@ -226,13 +226,13 @@ void build_legacy_cpu_hotplug_aml(Aml *ctx, MachineState *machine, > aml_append(dev, aml_name_decl("_STA", aml_int(0xB))); > crs = aml_resource_template(); > aml_append(crs, > - aml_io(AML_DECODE16, io_base, io_base, 1, io_len) > + aml_io(AML_DECODE16, io_base, io_base, 1, ACPI_GPE_PROC_LEN) > ); > aml_append(dev, aml_name_decl("_CRS", crs)); > aml_append(sb_scope, dev); > /* declare CPU hotplug MMIO region and PRS field to access it */ > aml_append(sb_scope, aml_operation_region( > - "PRST", AML_SYSTEM_IO, aml_int(io_base), io_len)); > + "PRST", AML_SYSTEM_IO, aml_int(io_base), ACPI_GPE_PROC_LEN)); > field = aml_field("PRST", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE); > aml_append(field, aml_named_field("PRS", 256)); > aml_append(sb_scope, field); > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 2f6de43..b33fec9 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -94,7 +94,6 @@ typedef struct AcpiPmInfo { > uint32_t gpe0_blk_len; > uint32_t io_base; > uint16_t cpu_hp_io_base; > - uint16_t cpu_hp_io_len; > uint16_t mem_hp_io_base; > uint16_t mem_hp_io_len; > uint16_t pcihp_io_base; > @@ -142,7 +141,6 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) > } > assert(obj); > > - pm->cpu_hp_io_len = ACPI_GPE_PROC_LEN; > pm->mem_hp_io_base = ACPI_MEMORY_HOTPLUG_BASE; > pm->mem_hp_io_len = ACPI_MEMORY_HOTPLUG_IO_LEN; > > @@ -1935,8 +1933,7 @@ build_dsdt(GArray *table_data, GArray *linker, > build_q35_pci0_int(dsdt); > } > > - build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base, > - pm->cpu_hp_io_len); > + build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base); > build_memory_hotplug_aml(dsdt, nr_mem, pm->mem_hp_io_base, > pm->mem_hp_io_len); > > diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h > index 241b50f..6d729d8 100644 > --- a/include/hw/acpi/cpu_hotplug.h > +++ b/include/hw/acpi/cpu_hotplug.h > @@ -28,5 +28,5 @@ void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner, > AcpiCpuHotplug *gpe_cpu, uint16_t base); > > void build_legacy_cpu_hotplug_aml(Aml *ctx, MachineState *machine, > - uint16_t io_base, uint16_t io_len); > + uint16_t io_base); > #endif > Reviewed-by: Marcel Apfelbaum Thanks, Marcel