Commit 15c73b0f17 for qemu.org

commit 15c73b0f17d27956b47812124b646d52181517bf
Author: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Date:   Sun Jul 5 08:31:46 2026 +0200

    hw/acpi: correct field sequence in SPCR table

    On LoongArch and RISC-V invalid SPCR tables are created:

        Terminal Type : 00
        Language : 03

    The correct values are:

        Terminal Type : 03
        Language : 00

    This is due to commit 7dd0b070fa09 ("hw/arm/virt-acpi-build.c: Migrate
    SPCR creation to common location") that swapped the fields.

    See the specification of the table in
    https://learn.microsoft.com/en-us/windows-hardware/drivers/bringup/serial-port-console-redirection-table

    This page shows version 1.10. But the sequence of the fields was not changed
    since version 1.0.

    Our LoongArch and ARM code uses version 1.07 of the specification.
    Our RISC-V code uses version 1.10 of the specification.

    Fixes: 7dd0b070fa09 ("hw/arm/virt-acpi-build.c: Migrate SPCR creation to common location")
    Origin: https://lore.kernel.org/qemu-devel/20260326121947.51200-1-heinrich.schuchardt@canonical.com/T/#u
    Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/2146419
    Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
    Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
    Message-ID: <20260705063147.199732-3-heinrich.schuchardt@canonical.com>
    Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 9b3cdd3781..990abc64cd 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -2144,10 +2144,10 @@ void build_spcr(GArray *table_data, BIOSLinker *linker,
     build_append_int_noprefix(table_data, f->stop_bits, 1);
     /* Flow Control */
     build_append_int_noprefix(table_data, f->flow_control, 1);
-    /* Language */
-    build_append_int_noprefix(table_data, f->language, 1);
     /* Terminal Type */
     build_append_int_noprefix(table_data, f->terminal_type, 1);
+    /* Language */
+    build_append_int_noprefix(table_data, f->language, 1);
     /* PCI Device ID  */
     build_append_int_noprefix(table_data, f->pci_device_id, 2);
     /* PCI Vendor ID */