| Message ID | 1459905949-10358-2-git-send-email-boris.ostrovsky@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 06.04.16 at 03:25, <boris.ostrovsky@oracle.com> wrote: > @@ -856,6 +857,12 @@ int hpet_exists(unsigned long hpet_base) > return ((hpet_id >> 16) == 0x8086); > } > > +void hvmloader_acpi_build_tables(struct acpi_config *config, > + unsigned int physical) > +{ > + acpi_build_tables(config, physical); > +} I guess later patches will make clear why this is an improvement. On its own it doesn't look worthwhile. Jan
On 06/02/2016 08:42 AM, Jan Beulich wrote: >>>> On 06.04.16 at 03:25, <boris.ostrovsky@oracle.com> wrote: >> @@ -856,6 +857,12 @@ int hpet_exists(unsigned long hpet_base) >> return ((hpet_id >> 16) == 0x8086); >> } >> >> +void hvmloader_acpi_build_tables(struct acpi_config *config, >> + unsigned int physical) >> +{ >> + acpi_build_tables(config, physical); >> +} > I guess later patches will make clear why this is an improvement. > On its own it doesn't look worthwhile. > This is really to make reviewing easier. Not an improvement of any kind. -boris
diff --git a/tools/firmware/hvmloader/ovmf.c b/tools/firmware/hvmloader/ovmf.c index db9fa7a..74fec56 100644 --- a/tools/firmware/hvmloader/ovmf.c +++ b/tools/firmware/hvmloader/ovmf.c @@ -125,7 +125,7 @@ static void ovmf_acpi_build_tables(void) .dsdt_15cpu_len = 0 }; - acpi_build_tables(&config, ACPI_PHYSICAL_ADDRESS); + hvmloader_acpi_build_tables(&config, ACPI_PHYSICAL_ADDRESS); } static void ovmf_create_smbios_tables(void) diff --git a/tools/firmware/hvmloader/rombios.c b/tools/firmware/hvmloader/rombios.c index 1f15b94..1f8fc2d 100644 --- a/tools/firmware/hvmloader/rombios.c +++ b/tools/firmware/hvmloader/rombios.c @@ -180,7 +180,7 @@ static void rombios_acpi_build_tables(void) .dsdt_15cpu_len = dsdt_15cpu_len, }; - acpi_build_tables(&config, ACPI_PHYSICAL_ADDRESS); + hvmloader_acpi_build_tables(&config, ACPI_PHYSICAL_ADDRESS); } static void rombios_create_mp_tables(void) diff --git a/tools/firmware/hvmloader/seabios.c b/tools/firmware/hvmloader/seabios.c index c6b3d9f..9f66a79 100644 --- a/tools/firmware/hvmloader/seabios.c +++ b/tools/firmware/hvmloader/seabios.c @@ -100,7 +100,7 @@ static void seabios_acpi_build_tables(void) .dsdt_15cpu_len = 0, }; - acpi_build_tables(&config, rsdp); + hvmloader_acpi_build_tables(&config, rsdp); add_table(rsdp); } diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index 9382709..9af29b1 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -21,6 +21,7 @@ #include "config.h" #include "hypercall.h" #include "ctype.h" +#include "acpi/acpi2_0.h" #include <stdint.h> #include <xen/xen.h> #include <xen/memory.h> @@ -856,6 +857,12 @@ int hpet_exists(unsigned long hpet_base) return ((hpet_id >> 16) == 0x8086); } +void hvmloader_acpi_build_tables(struct acpi_config *config, + unsigned int physical) +{ + acpi_build_tables(config, physical); +} + /* * Local variables: * mode: C diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h index 3126817..b226df4 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -273,6 +273,10 @@ extern struct e820map memory_map; bool check_overlap(uint64_t start, uint64_t size, uint64_t reserved_start, uint64_t reserved_size); +struct acpi_config; +void hvmloader_acpi_build_tables(struct acpi_config *config, + unsigned int physical); + #endif /* __HVMLOADER_UTIL_H__ */ /*
In preparation for moving out ACPI builder make all BIOSes call hvmloader_acpi_build_tables() instead of calling ACPI code directly. Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> --- tools/firmware/hvmloader/ovmf.c | 2 +- tools/firmware/hvmloader/rombios.c | 2 +- tools/firmware/hvmloader/seabios.c | 2 +- tools/firmware/hvmloader/util.c | 7 +++++++ tools/firmware/hvmloader/util.h | 4 ++++ 5 files changed, 14 insertions(+), 3 deletions(-)