| Message ID | 20181105014047.26447-3-sameo@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | ACPI reorganization for hardware-reduced API addition | expand |
On Mon, 5 Nov 2018 02:40:25 +0100 Samuel Ortiz <sameo@linux.intel.com> wrote: > This is going to be needed by the Hardware-reduced ACPI routines. > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> the patch is probably misplaced withing series, if there is an external user within this series then this patch should be squashed there, otherwise it doesn't belong to this series. > --- > include/hw/acpi/aml-build.h | 2 ++ > hw/acpi/aml-build.c | 8 ++++++++ > hw/i386/acpi-build.c | 8 -------- > 3 files changed, 10 insertions(+), 8 deletions(-) > > diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h > index 6c36903c0a..73fc6659f2 100644 > --- a/include/hw/acpi/aml-build.h > +++ b/include/hw/acpi/aml-build.h > @@ -384,6 +384,8 @@ build_header(BIOSLinker *linker, GArray *table_data, > const char *oem_id, const char *oem_table_id); > void *acpi_data_push(GArray *table_data, unsigned size); > unsigned acpi_data_len(GArray *table); > +/* Align AML blob size to a multiple of 'align' */ > +void acpi_align_size(GArray *blob, unsigned align); > void acpi_add_table(GArray *table_offsets, GArray *table_data); > void acpi_build_tables_init(AcpiBuildTables *tables); > void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre); > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c > index 1e43cd736d..51b608432f 100644 > --- a/hw/acpi/aml-build.c > +++ b/hw/acpi/aml-build.c > @@ -1565,6 +1565,14 @@ unsigned acpi_data_len(GArray *table) > return table->len; > } > > +void acpi_align_size(GArray *blob, unsigned align) > +{ > + /* Align size to multiple of given size. This reduces the chance > + * we need to change size in the future (breaking cross version migration). > + */ > + g_array_set_size(blob, ROUND_UP(acpi_data_len(blob), align)); > +} > + > void acpi_add_table(GArray *table_offsets, GArray *table_data) > { > uint32_t offset = table_data->len; > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index d0362e1382..81d98fa34f 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -282,14 +282,6 @@ static void acpi_get_pci_holes(Range *hole, Range *hole64) > NULL)); > } > > -static void acpi_align_size(GArray *blob, unsigned align) > -{ > - /* Align size to multiple of given size. This reduces the chance > - * we need to change size in the future (breaking cross version migration). > - */ > - g_array_set_size(blob, ROUND_UP(acpi_data_len(blob), align)); > -} > - > /* FACS */ > static void > build_facs(GArray *table_data, BIOSLinker *linker)
On Fri, Nov 09, 2018 at 03:27:16PM +0100, Igor Mammedov wrote: > On Mon, 5 Nov 2018 02:40:25 +0100 > Samuel Ortiz <sameo@linux.intel.com> wrote: > > > This is going to be needed by the Hardware-reduced ACPI routines. > > > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> > the patch is probably misplaced withing series, > if there is an external user within this series then this patch should > be squashed there, otherwise it doesn't belong to this series. hw/acpi/reduced.c needs it, I forgot to remove that patch when removing the hardware-reduced code from the serie. I will remove it. Cheers, Samuel.
diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 6c36903c0a..73fc6659f2 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -384,6 +384,8 @@ build_header(BIOSLinker *linker, GArray *table_data, const char *oem_id, const char *oem_table_id); void *acpi_data_push(GArray *table_data, unsigned size); unsigned acpi_data_len(GArray *table); +/* Align AML blob size to a multiple of 'align' */ +void acpi_align_size(GArray *blob, unsigned align); void acpi_add_table(GArray *table_offsets, GArray *table_data); void acpi_build_tables_init(AcpiBuildTables *tables); void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre); diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 1e43cd736d..51b608432f 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1565,6 +1565,14 @@ unsigned acpi_data_len(GArray *table) return table->len; } +void acpi_align_size(GArray *blob, unsigned align) +{ + /* Align size to multiple of given size. This reduces the chance + * we need to change size in the future (breaking cross version migration). + */ + g_array_set_size(blob, ROUND_UP(acpi_data_len(blob), align)); +} + void acpi_add_table(GArray *table_offsets, GArray *table_data) { uint32_t offset = table_data->len; diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index d0362e1382..81d98fa34f 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -282,14 +282,6 @@ static void acpi_get_pci_holes(Range *hole, Range *hole64) NULL)); } -static void acpi_align_size(GArray *blob, unsigned align) -{ - /* Align size to multiple of given size. This reduces the chance - * we need to change size in the future (breaking cross version migration). - */ - g_array_set_size(blob, ROUND_UP(acpi_data_len(blob), align)); -} - /* FACS */ static void build_facs(GArray *table_data, BIOSLinker *linker)