[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 25/31] hw: i386: Use correct RSDT length for checksum
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 25/31] hw: i386: Use correct RSDT length for checksum |
Date: |
Mon, 17 Dec 2018 23:18:30 -0500 |
From: Igor Mammedov <address@hidden>
AcpiRsdpDescriptor describes revision 2 RSDP table so using sizeof(*rsdp)
for checksum calculation isn't correct since we are adding extra 16 bytes.
But acpi_data_push() zeroes out table, so just by luck we are summing up
exta zeros which still yelds correct checksum.
Fix it up by explicitly stating table size instead of using
pointer arithmetics on stucture.
PS:
Extra 16 bytes are still wasted, but droping them will break migration
for machines older than 2.3 due to size mismatch, for 2.3 and older it's
not an issue since they are using resizable memory regions (a1666142d)
for ACPI blobs. So keep wasting memory to avoid breaking old machines.
Fixes: 72c194f7e (i386: ACPI table generation code from seabios)
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Samuel Ortiz <address@hidden>
Signed-off-by: Samuel Ortiz <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/acpi-build.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 35f17d0d91..fb877648ac 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2550,6 +2550,11 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker)
static void
build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned rsdt_tbl_offset)
{
+ /* AcpiRsdpDescriptor describes revision 2 RSDP table and as result we
+ * allocate extra 16 bytes for pc/q35 RSDP rev1 as well. Keep extra 16
bytes
+ * wasted to make sure we won't breake migration for machine types older
+ * than 2.3 due to size mismatch.
+ */
AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp);
unsigned rsdt_pa_size = sizeof(rsdp->rsdt_physical_address);
unsigned rsdt_pa_offset =
@@ -2567,7 +2572,7 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker,
unsigned rsdt_tbl_offset)
/* Checksum to be filled by Guest linker */
bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
- (char *)rsdp - rsdp_table->data, sizeof *rsdp,
+ (char *)rsdp - rsdp_table->data, 20 /* ACPI rev 1.0 RSDP size */,
(char *)&rsdp->checksum - rsdp_table->data);
}
--
MST
- [Qemu-devel] [PULL 12/31] qapi: Define PCIe link speed and width properties, (continued)
- [Qemu-devel] [PULL 12/31] qapi: Define PCIe link speed and width properties, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 16/31] vfio/pci: Remove PCIe Link Status emulation, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 15/31] pcie: Allow generic PCIe root port to specify link speed and width, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 14/31] pcie: Fill PCIESlot link fields to support higher speeds and widths, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 17/31] pcie: Fast PCIe root ports for new machines, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 18/31] intel_iommu: dump correct iova when failed, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 19/31] intel_iommu: convert invalid traces into error reports, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 20/31] intel_iommu: dma read/write draining support, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 21/31] intel_iommu: remove "x-" prefix for "aw-bits", Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 22/31] intel_iommu: turn on IR by default, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 25/31] hw: i386: Use correct RSDT length for checksum,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 23/31] hw: acpi: The RSDP build API can return void, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 26/31] hw: arm: Carry RSDP specific data through AcpiRsdpData, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 24/31] hw: arm: acpi: Fix incorrect checksums in RSDP, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 28/31] hw: arm: Support both legacy and current RSDP build, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 27/31] hw: arm: Convert the RSDP build to the buid_append_foo() API, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 30/31] hw: acpi: Remove AcpiRsdpDescriptor and fix tests, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 31/31] hw/i386: Remove deprecated machines pc-0.10 and pc-0.11, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 29/31] hw: acpi: Export and share the ARM RSDP build, Michael S. Tsirkin, 2018/12/17
- Re: [Qemu-devel] [PULL 00/31] pci, pc, virtio: fixes, features, Michael S. Tsirkin, 2018/12/17
- Re: [Qemu-devel] [PULL 00/31] pci, pc, virtio: fixes, features, no-reply, 2018/12/24