| Message ID | 20181105014047.26447-4-sameo@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | ACPI reorganization for hardware-reduced API addition | expand |
On 05/11/2018 02:40, Samuel Ortiz wrote: > /* RSDP */ > -static GArray * > +static void > build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset) > { > AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp); > @@ -392,8 +392,6 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset) > bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE, > (char *)rsdp - rsdp_table->data, sizeof *rsdp, > (char *)&rsdp->checksum - rsdp_table->data); > - > - return rsdp_table; > } > Better than v4. :) Paolo
On Tue, Nov 06, 2018 at 11:23:39AM +0100, Paolo Bonzini wrote: > On 05/11/2018 02:40, Samuel Ortiz wrote: > > /* RSDP */ > > -static GArray * > > +static void > > build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset) > > { > > AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp); > > @@ -392,8 +392,6 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset) > > bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE, > > (char *)rsdp - rsdp_table->data, sizeof *rsdp, > > (char *)&rsdp->checksum - rsdp_table->data); > > - > > - return rsdp_table; > > } > > > > Better than v4. :) Right, I followed Philippe's advice and it does make things clearer :) Cheers, Samuel.
On Mon, 5 Nov 2018 02:40:26 +0100 Samuel Ortiz <sameo@linux.intel.com> wrote: > For both x86 and ARM architectures, the internal RSDP build API can > return void as the current return value is unused. > > Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/arm/virt-acpi-build.c | 4 +--- > hw/i386/acpi-build.c | 4 +--- > 2 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index f28a2faa53..fc59cce769 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -367,7 +367,7 @@ static void acpi_dsdt_add_power_button(Aml *scope) > } > > /* RSDP */ > -static GArray * > +static void > build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset) > { > AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp); > @@ -392,8 +392,6 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset) > bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE, > (char *)rsdp - rsdp_table->data, sizeof *rsdp, > (char *)&rsdp->checksum - rsdp_table->data); > - > - return rsdp_table; > } > > static void > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 81d98fa34f..74419d0663 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -2513,7 +2513,7 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker) > "IVRS", table_data->len - iommu_start, 1, NULL, NULL); > } > > -static GArray * > +static void > build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned rsdt_tbl_offset) > { > AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp); > @@ -2535,8 +2535,6 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned rsdt_tbl_offset) > bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE, > (char *)rsdp - rsdp_table->data, sizeof *rsdp, > (char *)&rsdp->checksum - rsdp_table->data); > - > - return rsdp_table; > } > > static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index f28a2faa53..fc59cce769 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -367,7 +367,7 @@ static void acpi_dsdt_add_power_button(Aml *scope) } /* RSDP */ -static GArray * +static void build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset) { AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp); @@ -392,8 +392,6 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset) bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE, (char *)rsdp - rsdp_table->data, sizeof *rsdp, (char *)&rsdp->checksum - rsdp_table->data); - - return rsdp_table; } static void diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 81d98fa34f..74419d0663 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2513,7 +2513,7 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker) "IVRS", table_data->len - iommu_start, 1, NULL, NULL); } -static GArray * +static void build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned rsdt_tbl_offset) { AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp); @@ -2535,8 +2535,6 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned rsdt_tbl_offset) bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE, (char *)rsdp - rsdp_table->data, sizeof *rsdp, (char *)&rsdp->checksum - rsdp_table->data); - - return rsdp_table; } static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg)
For both x86 and ARM architectures, the internal RSDP build API can return void as the current return value is unused. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> --- hw/arm/virt-acpi-build.c | 4 +--- hw/i386/acpi-build.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)