From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Zhao Liu" <zhao1.liu@intel.com>
Subject: [PATCH v5 19/23] hw/i386/acpi: Remove AcpiBuildState::rsdp field
Date: Wed, 29 May 2024 07:15:35 +0200 [thread overview]
Message-ID: <20240529051539.71210-20-philmd@linaro.org> (raw)
In-Reply-To: <20240529051539.71210-1-philmd@linaro.org>
AcpiBuildState::rsdp is always NULL, remove it,
simplifying acpi_build_update().
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
---
hw/i386/acpi-build.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index ed0adb0e82..6f9925d176 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2459,7 +2459,6 @@ struct AcpiBuildState {
MemoryRegion *table_mr;
/* Is table patched? */
uint8_t patched;
- void *rsdp;
MemoryRegion *rsdp_mr;
MemoryRegion *linker_mr;
} AcpiBuildState;
@@ -2715,11 +2714,7 @@ static void acpi_build_update(void *build_opaque)
acpi_ram_update(build_state->table_mr, tables.table_data);
- if (build_state->rsdp) {
- memcpy(build_state->rsdp, tables.rsdp->data, acpi_data_len(tables.rsdp));
- } else {
- acpi_ram_update(build_state->rsdp_mr, tables.rsdp);
- }
+ acpi_ram_update(build_state->rsdp_mr, tables.rsdp);
acpi_ram_update(build_state->linker_mr, tables.linker->cmd_blob);
acpi_build_tables_cleanup(&tables, true);
@@ -2805,7 +2800,6 @@ void acpi_setup(void)
tables.vmgenid);
}
- build_state->rsdp = NULL;
build_state->rsdp_mr = acpi_add_rom_blob(acpi_build_update,
build_state, tables.rsdp,
ACPI_BUILD_RSDP_FILE);
--
2.41.0
next prev parent reply other threads:[~2024-05-29 5:19 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-29 5:15 [PATCH v5 00/23] hw/i386: Remove deprecated pc-i440fx-2.0 -> 2.3 machines Philippe Mathieu-Daudé
2024-05-29 5:15 ` [PATCH v5 01/23] hw/i386/pc: Deprecate 2.4 to 2.12 pc-i440fx machines Philippe Mathieu-Daudé
2024-05-29 12:51 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 02/23] hw/i386/pc: Remove deprecated pc-i440fx-2.0 machine Philippe Mathieu-Daudé
2024-05-29 12:58 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 03/23] hw/usb/hcd-xhci: Remove XHCI_FLAG_FORCE_PCIE_ENDCAP flag Philippe Mathieu-Daudé
2024-05-29 13:15 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 04/23] hw/usb/hcd-xhci: Remove XHCI_FLAG_SS_FIRST flag Philippe Mathieu-Daudé
2024-05-29 13:16 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 05/23] hw/i386/acpi: Remove PCMachineClass::legacy_acpi_table_size Philippe Mathieu-Daudé
2024-05-29 13:48 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 06/23] hw/acpi/ich9: Remove 'memory-hotplug-support' property Philippe Mathieu-Daudé
2024-05-29 13:52 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 07/23] hw/acpi/ich9: Remove dead code related to 'acpi_memory_hotplug' Philippe Mathieu-Daudé
2024-05-29 13:54 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 08/23] hw/i386/pc: Remove deprecated pc-i440fx-2.1 machine Philippe Mathieu-Daudé
2024-05-29 14:00 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 09/23] target/i386/kvm: Remove x86_cpu_change_kvm_default() and 'kvm-cpu.h' Philippe Mathieu-Daudé
2024-05-29 14:18 ` Igor Mammedov
2024-05-29 14:23 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 10/23] hw/i386/pc: Remove PCMachineClass::smbios_uuid_encoded Philippe Mathieu-Daudé
2024-05-29 14:24 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 11/23] hw/smbios: Remove 'uuid_encoded' argument from smbios_set_defaults() Philippe Mathieu-Daudé
2024-05-29 14:25 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 12/23] hw/smbios: Remove 'smbios_uuid_encoded', simplify smbios_encode_uuid() Philippe Mathieu-Daudé
2024-05-29 14:26 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 13/23] hw/i386/pc: Remove PCMachineClass::enforce_aligned_dimm Philippe Mathieu-Daudé
2024-05-29 14:30 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 14/23] hw/mem/pc-dimm: Remove legacy_align argument from pc_dimm_pre_plug() Philippe Mathieu-Daudé
2024-05-29 14:31 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 15/23] hw/mem/memory-device: Remove legacy_align from memory_device_pre_plug() Philippe Mathieu-Daudé
2024-05-29 14:33 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 16/23] hw/i386/pc: Remove deprecated pc-i440fx-2.2 machine Philippe Mathieu-Daudé
2024-05-29 14:45 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 17/23] hw/i386/pc: Remove PCMachineClass::resizable_acpi_blob Philippe Mathieu-Daudé
2024-05-29 15:07 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 18/23] hw/i386/pc: Remove PCMachineClass::rsdp_in_ram Philippe Mathieu-Daudé
2024-05-29 14:49 ` Igor Mammedov
2024-05-29 15:08 ` Igor Mammedov
2024-05-29 5:15 ` Philippe Mathieu-Daudé [this message]
2024-05-29 14:51 ` [PATCH v5 19/23] hw/i386/acpi: Remove AcpiBuildState::rsdp field Igor Mammedov
2024-05-29 15:08 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 20/23] hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine Philippe Mathieu-Daudé
2024-05-29 6:02 ` Thomas Huth
2024-05-29 6:38 ` Zhao Liu
2024-05-29 15:08 ` Igor Mammedov
2024-05-29 5:15 ` [PATCH v5 21/23] hw/i386/pc: Simplify DEFINE_I440FX_MACHINE() macro Philippe Mathieu-Daudé
2024-05-29 6:04 ` Thomas Huth
2024-05-29 6:33 ` Zhao Liu
2024-06-03 11:33 ` Daniel P. Berrangé
2024-05-29 5:15 ` [PATCH v5 22/23] target/i386: Remove X86CPU::kvm_no_smi_migration field Philippe Mathieu-Daudé
2024-05-29 6:07 ` Thomas Huth
2024-05-29 5:15 ` [PATCH v5 23/23] hw/i386/pc: Replace PCMachineClass::acpi_data_size by PC_ACPI_DATA_SIZE Philippe Mathieu-Daudé
2024-05-29 15:15 ` Igor Mammedov
2024-05-29 6:00 ` [PATCH v5 00/23] hw/i386: Remove deprecated pc-i440fx-2.0 -> 2.3 machines Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240529051539.71210-20-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=berrange@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=zhao1.liu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).