mirror of https://github.com/proxmox/mirror_qemu
acpi: Move maximum size logic into acpi_add_rom_blob()
We want to have safety margins for all tables based on the table type. Let's move the maximum size logic into acpi_add_rom_blob() and make it dependent on the table name, so we don't have to replicate for each and every instance that creates such tables. Suggested-by: Laszlo Ersek <lersek@redhat.com> Cc: Alistair Francis <alistair.francis@xilinx.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: Igor Mammedov <imammedo@redhat.com> Cc: Peter Maydell <peter.maydell@linaro.org> Cc: Shannon Zhao <shannon.zhaosl@gmail.com> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Richard Henderson <richard.henderson@linaro.org> Cc: Laszlo Ersek <lersek@redhat.com> Signed-off-by: David Hildenbrand <david@redhat.com> Message-Id: <20210304105554.121674-4-david@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>master
parent
2a3bdc5cec
commit
6930ba0d44
|
@ -27,9 +27,17 @@
|
||||||
#include "hw/loader.h"
|
#include "hw/loader.h"
|
||||||
|
|
||||||
MemoryRegion *acpi_add_rom_blob(FWCfgCallback update, void *opaque,
|
MemoryRegion *acpi_add_rom_blob(FWCfgCallback update, void *opaque,
|
||||||
GArray *blob, const char *name,
|
GArray *blob, const char *name)
|
||||||
uint64_t max_size)
|
|
||||||
{
|
{
|
||||||
|
uint64_t max_size = 0;
|
||||||
|
|
||||||
|
/* Reserve RAM space for tables: add another order of magnitude. */
|
||||||
|
if (!strcmp(name, ACPI_BUILD_TABLE_FILE)) {
|
||||||
|
max_size = 0x200000;
|
||||||
|
} else if (!strcmp(name, ACPI_BUILD_LOADER_FILE)) {
|
||||||
|
max_size = 0x10000;
|
||||||
|
}
|
||||||
|
|
||||||
return rom_add_blob(name, blob->data, acpi_data_len(blob), max_size, -1,
|
return rom_add_blob(name, blob->data, acpi_data_len(blob), max_size, -1,
|
||||||
name, update, opaque, NULL, true);
|
name, update, opaque, NULL, true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -859,14 +859,13 @@ void virt_acpi_setup(VirtMachineState *vms)
|
||||||
/* Now expose it all to Guest */
|
/* Now expose it all to Guest */
|
||||||
build_state->table_mr = acpi_add_rom_blob(virt_acpi_build_update,
|
build_state->table_mr = acpi_add_rom_blob(virt_acpi_build_update,
|
||||||
build_state, tables.table_data,
|
build_state, tables.table_data,
|
||||||
ACPI_BUILD_TABLE_FILE,
|
ACPI_BUILD_TABLE_FILE);
|
||||||
ACPI_BUILD_TABLE_MAX_SIZE);
|
|
||||||
assert(build_state->table_mr != NULL);
|
assert(build_state->table_mr != NULL);
|
||||||
|
|
||||||
build_state->linker_mr =
|
build_state->linker_mr = acpi_add_rom_blob(virt_acpi_build_update,
|
||||||
acpi_add_rom_blob(virt_acpi_build_update, build_state,
|
build_state,
|
||||||
tables.linker->cmd_blob, ACPI_BUILD_LOADER_FILE,
|
tables.linker->cmd_blob,
|
||||||
ACPI_BUILD_LOADER_MAX_SIZE);
|
ACPI_BUILD_LOADER_FILE);
|
||||||
|
|
||||||
fw_cfg_add_file(vms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data,
|
fw_cfg_add_file(vms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data,
|
||||||
acpi_data_len(tables.tcpalog));
|
acpi_data_len(tables.tcpalog));
|
||||||
|
@ -880,7 +879,7 @@ void virt_acpi_setup(VirtMachineState *vms)
|
||||||
|
|
||||||
build_state->rsdp_mr = acpi_add_rom_blob(virt_acpi_build_update,
|
build_state->rsdp_mr = acpi_add_rom_blob(virt_acpi_build_update,
|
||||||
build_state, tables.rsdp,
|
build_state, tables.rsdp,
|
||||||
ACPI_BUILD_RSDP_FILE, 0);
|
ACPI_BUILD_RSDP_FILE);
|
||||||
|
|
||||||
qemu_register_reset(virt_acpi_build_reset, build_state);
|
qemu_register_reset(virt_acpi_build_reset, build_state);
|
||||||
virt_acpi_build_reset(build_state);
|
virt_acpi_build_reset(build_state);
|
||||||
|
|
|
@ -2628,14 +2628,12 @@ void acpi_setup(void)
|
||||||
/* Now expose it all to Guest */
|
/* Now expose it all to Guest */
|
||||||
build_state->table_mr = acpi_add_rom_blob(acpi_build_update,
|
build_state->table_mr = acpi_add_rom_blob(acpi_build_update,
|
||||||
build_state, tables.table_data,
|
build_state, tables.table_data,
|
||||||
ACPI_BUILD_TABLE_FILE,
|
ACPI_BUILD_TABLE_FILE);
|
||||||
ACPI_BUILD_TABLE_MAX_SIZE);
|
|
||||||
assert(build_state->table_mr != NULL);
|
assert(build_state->table_mr != NULL);
|
||||||
|
|
||||||
build_state->linker_mr =
|
build_state->linker_mr =
|
||||||
acpi_add_rom_blob(acpi_build_update, build_state,
|
acpi_add_rom_blob(acpi_build_update, build_state,
|
||||||
tables.linker->cmd_blob, ACPI_BUILD_LOADER_FILE,
|
tables.linker->cmd_blob, ACPI_BUILD_LOADER_FILE);
|
||||||
ACPI_BUILD_LOADER_MAX_SIZE);
|
|
||||||
|
|
||||||
fw_cfg_add_file(x86ms->fw_cfg, ACPI_BUILD_TPMLOG_FILE,
|
fw_cfg_add_file(x86ms->fw_cfg, ACPI_BUILD_TPMLOG_FILE,
|
||||||
tables.tcpalog->data, acpi_data_len(tables.tcpalog));
|
tables.tcpalog->data, acpi_data_len(tables.tcpalog));
|
||||||
|
@ -2674,7 +2672,7 @@ void acpi_setup(void)
|
||||||
build_state->rsdp = NULL;
|
build_state->rsdp = NULL;
|
||||||
build_state->rsdp_mr = acpi_add_rom_blob(acpi_build_update,
|
build_state->rsdp_mr = acpi_add_rom_blob(acpi_build_update,
|
||||||
build_state, tables.rsdp,
|
build_state, tables.rsdp,
|
||||||
ACPI_BUILD_RSDP_FILE, 0);
|
ACPI_BUILD_RSDP_FILE);
|
||||||
}
|
}
|
||||||
|
|
||||||
qemu_register_reset(acpi_build_reset, build_state);
|
qemu_register_reset(acpi_build_reset, build_state);
|
||||||
|
|
|
@ -249,16 +249,12 @@ void acpi_setup_microvm(MicrovmMachineState *mms)
|
||||||
acpi_build_microvm(&tables, mms);
|
acpi_build_microvm(&tables, mms);
|
||||||
|
|
||||||
/* Now expose it all to Guest */
|
/* Now expose it all to Guest */
|
||||||
acpi_add_rom_blob(acpi_build_no_update, NULL,
|
acpi_add_rom_blob(acpi_build_no_update, NULL, tables.table_data,
|
||||||
tables.table_data,
|
ACPI_BUILD_TABLE_FILE);
|
||||||
ACPI_BUILD_TABLE_FILE,
|
acpi_add_rom_blob(acpi_build_no_update, NULL, tables.linker->cmd_blob,
|
||||||
ACPI_BUILD_TABLE_MAX_SIZE);
|
ACPI_BUILD_LOADER_FILE);
|
||||||
acpi_add_rom_blob(acpi_build_no_update, NULL,
|
acpi_add_rom_blob(acpi_build_no_update, NULL, tables.rsdp,
|
||||||
tables.linker->cmd_blob,
|
ACPI_BUILD_RSDP_FILE);
|
||||||
ACPI_BUILD_LOADER_FILE, ACPI_BUILD_LOADER_MAX_SIZE);
|
|
||||||
acpi_add_rom_blob(acpi_build_no_update, NULL,
|
|
||||||
tables.rsdp,
|
|
||||||
ACPI_BUILD_RSDP_FILE, 0);
|
|
||||||
|
|
||||||
acpi_build_tables_cleanup(&tables, false);
|
acpi_build_tables_cleanup(&tables, false);
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,10 +4,6 @@
|
||||||
#include "hw/acpi/acpi-defs.h"
|
#include "hw/acpi/acpi-defs.h"
|
||||||
#include "hw/acpi/bios-linker-loader.h"
|
#include "hw/acpi/bios-linker-loader.h"
|
||||||
|
|
||||||
/* Reserve RAM space for tables: add another order of magnitude. */
|
|
||||||
#define ACPI_BUILD_TABLE_MAX_SIZE 0x200000
|
|
||||||
#define ACPI_BUILD_LOADER_MAX_SIZE 0x10000
|
|
||||||
|
|
||||||
#define ACPI_BUILD_APPNAME6 "BOCHS "
|
#define ACPI_BUILD_APPNAME6 "BOCHS "
|
||||||
#define ACPI_BUILD_APPNAME8 "BXPC "
|
#define ACPI_BUILD_APPNAME8 "BXPC "
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,5 @@
|
||||||
#include "hw/nvram/fw_cfg.h"
|
#include "hw/nvram/fw_cfg.h"
|
||||||
|
|
||||||
MemoryRegion *acpi_add_rom_blob(FWCfgCallback update, void *opaque,
|
MemoryRegion *acpi_add_rom_blob(FWCfgCallback update, void *opaque,
|
||||||
GArray *blob, const char *name,
|
GArray *blob, const char *name);
|
||||||
uint64_t max_size);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue