@samitouri / QOSamiQemu / commits / 362cb4ca35

acpi: Add parameters to pass cache descriptions to ACPI build_pptt()

Add optional parameters to pass cache descriptions to build_pptt(). Update ARM and Loongarch callers to pass none for now. Reviewed-by: Gustavo Romero <gustavo.romero@linaro.org> Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com> Signed-off-by: Alireza Sanaee <alireza.sanaee@huawei.com> Message-id: 20260311160609.358-6-alireza.sanaee@huawei.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Alireza Sanaee committed Apr 23, 2026 at 10:24 UTC 362cb4ca353a18f3d3cdf6e27d39e90d7fceb65b
4 files changed +8 -5
hw/acpi/aml-build.c
+2 -1
@@ -2155,7 +2155,8 @@ void build_spcr(GArray *table_data, BIOSLinker *linker,
2155 * 5.2.29 Processor Properties Topology Table (PPTT)
2156 */
2157 void build_pptt(GArray *table_data, BIOSLinker *linker, MachineState *ms,
2158 - const char *oem_id, const char *oem_table_id)
2158 + const char *oem_id, const char *oem_table_id,
2159 + int num_caches, CPUCoreCaches *caches)
2160 {
2161 MachineClass *mc = MACHINE_GET_CLASS(ms);
2162 CPUArchIdList *cpus = ms->possible_cpus;
hw/arm/virt-acpi-build.c
+1 -1
@@ -1277,7 +1277,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
1277 if (!vmc->no_cpu_topology) {
1278 acpi_add_table(table_offsets, tables_blob);
1279 build_pptt(tables_blob, tables->linker, ms,
1280 - vms->oem_id, vms->oem_table_id);
1280 + vms->oem_id, vms->oem_table_id, 0, NULL);
1281 }
1282
1283 acpi_add_table(table_offsets, tables_blob);
hw/loongarch/virt-acpi-build.c
+2 -2
@@ -538,8 +538,8 @@ static void acpi_build(AcpiBuildTables *tables, MachineState *machine)
538 build_madt(tables_blob, tables->linker, lvms);
539
540 acpi_add_table(table_offsets, tables_blob);
541 - build_pptt(tables_blob, tables->linker, machine,
542 - lvms->oem_id, lvms->oem_table_id);
541 + build_pptt(tables_blob, tables->linker, machine, lvms->oem_id,
542 + lvms->oem_table_id, 0, NULL);
543
544 acpi_add_table(table_offsets, tables_blob);
545 build_srat(tables_blob, tables->linker, machine);
include/hw/acpi/aml-build.h
+3 -1
@@ -3,6 +3,7 @@
3
4 #include "hw/acpi/acpi-defs.h"
5 #include "hw/acpi/bios-linker-loader.h"
6 +#include "hw/core/cpu.h"
7
8 #define ACPI_BUILD_APPNAME6 "BOCHS "
9 #define ACPI_BUILD_APPNAME8 "BXPC "
@@ -499,7 +500,8 @@ void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms,
500 const char *oem_id, const char *oem_table_id);
501
502 void build_pptt(GArray *table_data, BIOSLinker *linker, MachineState *ms,
502 - const char *oem_id, const char *oem_table_id);
503 + const char *oem_id, const char *oem_table_id,
504 + int num_caches, CPUCoreCaches *caches);
505
506 void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,
507 const char *oem_id, const char *oem_table_id);