Projects
home:dongzhihai
qemu
_service:tar_scm:arm-acpi-Fix-when-make-qemu-sy...
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File _service:tar_scm:arm-acpi-Fix-when-make-qemu-system-aarch64-at-x86_64.patch of Package qemu
From d269fb9a41abf5888a9bfeec2f8d1684b2d4dfb0 Mon Sep 17 00:00:00 2001 From: saarloos <9090-90-90-9090@163.com> Date: Sat, 30 Mar 2024 21:32:27 +0800 Subject: [PATCH] arm/acpi: Fix when make qemu-system-aarch64 at x86_64 host bios_tables_test fail reason: __aarch64__ macro let build_pptt at x86_64 and aarch64 host build different function that let bios_tables_test fail. Signed-off-by: Yangzi Zhang <zhangziyang1@huawei.com> Signed-off-by: Yuan Zhang <zhangyuan162@huawei.com> --- hw/acpi/aml-build.c | 5 +---- hw/arm/virt-acpi-build.c | 2 +- include/hw/acpi/aml-build.h | 5 +++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 714498165a..bf9c59f544 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -2016,7 +2016,6 @@ static void build_processor_hierarchy_node(GArray *tbl, uint32_t flags, } } -#ifdef __aarch64__ /* * ACPI spec, Revision 6.3 * 5.2.29.2 Cache Type Structure (Type 1) @@ -2072,7 +2071,7 @@ static void build_cache_hierarchy_node(GArray *tbl, uint32_t next_level, * ACPI spec, Revision 6.3 * 5.2.29 Processor Properties Topology Table (PPTT) */ -void build_pptt(GArray *table_data, BIOSLinker *linker, MachineState *ms, +void build_pptt_arm(GArray *table_data, BIOSLinker *linker, MachineState *ms, const char *oem_id, const char *oem_table_id) { MachineClass *mc = MACHINE_GET_CLASS(ms); @@ -2172,7 +2171,6 @@ void build_pptt(GArray *table_data, BIOSLinker *linker, MachineState *ms, acpi_table_end(linker, &table); } -#else /* * ACPI spec, Revision 6.3 * 5.2.29 Processor Properties Topology Table (PPTT) @@ -2248,7 +2246,6 @@ void build_pptt(GArray *table_data, BIOSLinker *linker, MachineState *ms, acpi_table_end(linker, &table); } -#endif /* build rev1/rev3/rev5.1/rev6.0 FADT */ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f, diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 3cb50bdc65..48fc77fb83 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -1024,7 +1024,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) if (!vmc->no_cpu_topology) { acpi_add_table(table_offsets, tables_blob); - build_pptt(tables_blob, tables->linker, ms, + build_pptt_arm(tables_blob, tables->linker, ms, vms->oem_id, vms->oem_table_id); } diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 200cb113de..7281c281f6 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -221,7 +221,6 @@ struct AcpiBuildTables { BIOSLinker *linker; } AcpiBuildTables; -#ifdef __aarch64__ /* Definitions of the hardcoded cache info*/ typedef enum { @@ -266,7 +265,6 @@ struct offset_status { uint32_t l1i_offset; }; -#endif typedef struct CrsRangeEntry { @@ -542,6 +540,9 @@ void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms, void build_pptt(GArray *table_data, BIOSLinker *linker, MachineState *ms, const char *oem_id, const char *oem_table_id); +void build_pptt_arm(GArray *table_data, BIOSLinker *linker, MachineState *ms, + const char *oem_id, const char *oem_table_id); + void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f, const char *oem_id, const char *oem_table_id); -- 2.27.0
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2