motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 16:23:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/i386/pc: Remove PCMachineClass::rsdp_in_ram

Browse source 
PCMachineClass::rsdp_in_ram was only used by the
pc-i440fx-2.2 machine, which got removed. It is
now always true. Remove it, simplifying acpi_setup().

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20240617071118.60464-19-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-02-28 09:54:16 +01:00
parent 91616f812a
commit af8348f658
3 changed files with 4 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

27
hw/i386/acpi-build.c
View file

@ -2494,7 +2494,6 @@ static
void acpi_build(AcpiBuildTables *tables, MachineState *machine) void acpi_build(AcpiBuildTables *tables, MachineState *machine)
{ {
PCMachineState *pcms = PC_MACHINE(machine); PCMachineState *pcms = PC_MACHINE(machine);
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
X86MachineState *x86ms = X86_MACHINE(machine); X86MachineState *x86ms = X86_MACHINE(machine);
DeviceState *iommu = pcms->iommu; DeviceState *iommu = pcms->iommu;
GArray *table_offsets; GArray *table_offsets;
@ -2666,16 +2665,6 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
.rsdt_tbl_offset = &rsdt, .rsdt_tbl_offset = &rsdt,
}; };
build_rsdp(tables->rsdp, tables->linker, &rsdp_data); build_rsdp(tables->rsdp, tables->linker, &rsdp_data);
if (!pcmc->rsdp_in_ram) {
/* We used to allocate some extra space for RSDP revision 2 but
* only used the RSDP revision 0 space. The extra bytes were
* zeroed out and not used.
* Here we continue wasting those extra 16 bytes to make sure we
* don't break migration for machine types 2.2 and older due to
* RSDP blob size mismatch.
*/
build_append_int_noprefix(tables->rsdp, 0, 16);
}
} }
/* We'll expose it all to Guest so we want to reduce /* We'll expose it all to Guest so we want to reduce
@ -2754,7 +2743,6 @@ static const VMStateDescription vmstate_acpi_build = {
void acpi_setup(void) void acpi_setup(void)
{ {
PCMachineState *pcms = PC_MACHINE(qdev_get_machine()); PCMachineState *pcms = PC_MACHINE(qdev_get_machine());
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
X86MachineState *x86ms = X86_MACHINE(pcms); X86MachineState *x86ms = X86_MACHINE(pcms);
AcpiBuildTables tables; AcpiBuildTables tables;
AcpiBuildState *build_state; AcpiBuildState *build_state;
@ -2816,25 +2804,10 @@ void acpi_setup(void)
tables.vmgenid); tables.vmgenid);
} }
if (!pcmc->rsdp_in_ram) {
/*
* Keep for compatibility with old machine types.
* Though RSDP is small, its contents isn't immutable, so
* we'll update it along with the rest of tables on guest access.
*/
uint32_t rsdp_size = acpi_data_len(tables.rsdp);
build_state->rsdp = g_memdup(tables.rsdp->data, rsdp_size);
fw_cfg_add_file_callback(x86ms->fw_cfg, ACPI_BUILD_RSDP_FILE,
acpi_build_update, NULL, build_state,
build_state->rsdp, rsdp_size, true);
build_state->rsdp_mr = NULL;
} else {
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); ACPI_BUILD_RSDP_FILE);
}
qemu_register_reset(acpi_build_reset, build_state); qemu_register_reset(acpi_build_reset, build_state);
acpi_build_reset(build_state); acpi_build_reset(build_state);

1
hw/i386/pc.c
View file

@ -1763,7 +1763,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
pcmc->pci_enabled = true; pcmc->pci_enabled = true;
pcmc->has_acpi_build = true; pcmc->has_acpi_build = true;
pcmc->rsdp_in_ram = true;
pcmc->smbios_defaults = true; pcmc->smbios_defaults = true;
pcmc->gigabyte_align = true; pcmc->gigabyte_align = true;
pcmc->has_reserved_memory = true; pcmc->has_reserved_memory = true;

1
include/hw/i386/pc.h
View file

@ -100,7 +100,6 @@ struct PCMachineClass {
/* ACPI compat: */ /* ACPI compat: */
bool has_acpi_build; bool has_acpi_build;
bool rsdp_in_ram;
unsigned acpi_data_size; unsigned acpi_data_size;
int pci_root_uid; int pci_root_uid;