[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 24/30] hw: i386: Use correct RSDT length for check
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 24/30] hw: i386: Use correct RSDT length for checksum |
Date: |
Tue, 18 Dec 2018 11:13:26 -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 v2 12/30] qapi: Define PCIe link speed and width properties, (continued)
- [Qemu-devel] [PULL v2 12/30] qapi: Define PCIe link speed and width properties, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 13/30] pcie: Add link speed and width fields to PCIESlot, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 15/30] pcie: Allow generic PCIe root port to specify link speed and width, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 14/30] pcie: Fill PCIESlot link fields to support higher speeds and widths, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 16/30] vfio/pci: Remove PCIe Link Status emulation, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 17/30] pcie: Fast PCIe root ports for new machines, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 18/30] intel_iommu: dump correct iova when failed, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 19/30] intel_iommu: convert invalid traces into error reports, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 21/30] intel_iommu: remove "x-" prefix for "aw-bits", Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 20/30] intel_iommu: dma read/write draining support, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 24/30] hw: i386: Use correct RSDT length for checksum,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 23/30] hw: arm: acpi: Fix incorrect checksums in RSDP, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 22/30] hw: acpi: The RSDP build API can return void, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 27/30] hw: arm: Support both legacy and current RSDP build, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 26/30] hw: arm: Convert the RSDP build to the buid_append_foo() API, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 25/30] hw: arm: Carry RSDP specific data through AcpiRsdpData, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 29/30] hw: acpi: Remove AcpiRsdpDescriptor and fix tests, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 30/30] hw/i386: Remove deprecated machines pc-0.10 and pc-0.11, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 28/30] hw: acpi: Export and share the ARM RSDP build, Michael S. Tsirkin, 2018/12/18
- Re: [Qemu-devel] [PULL v2 00/30] pci, pc, virtio: fixes, features, Peter Maydell, 2018/12/19