Skip to content

Commit bac78f9

Browse files
shamiali2008mstsirkin
authored andcommitted
acpi: Use macro for table-loader file name
Use macro for "etc/table-loader" and move it to the header file similar to ACPI_BUILD_TABLE_FILE/ACPI_BUILD_RSDP_FILE etc. Signed-off-by: Shameer Kolothum <[email protected]> Reviewed-by: Igor Mammedov <[email protected]> Message-Id: <[email protected]> Reviewed-by: Michael S. Tsirkin <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
1 parent b372d79 commit bac78f9

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

hw/arm/virt-acpi-build.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ void virt_acpi_setup(VirtMachineState *vms)
929929

930930
build_state->linker_mr =
931931
acpi_add_rom_blob(virt_acpi_build_update, build_state,
932-
tables.linker->cmd_blob, "etc/table-loader", 0);
932+
tables.linker->cmd_blob, ACPI_BUILD_LOADER_FILE, 0);
933933

934934
fw_cfg_add_file(vms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data,
935935
acpi_data_len(tables.tcpalog));

hw/i386/acpi-build.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3043,7 +3043,7 @@ void acpi_setup(void)
30433043

30443044
build_state->linker_mr =
30453045
acpi_add_rom_blob(acpi_build_update, build_state,
3046-
tables.linker->cmd_blob, "etc/table-loader", 0);
3046+
tables.linker->cmd_blob, ACPI_BUILD_LOADER_FILE, 0);
30473047

30483048
fw_cfg_add_file(x86ms->fw_cfg, ACPI_BUILD_TPMLOG_FILE,
30493049
tables.tcpalog->data, acpi_data_len(tables.tcpalog));

include/hw/acpi/aml-build.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#define ACPI_BUILD_TABLE_FILE "etc/acpi/tables"
1414
#define ACPI_BUILD_RSDP_FILE "etc/acpi/rsdp"
1515
#define ACPI_BUILD_TPMLOG_FILE "etc/tpm/log"
16+
#define ACPI_BUILD_LOADER_FILE "etc/table-loader"
1617

1718
#define AML_NOTIFY_METHOD "NTFY"
1819

0 commit comments

Comments
 (0)