* [PULL 00/13] Firmware 20260901 patches
@ 2026-09-01 8:25 Gerd Hoffmann
2026-09-01 8:25 ` [PULL 01/13] tests/acpi: enable updates Gerd Hoffmann
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: Gerd Hoffmann @ 2026-09-01 8:25 UTC (permalink / raw)
To: qemu-devel
Cc: Gerd Hoffmann, Igor Mammedov, Peter Maydell, qemu-arm, Ani Sinha,
Michael S. Tsirkin
The following changes since commit d2e570cc0f97b936902a5b1b86b73c0f5998b475:
Merge tag 'pull-ppc-for-11.2-20260828' of https://gitlab.com/harshpb/qemu into staging (2026-08-28 15:17:04 -0700)
are available in the Git repository at:
https://gitlab.com/kraxel/qemu.git tags/firmware-20260901-pull-request
for you to fetch changes up to 5ce32f7fdb786014255d4cfff749de307cdfdbfa:
hw/misc/vmlaunchupdate: do not clear control bits upon fw-cfg select op (2026-09-01 09:25:53 +0200)
----------------------------------------------------------------
- edk2: update to 2026-08 stable tag
- edk2: remove 32-bit platforms (following upstream removal)
- acpi: test updates for the new edk2 firmware
- igvm/vmlaunchupdate: fix control bit handling
----------------------------------------------------------------
Ani Sinha (1):
hw/misc/vmlaunchupdate: do not clear control bits upon fw-cfg select
op
Gerd Hoffmann (12):
tests/acpi: enable updates
edk2: update build script
edk2: update submodule to edk2-stable202608
edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars
edk2: drop 32-bit binaries (ia32 and arm)
edk2: rename risc-v firmware builds
edk2: update binaries to edk2-stable202608
tests/acpi: log the name of the table checked
tests/acpi: skip FPDT oem field test
tests/acpi: update expected data files
tests/acpi: add FPDT table data for loongarch
tests/acpi: disable updates
roms/edk2-build.py | 21 +++++--
tests/functional/aarch64/test_virt_vbsa.py | 2 +-
hw/misc/vmlaunchupdate.c | 1 -
tests/qtest/bios-tables-test.c | 54 ++++++++++--------
pc-bios/descriptors/50-edk2-i386-secure.json | 34 -----------
pc-bios/descriptors/60-edk2-aarch64.json | 2 +-
pc-bios/descriptors/60-edk2-arm.json | 31 ----------
pc-bios/descriptors/60-edk2-i386.json | 33 -----------
pc-bios/descriptors/60-edk2-riscv64.json | 4 +-
pc-bios/descriptors/meson.build | 3 -
pc-bios/edk2-aarch64-code.fd.bz2 | Bin 1565763 -> 1703355 bytes
...m-vars.fd.bz2 => edk2-aarch64-vars.fd.bz2} | Bin
pc-bios/edk2-arm-code.fd.bz2 | Bin 1570311 -> 0 bytes
pc-bios/edk2-i386-code.fd.bz2 | Bin 1780004 -> 0 bytes
pc-bios/edk2-i386-secure-code.fd.bz2 | Bin 1858666 -> 0 bytes
pc-bios/edk2-i386-vars.fd.bz2 | Bin 190 -> 0 bytes
pc-bios/edk2-loongarch64-code.fd.bz2 | Bin 1148383 -> 1315494 bytes
pc-bios/edk2-riscv-code.fd.bz2 | Bin 1296526 -> 0 bytes
pc-bios/edk2-riscv64-code.fd.bz2 | Bin 0 -> 1270019 bytes
...v-vars.fd.bz2 => edk2-riscv64-vars.fd.bz2} | Bin
pc-bios/edk2-x86_64-code.fd.bz2 | Bin 1907255 -> 2191408 bytes
pc-bios/edk2-x86_64-microvm.fd.bz2 | Bin 1787244 -> 2040860 bytes
pc-bios/edk2-x86_64-secure-code.fd.bz2 | Bin 1962992 -> 2366778 bytes
pc-bios/meson.build | 10 +---
roms/edk2 | 2 +-
roms/edk2-build.config | 52 +++--------------
roms/edk2-version | 4 +-
tests/data/acpi/aarch64/virt/HEST | Bin 224 -> 224 bytes
tests/data/acpi/aarch64/virt/SSDT.memhp | Bin 1817 -> 1817 bytes
tests/data/acpi/loongarch64/virt/FPDT | Bin 0 -> 68 bytes
tests/data/acpi/loongarch64/virt/FPDT.numamem | Bin 0 -> 68 bytes
31 files changed, 65 insertions(+), 188 deletions(-)
delete mode 100644 pc-bios/descriptors/50-edk2-i386-secure.json
delete mode 100644 pc-bios/descriptors/60-edk2-arm.json
delete mode 100644 pc-bios/descriptors/60-edk2-i386.json
rename pc-bios/{edk2-arm-vars.fd.bz2 => edk2-aarch64-vars.fd.bz2} (100%)
delete mode 100644 pc-bios/edk2-arm-code.fd.bz2
delete mode 100644 pc-bios/edk2-i386-code.fd.bz2
delete mode 100644 pc-bios/edk2-i386-secure-code.fd.bz2
delete mode 100644 pc-bios/edk2-i386-vars.fd.bz2
delete mode 100644 pc-bios/edk2-riscv-code.fd.bz2
create mode 100644 pc-bios/edk2-riscv64-code.fd.bz2
rename pc-bios/{edk2-riscv-vars.fd.bz2 => edk2-riscv64-vars.fd.bz2} (100%)
create mode 100644 tests/data/acpi/loongarch64/virt/FPDT
create mode 100644 tests/data/acpi/loongarch64/virt/FPDT.numamem
--
2.55.0
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PULL 01/13] tests/acpi: enable updates
2026-09-01 8:25 [PULL 00/13] Firmware 20260901 patches Gerd Hoffmann
@ 2026-09-01 8:25 ` Gerd Hoffmann
2026-09-01 8:25 ` [PULL 02/13] edk2: update build script Gerd Hoffmann
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Gerd Hoffmann @ 2026-09-01 8:25 UTC (permalink / raw)
To: qemu-devel
Cc: Gerd Hoffmann, Igor Mammedov, Peter Maydell, qemu-arm, Ani Sinha,
Michael S. Tsirkin
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-ID: <20260824164751.1700783-2-kraxel@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8bf4..8c982848d47e 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,4 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/aarch64/virt/HEST",
+"tests/data/acpi/aarch64/virt/SSDT.memhp",
+"tests/data/acpi/loongarch64/virt/FPDT",
--
2.55.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PULL 02/13] edk2: update build script
2026-09-01 8:25 [PULL 00/13] Firmware 20260901 patches Gerd Hoffmann
2026-09-01 8:25 ` [PULL 01/13] tests/acpi: enable updates Gerd Hoffmann
@ 2026-09-01 8:25 ` Gerd Hoffmann
2026-09-01 8:25 ` [PULL 03/13] edk2: update submodule to edk2-stable202608 Gerd Hoffmann
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Gerd Hoffmann @ 2026-09-01 8:25 UTC (permalink / raw)
To: qemu-devel
Cc: Gerd Hoffmann, Igor Mammedov, Peter Maydell, qemu-arm, Ani Sinha,
Michael S. Tsirkin, Philippe Mathieu-Daudé,
Philippe Mathieu-Daudé
sync with https://gitlab.com/kraxel/edk2-build-config/
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-ID: <20260824164751.1700783-3-kraxel@redhat.com>
---
roms/edk2-build.py | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/roms/edk2-build.py b/roms/edk2-build.py
index e564765aaa71..c4bfbae4cffb 100755
--- a/roms/edk2-build.py
+++ b/roms/edk2-build.py
@@ -51,7 +51,17 @@ def get_toolchain(cfg, build):
return cfg[build]['tool']
if cfg.has_option('global', 'tool'):
return cfg['global']['tool']
- return 'GCC5'
+ return 'GCC'
+
+def get_hostarch():
+ mach = os.uname().machine
+ if mach == 'x86_64':
+ return 'X64'
+ if mach == 'aarch64':
+ return 'AARCH64'
+ if mach == 'riscv64':
+ return 'RISCV64'
+ return 'UNKNOWN'
def get_version(cfg, silent = False):
coredir = get_coredir(cfg)
@@ -137,7 +147,7 @@ def build_run(cmdline, name, section, silent = False, nologs = False):
print(f'### exit code: {result.returncode}')
else:
secs = int(time.time() - start)
- print(f'### OK ({int(secs/60)}:{secs%60:02d})')
+ print(f'### OK ({int(secs)}sec)')
else:
print(cmdline, flush = True)
result = subprocess.run(cmdline, check = False)
@@ -191,7 +201,10 @@ def build_one(cfg, build, jobs = None, silent = False, nologs = False):
if jobs:
cmdline += [ '-n', jobs ]
for arch in b['arch'].split():
- cmdline += [ '-a', arch ]
+ if arch == 'HOST':
+ cmdline += [ '-a', get_hostarch() ]
+ else:
+ cmdline += [ '-a', arch ]
if 'opts' in b:
for name in b['opts'].split():
section = 'opts.' + name
@@ -235,7 +248,7 @@ def build_one(cfg, build, jobs = None, silent = False, nologs = False):
def build_basetools(silent = False, nologs = False):
build_message('building: BaseTools', silent = silent)
- basedir = os.environ['EDK_TOOLS_PATH']
+ basedir = os.environ['EDK_TOOLS_PATH'] + '/Source/C'
cmdline = [ 'make', '-C', basedir ]
build_run(cmdline, 'BaseTools', 'build.basetools', silent, nologs)
--
2.55.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PULL 03/13] edk2: update submodule to edk2-stable202608
2026-09-01 8:25 [PULL 00/13] Firmware 20260901 patches Gerd Hoffmann
2026-09-01 8:25 ` [PULL 01/13] tests/acpi: enable updates Gerd Hoffmann
2026-09-01 8:25 ` [PULL 02/13] edk2: update build script Gerd Hoffmann
@ 2026-09-01 8:25 ` Gerd Hoffmann
2026-09-01 8:25 ` [PULL 04/13] edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars Gerd Hoffmann
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Gerd Hoffmann @ 2026-09-01 8:25 UTC (permalink / raw)
To: qemu-devel
Cc: Gerd Hoffmann, Igor Mammedov, Peter Maydell, qemu-arm, Ani Sinha,
Michael S. Tsirkin, Luigi Leonardi
Reviewed-by: Luigi Leonardi <leonardi@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-ID: <20260824164751.1700783-4-kraxel@redhat.com>
---
roms/edk2 | 2 +-
roms/edk2-version | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/roms/edk2 b/roms/edk2
index 4dfdca63a934..2970e5699ba6 160000
--- a/roms/edk2
+++ b/roms/edk2
@@ -1 +1 @@
-Subproject commit 4dfdca63a93497203f197ec98ba20e2327e4afe4
+Subproject commit 2970e5699ba6267f3384ffab20f96647578aebc8
diff --git a/roms/edk2-version b/roms/edk2-version
index 069f19f8bf49..8a0cf62749cf 100644
--- a/roms/edk2-version
+++ b/roms/edk2-version
@@ -1,2 +1,2 @@
-EDK2_STABLE = edk2-stable202408
-EDK2_DATE = 08/13/2024
+EDK2_STABLE = edk2-stable202608
+EDK2_DATE = 08/12/2026
--
2.55.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PULL 04/13] edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars
2026-09-01 8:25 [PULL 00/13] Firmware 20260901 patches Gerd Hoffmann
` (2 preceding siblings ...)
2026-09-01 8:25 ` [PULL 03/13] edk2: update submodule to edk2-stable202608 Gerd Hoffmann
@ 2026-09-01 8:25 ` Gerd Hoffmann
2026-09-01 8:25 ` [PULL 06/13] edk2: rename risc-v firmware builds Gerd Hoffmann
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Gerd Hoffmann @ 2026-09-01 8:25 UTC (permalink / raw)
To: qemu-devel
Cc: Gerd Hoffmann, Igor Mammedov, Peter Maydell, qemu-arm, Ani Sinha,
Michael S. Tsirkin, Philippe Mathieu-Daudé
Upstream edk2 has dropped support for 32-bit architectures.
Remove the build config for these builds.
Update aarch64 config and test cases, aarch64 used to share
the 'vars' image with arm.
Drop references to the 32-bit builds in a number of places.
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-ID: <20260824164751.1700783-5-kraxel@redhat.com>
---
tests/functional/aarch64/test_virt_vbsa.py | 2 +-
tests/qtest/bios-tables-test.c | 34 +++++++--------
pc-bios/descriptors/50-edk2-i386-secure.json | 34 ---------------
pc-bios/descriptors/60-edk2-aarch64.json | 2 +-
pc-bios/descriptors/60-edk2-arm.json | 31 --------------
pc-bios/descriptors/60-edk2-i386.json | 33 ---------------
pc-bios/descriptors/meson.build | 3 --
pc-bios/meson.build | 6 +--
roms/edk2-build.config | 44 ++------------------
9 files changed, 23 insertions(+), 166 deletions(-)
delete mode 100644 pc-bios/descriptors/50-edk2-i386-secure.json
delete mode 100644 pc-bios/descriptors/60-edk2-arm.json
delete mode 100644 pc-bios/descriptors/60-edk2-i386.json
diff --git a/tests/functional/aarch64/test_virt_vbsa.py b/tests/functional/aarch64/test_virt_vbsa.py
index 04b5ff0f9e8d..97293fb7883d 100755
--- a/tests/functional/aarch64/test_virt_vbsa.py
+++ b/tests/functional/aarch64/test_virt_vbsa.py
@@ -35,7 +35,7 @@ def append_firmware_blobs(self):
Setup QEMU firmware blobs for boot.
"""
code_path = self.build_file('pc-bios', 'edk2-aarch64-code.fd')
- vars_source = self.build_file('pc-bios', 'edk2-arm-vars.fd')
+ vars_source = self.build_file('pc-bios', 'edk2-aarch64-vars.fd')
vars_path = self.scratch_file('vars.fd')
shutil.copy(vars_source, vars_path)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 5cc526510ac1..9aadc1a1f6c3 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1640,7 +1640,7 @@ static void test_acpi_aarch64_virt_tcg_memhp(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 256ULL * MiB,
@@ -1671,7 +1671,7 @@ static void test_acpi_aarch64_virt_acpi_pci_hotplug(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 256ULL * MiB,
@@ -1695,7 +1695,7 @@ static void test_acpi_aarch64_virt_pcie_root_port_hpoff(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 256ULL * MiB,
@@ -1809,7 +1809,7 @@ static void test_acpi_aarch64_virt_tcg_numamem(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
@@ -1832,7 +1832,7 @@ static void test_acpi_aarch64_virt_tcg_pxb(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
};
@@ -1865,7 +1865,7 @@ static void test_acpi_aarch64_virt_tcg_acpi_spcr(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * 1024 * 1024,
@@ -1945,7 +1945,7 @@ static void test_acpi_aarch64_virt_tcg_acpi_hmat(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
@@ -2221,7 +2221,7 @@ static void test_acpi_aarch64_virt_tcg(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
@@ -2242,7 +2242,7 @@ static void test_acpi_aarch64_virt_tcg_topology(void)
.variant = ".topology",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
@@ -2265,7 +2265,7 @@ static void test_acpi_aarch64_virt_tcg_its_off(void)
.variant = ".its_off",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * 1024 * 1024,
@@ -2284,7 +2284,7 @@ static void test_acpi_aarch64_virt_tcg_msi_gicv2m(void)
.variant = ".msi_gicv2m",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * 1024 * 1024,
@@ -2303,7 +2303,7 @@ static void test_acpi_aarch64_virt_tcg_wdat(void)
.variant = ".wdat",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
@@ -2322,7 +2322,7 @@ static void test_acpi_aarch64_virt_tcg_gtdt_wd(void)
.variant = ".gwdt",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
@@ -2407,7 +2407,7 @@ static void test_acpi_aarch64_virt_viot(void)
.variant = ".viot",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
@@ -2425,7 +2425,7 @@ static void test_acpi_aarch64_virt_smmuv3_legacy(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
};
@@ -2464,7 +2464,7 @@ static void test_acpi_aarch64_virt_smmuv3_dev(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
};
@@ -2683,7 +2683,7 @@ static void test_acpi_aarch64_virt_oem_fields(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
diff --git a/pc-bios/descriptors/50-edk2-i386-secure.json b/pc-bios/descriptors/50-edk2-i386-secure.json
deleted file mode 100644
index d7108c1da05a..000000000000
--- a/pc-bios/descriptors/50-edk2-i386-secure.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "description": "UEFI firmware for i386, with Secure Boot and SMM",
- "interface-types": [
- "uefi"
- ],
- "mapping": {
- "device": "flash",
- "executable": {
- "filename": "@DATADIR@/edk2-i386-secure-code.fd",
- "format": "raw"
- },
- "nvram-template": {
- "filename": "@DATADIR@/edk2-i386-vars.fd",
- "format": "raw"
- }
- },
- "targets": [
- {
- "architecture": "i386",
- "machines": [
- "pc-q35-*"
- ]
- }
- ],
- "features": [
- "acpi-s3",
- "requires-smm",
- "secure-boot",
- "verbose-dynamic"
- ],
- "tags": [
-
- ]
-}
diff --git a/pc-bios/descriptors/60-edk2-aarch64.json b/pc-bios/descriptors/60-edk2-aarch64.json
index 800a21bda691..94926172959c 100644
--- a/pc-bios/descriptors/60-edk2-aarch64.json
+++ b/pc-bios/descriptors/60-edk2-aarch64.json
@@ -10,7 +10,7 @@
"format": "raw"
},
"nvram-template": {
- "filename": "@DATADIR@/edk2-arm-vars.fd",
+ "filename": "@DATADIR@/edk2-aarch64-vars.fd",
"format": "raw"
}
},
diff --git a/pc-bios/descriptors/60-edk2-arm.json b/pc-bios/descriptors/60-edk2-arm.json
deleted file mode 100644
index d5f1bba6cc82..000000000000
--- a/pc-bios/descriptors/60-edk2-arm.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "description": "UEFI firmware for arm",
- "interface-types": [
- "uefi"
- ],
- "mapping": {
- "device": "flash",
- "executable": {
- "filename": "@DATADIR@/edk2-arm-code.fd",
- "format": "raw"
- },
- "nvram-template": {
- "filename": "@DATADIR@/edk2-arm-vars.fd",
- "format": "raw"
- }
- },
- "targets": [
- {
- "architecture": "arm",
- "machines": [
- "virt-*"
- ]
- }
- ],
- "features": [
- "verbose-static"
- ],
- "tags": [
-
- ]
-}
diff --git a/pc-bios/descriptors/60-edk2-i386.json b/pc-bios/descriptors/60-edk2-i386.json
deleted file mode 100644
index 2f8dec74fecb..000000000000
--- a/pc-bios/descriptors/60-edk2-i386.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "description": "UEFI firmware for i386",
- "interface-types": [
- "uefi"
- ],
- "mapping": {
- "device": "flash",
- "executable": {
- "filename": "@DATADIR@/edk2-i386-code.fd",
- "format": "raw"
- },
- "nvram-template": {
- "filename": "@DATADIR@/edk2-i386-vars.fd",
- "format": "raw"
- }
- },
- "targets": [
- {
- "architecture": "i386",
- "machines": [
- "pc-i440fx-*",
- "pc-q35-*"
- ]
- }
- ],
- "features": [
- "acpi-s3",
- "verbose-dynamic"
- ],
- "tags": [
-
- ]
-}
diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.build
index cdd0be01a356..63f1c00b6406 100644
--- a/pc-bios/descriptors/meson.build
+++ b/pc-bios/descriptors/meson.build
@@ -1,10 +1,7 @@
if unpack_edk2_blobs and get_option('install_blobs')
foreach f: [
- '50-edk2-i386-secure.json',
'50-edk2-x86_64-secure.json',
'60-edk2-aarch64.json',
- '60-edk2-arm.json',
- '60-edk2-i386.json',
'60-edk2-x86_64.json',
'60-edk2-loongarch64.json',
'60-edk2-riscv64.json'
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index 2f470ed12942..f7412bf53e69 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -2,13 +2,9 @@ roms = []
if unpack_edk2_blobs
fds = [
'edk2-aarch64-code.fd',
- 'edk2-arm-code.fd',
- 'edk2-arm-vars.fd',
+ 'edk2-aarch64-vars.fd',
'edk2-riscv-code.fd',
'edk2-riscv-vars.fd',
- 'edk2-i386-code.fd',
- 'edk2-i386-secure-code.fd',
- 'edk2-i386-vars.fd',
'edk2-x86_64-code.fd',
'edk2-x86_64-secure-code.fd',
'edk2-loongarch64-code.fd',
diff --git a/roms/edk2-build.config b/roms/edk2-build.config
index 9e45361fb445..fcf9da8c7681 100644
--- a/roms/edk2-build.config
+++ b/roms/edk2-build.config
@@ -33,29 +33,6 @@ PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD1
# shim.efi has broken MemAttr code
PcdUninstallMemAttrProtocol = TRUE
-####################################################################################
-# i386
-
-[build.ovmf.i386]
-desc = ovmf build (32-bit)
-conf = OvmfPkg/OvmfPkgIa32.dsc
-arch = IA32
-opts = common
-plat = OvmfIa32
-dest = ../pc-bios
-cpy1 = FV/OVMF_CODE.fd edk2-i386-code.fd
-cpy2 = FV/OVMF_VARS.fd edk2-i386-vars.fd
-
-[build.ovmf.i386.secure]
-desc = ovmf build (32-bit, secure boot)
-conf = OvmfPkg/OvmfPkgIa32.dsc
-arch = IA32
-opts = common
- ovmf.sb.smm
-plat = OvmfIa32
-dest = ../pc-bios
-cpy1 = FV/OVMF_CODE.fd edk2-i386-secure-code.fd
-
####################################################################################
# x86_64
@@ -87,23 +64,6 @@ plat = MicrovmX64
dest = ../pc-bios
cpy1 = FV/MICROVM.fd edk2-x86_64-microvm.fd
-####################################################################################
-# arm
-
-[build.armvirt.arm]
-desc = ArmVirt build, 32-bit (arm v7)
-conf = ArmVirtPkg/ArmVirtQemu.dsc
-arch = ARM
-opts = common
- armvirt.silent
-pcds = nx.broken.shim.grub
-plat = ArmVirtQemu-ARM
-dest = ../pc-bios
-cpy1 = FV/QEMU_EFI.fd edk2-arm-code.fd
-cpy2 = FV/QEMU_VARS.fd edk2-arm-vars.fd
-pad1 = edk2-arm-code.fd 64m
-pad2 = edk2-arm-vars.fd 64m
-
####################################################################################
# aarch64
@@ -114,10 +74,12 @@ arch = AARCH64
opts = common
armvirt.silent
pcds = nx.broken.shim.grub
-plat = ArmVirtQemu-AARCH64
+plat = ArmVirtQemu-AArch64
dest = ../pc-bios
cpy1 = FV/QEMU_EFI.fd edk2-aarch64-code.fd
+cpy2 = FV/QEMU_VARS.fd edk2-aarch64-vars.fd
pad1 = edk2-aarch64-code.fd 64m
+pad2 = edk2-aarch64-vars.fd 64m
####################################################################################
# riscv64
--
2.55.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PULL 06/13] edk2: rename risc-v firmware builds
2026-09-01 8:25 [PULL 00/13] Firmware 20260901 patches Gerd Hoffmann
` (3 preceding siblings ...)
2026-09-01 8:25 ` [PULL 04/13] edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars Gerd Hoffmann
@ 2026-09-01 8:25 ` Gerd Hoffmann
2026-09-01 8:25 ` [PULL 08/13] tests/acpi: log the name of the table checked Gerd Hoffmann
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Gerd Hoffmann @ 2026-09-01 8:25 UTC (permalink / raw)
To: qemu-devel
Cc: Gerd Hoffmann, Igor Mammedov, Peter Maydell, qemu-arm, Ani Sinha,
Michael S. Tsirkin, Philippe Mathieu-Daudé,
Philippe Mathieu-Daudé
'riscv' => 'riscv64', for consistency with the other
architectures which all have '64' in the name.
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-ID: <20260824164751.1700783-7-kraxel@redhat.com>
---
tests/qtest/bios-tables-test.c | 12 ++++++------
pc-bios/descriptors/60-edk2-riscv64.json | 4 ++--
...2-riscv-code.fd.bz2 => edk2-riscv64-code.fd.bz2} | Bin
...2-riscv-vars.fd.bz2 => edk2-riscv64-vars.fd.bz2} | Bin
pc-bios/meson.build | 4 ++--
roms/edk2-build.config | 8 ++++----
6 files changed, 14 insertions(+), 14 deletions(-)
rename pc-bios/{edk2-riscv-code.fd.bz2 => edk2-riscv64-code.fd.bz2} (100%)
rename pc-bios/{edk2-riscv-vars.fd.bz2 => edk2-riscv64-vars.fd.bz2} (100%)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 9aadc1a1f6c3..8fc470daa086 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1782,8 +1782,8 @@ static void test_acpi_riscv64_virt_tcg_numamem(void)
.machine = "virt",
.arch = "riscv64",
.tcg_only = true,
- .uefi_fl1 = "pc-bios/edk2-riscv-code.fd",
- .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd",
+ .uefi_fl1 = "pc-bios/edk2-riscv64-code.fd",
+ .uefi_fl2 = "pc-bios/edk2-riscv64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2",
.ram_start = 0x80000000ULL,
.scan_len = 128ULL * MiB,
@@ -1883,8 +1883,8 @@ static void test_acpi_riscv64_virt_tcg_acpi_spcr(void)
.machine = "virt",
.arch = "riscv64",
.tcg_only = true,
- .uefi_fl1 = "pc-bios/edk2-riscv-code.fd",
- .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd",
+ .uefi_fl1 = "pc-bios/edk2-riscv64-code.fd",
+ .uefi_fl2 = "pc-bios/edk2-riscv64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2",
.ram_start = 0x80000000ULL,
.scan_len = 128ULL * 1024 * 1024,
@@ -2198,8 +2198,8 @@ static void test_acpi_riscv64_virt_tcg(void)
.machine = "virt",
.arch = "riscv64",
.tcg_only = true,
- .uefi_fl1 = "pc-bios/edk2-riscv-code.fd",
- .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd",
+ .uefi_fl1 = "pc-bios/edk2-riscv64-code.fd",
+ .uefi_fl2 = "pc-bios/edk2-riscv64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2",
.ram_start = 0x80000000ULL,
.scan_len = 128ULL * MiB,
diff --git a/pc-bios/descriptors/60-edk2-riscv64.json b/pc-bios/descriptors/60-edk2-riscv64.json
index 14811ca307f6..7f03083d5e0b 100644
--- a/pc-bios/descriptors/60-edk2-riscv64.json
+++ b/pc-bios/descriptors/60-edk2-riscv64.json
@@ -6,11 +6,11 @@
"mapping": {
"device": "flash",
"executable": {
- "filename": "@DATADIR@/edk2-riscv-code.fd",
+ "filename": "@DATADIR@/edk2-riscv64-code.fd",
"format": "raw"
},
"nvram-template": {
- "filename": "@DATADIR@/edk2-riscv-vars.fd",
+ "filename": "@DATADIR@/edk2-riscv64-vars.fd",
"format": "raw"
}
},
diff --git a/pc-bios/edk2-riscv-code.fd.bz2 b/pc-bios/edk2-riscv64-code.fd.bz2
similarity index 100%
rename from pc-bios/edk2-riscv-code.fd.bz2
rename to pc-bios/edk2-riscv64-code.fd.bz2
diff --git a/pc-bios/edk2-riscv-vars.fd.bz2 b/pc-bios/edk2-riscv64-vars.fd.bz2
similarity index 100%
rename from pc-bios/edk2-riscv-vars.fd.bz2
rename to pc-bios/edk2-riscv64-vars.fd.bz2
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index f7412bf53e69..961d99fde4e6 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -3,8 +3,8 @@ if unpack_edk2_blobs
fds = [
'edk2-aarch64-code.fd',
'edk2-aarch64-vars.fd',
- 'edk2-riscv-code.fd',
- 'edk2-riscv-vars.fd',
+ 'edk2-riscv64-code.fd',
+ 'edk2-riscv64-vars.fd',
'edk2-x86_64-code.fd',
'edk2-x86_64-secure-code.fd',
'edk2-loongarch64-code.fd',
diff --git a/roms/edk2-build.config b/roms/edk2-build.config
index fcf9da8c7681..96ebc3bcd9e7 100644
--- a/roms/edk2-build.config
+++ b/roms/edk2-build.config
@@ -89,10 +89,10 @@ conf = OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc
arch = RISCV64
plat = RiscVVirtQemu
dest = ../pc-bios
-cpy1 = FV/RISCV_VIRT_CODE.fd edk2-riscv-code.fd
-cpy2 = FV/RISCV_VIRT_VARS.fd edk2-riscv-vars.fd
-pad1 = edk2-riscv-code.fd 32m
-pad2 = edk2-riscv-vars.fd 32m
+cpy1 = FV/RISCV_VIRT_CODE.fd edk2-riscv64-code.fd
+cpy2 = FV/RISCV_VIRT_VARS.fd edk2-riscv64-vars.fd
+pad1 = edk2-riscv64-code.fd 32m
+pad2 = edk2-riscv64-vars.fd 32m
####################################################################################
# LoongArch64
--
2.55.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PULL 08/13] tests/acpi: log the name of the table checked
2026-09-01 8:25 [PULL 00/13] Firmware 20260901 patches Gerd Hoffmann
` (4 preceding siblings ...)
2026-09-01 8:25 ` [PULL 06/13] edk2: rename risc-v firmware builds Gerd Hoffmann
@ 2026-09-01 8:25 ` Gerd Hoffmann
2026-09-01 8:25 ` [PULL 09/13] tests/acpi: skip FPDT oem field test Gerd Hoffmann
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Gerd Hoffmann @ 2026-09-01 8:25 UTC (permalink / raw)
To: qemu-devel
Cc: Gerd Hoffmann, Igor Mammedov, Peter Maydell, qemu-arm, Ani Sinha,
Michael S. Tsirkin, Philippe Mathieu-Daudé
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-ID: <20260824164751.1700783-9-kraxel@redhat.com>
---
tests/qtest/bios-tables-test.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 8fc470daa086..a85ca8e98253 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -2616,6 +2616,9 @@ static void test_oem_fields(test_data *data)
continue;
}
+ if (verbosity_level >= 2) {
+ fprintf(stderr, "Checking '%.4s'\n", sdt->aml);
+ }
g_assert(strncmp((char *)sdt->aml + 10, OEM_ID, 6) == 0);
g_assert(strncmp((char *)sdt->aml + 16, OEM_TABLE_ID, 8) == 0);
}
--
2.55.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PULL 09/13] tests/acpi: skip FPDT oem field test
2026-09-01 8:25 [PULL 00/13] Firmware 20260901 patches Gerd Hoffmann
` (5 preceding siblings ...)
2026-09-01 8:25 ` [PULL 08/13] tests/acpi: log the name of the table checked Gerd Hoffmann
@ 2026-09-01 8:25 ` Gerd Hoffmann
2026-09-01 8:25 ` [PULL 10/13] tests/acpi: update expected data files Gerd Hoffmann
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Gerd Hoffmann @ 2026-09-01 8:25 UTC (permalink / raw)
To: qemu-devel
Cc: Gerd Hoffmann, Igor Mammedov, Peter Maydell, qemu-arm, Ani Sinha,
Michael S. Tsirkin, Philippe Mathieu-Daudé
The table comes from edk2 not qemu, so qemu
has no control over these fields.
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-ID: <20260824164751.1700783-10-kraxel@redhat.com>
---
tests/qtest/bios-tables-test.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index a85ca8e98253..f6dfa4131b89 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -2616,6 +2616,11 @@ static void test_oem_fields(test_data *data)
continue;
}
+ /* Firmware Performance Data created by EDK2 not QEMU */
+ if (compare_signature(sdt, "FPDT")) {
+ continue;
+ }
+
if (verbosity_level >= 2) {
fprintf(stderr, "Checking '%.4s'\n", sdt->aml);
}
--
2.55.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PULL 10/13] tests/acpi: update expected data files
2026-09-01 8:25 [PULL 00/13] Firmware 20260901 patches Gerd Hoffmann
` (6 preceding siblings ...)
2026-09-01 8:25 ` [PULL 09/13] tests/acpi: skip FPDT oem field test Gerd Hoffmann
@ 2026-09-01 8:25 ` Gerd Hoffmann
2026-09-01 8:25 ` [PULL 11/13] tests/acpi: add FPDT table data for loongarch Gerd Hoffmann
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Gerd Hoffmann @ 2026-09-01 8:25 UTC (permalink / raw)
To: qemu-devel
Cc: Gerd Hoffmann, Igor Mammedov, Peter Maydell, qemu-arm, Ani Sinha,
Michael S. Tsirkin
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-ID: <20260824164751.1700783-11-kraxel@redhat.com>
---
tests/data/acpi/aarch64/virt/HEST | Bin 224 -> 224 bytes
tests/data/acpi/aarch64/virt/SSDT.memhp | Bin 1817 -> 1817 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/tests/data/acpi/aarch64/virt/HEST b/tests/data/acpi/aarch64/virt/HEST
index 674272922db7d48f7821aa7c83ec76bb3b556d2a..c1d0b7cf1fd7bf483a9aafd711082d89791fae4c 100644
GIT binary patch
delta 56
zcmaFB_<)hi!!<bM0RsaA<AsS_794-w85kHCIAkUUicCykow%QqMS$V2`@{l0roZkJ
K7ifXV0ucb(yb-+s
delta 56
zcmaFB_<)hi!!<bM0RsaAW6ne_3yxdP3=9km95NFFMJ6V&PTbGQBEWFVd18Sc(=F$T
K3$#FFfd~M<x)8kp
diff --git a/tests/data/acpi/aarch64/virt/SSDT.memhp b/tests/data/acpi/aarch64/virt/SSDT.memhp
index 1deb1d2832201a5da7501821f1ea20d3eecb08b2..35b3e5588b1314f5dabd1913c4beaece2f5f3d82 100644
GIT binary patch
delta 22
dcmbQqH<OPmIM^jblAVEpv2-IBFFVs;cK|$G1wsG-
delta 22
dcmbQqH<OPmIM^jblAVEpan43AUUsHi&Hz111wsG-
--
2.55.0
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PULL 11/13] tests/acpi: add FPDT table data for loongarch
2026-09-01 8:25 [PULL 00/13] Firmware 20260901 patches Gerd Hoffmann
` (7 preceding siblings ...)
2026-09-01 8:25 ` [PULL 10/13] tests/acpi: update expected data files Gerd Hoffmann
@ 2026-09-01 8:25 ` Gerd Hoffmann
2026-09-01 8:25 ` [PULL 12/13] tests/acpi: disable updates Gerd Hoffmann
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Gerd Hoffmann @ 2026-09-01 8:25 UTC (permalink / raw)
To: qemu-devel
Cc: Gerd Hoffmann, Igor Mammedov, Peter Maydell, qemu-arm, Ani Sinha,
Michael S. Tsirkin
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-ID: <20260824164751.1700783-12-kraxel@redhat.com>
---
tests/data/acpi/loongarch64/virt/FPDT | Bin 0 -> 68 bytes
tests/data/acpi/loongarch64/virt/FPDT.numamem | Bin 0 -> 68 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 tests/data/acpi/loongarch64/virt/FPDT
create mode 100644 tests/data/acpi/loongarch64/virt/FPDT.numamem
diff --git a/tests/data/acpi/loongarch64/virt/FPDT b/tests/data/acpi/loongarch64/virt/FPDT
new file mode 100644
index 0000000000000000000000000000000000000000..102bfa85a94b8a6c2a37c0dd0a7f4dd724f95be1
GIT binary patch
literal 68
zcmZ<@a0zi?U|?W0@$?IE^-*wj@itOWP*7lEU|;~z!VC<I3=9H{3}E2R3ZfX{e06pZ
F9{@4|1_1y7
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/loongarch64/virt/FPDT.numamem b/tests/data/acpi/loongarch64/virt/FPDT.numamem
new file mode 100644
index 0000000000000000000000000000000000000000..1950ed4340b705d786f7d0a77a565fee98d946d5
GIT binary patch
literal 68
zcmZ<@a0zi?U|?Xh@$?IE^-*wj@itOWP*7lEU|;~z!VC<I3=9H{3}E05rWxUUb!Lz-
E05fq00RR91
literal 0
HcmV?d00001
--
2.55.0
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PULL 12/13] tests/acpi: disable updates
2026-09-01 8:25 [PULL 00/13] Firmware 20260901 patches Gerd Hoffmann
` (8 preceding siblings ...)
2026-09-01 8:25 ` [PULL 11/13] tests/acpi: add FPDT table data for loongarch Gerd Hoffmann
@ 2026-09-01 8:25 ` Gerd Hoffmann
2026-09-01 8:25 ` [PULL 13/13] hw/misc/vmlaunchupdate: do not clear control bits upon fw-cfg select op Gerd Hoffmann
2026-09-01 13:20 ` [PULL 00/13] Firmware 20260901 patches Peter Maydell
11 siblings, 0 replies; 13+ messages in thread
From: Gerd Hoffmann @ 2026-09-01 8:25 UTC (permalink / raw)
To: qemu-devel
Cc: Gerd Hoffmann, Igor Mammedov, Peter Maydell, qemu-arm, Ani Sinha,
Michael S. Tsirkin
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-ID: <20260824164751.1700783-13-kraxel@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index 8c982848d47e..dfb8523c8bf4 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,4 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/aarch64/virt/HEST",
-"tests/data/acpi/aarch64/virt/SSDT.memhp",
-"tests/data/acpi/loongarch64/virt/FPDT",
--
2.55.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PULL 13/13] hw/misc/vmlaunchupdate: do not clear control bits upon fw-cfg select op
2026-09-01 8:25 [PULL 00/13] Firmware 20260901 patches Gerd Hoffmann
` (9 preceding siblings ...)
2026-09-01 8:25 ` [PULL 12/13] tests/acpi: disable updates Gerd Hoffmann
@ 2026-09-01 8:25 ` Gerd Hoffmann
2026-09-01 13:20 ` [PULL 00/13] Firmware 20260901 patches Peter Maydell
11 siblings, 0 replies; 13+ messages in thread
From: Gerd Hoffmann @ 2026-09-01 8:25 UTC (permalink / raw)
To: qemu-devel
Cc: Gerd Hoffmann, Igor Mammedov, Peter Maydell, qemu-arm, Ani Sinha,
Michael S. Tsirkin
From: Ani Sinha <anisinha@redhat.com>
The control bits define the behavior of the interface and clearing the bits
upon reading or select operation will break that behavior. For example, after
CTL_HOST_IGVM is set by the guest through a write and then subsequently, if the
guest tried to read back the values from the fw-cfg interface, the read would
clear CTL_HOST_IGVM. This would break restoring the host IGVM upon subsequent
reset.
Fixes: 30688c02a76e50e4 ("hw/misc/vmlaunchupdate: Introduce hypervisor fw-cfg interface support")
Signed-off-by: Ani Sinha <anisinha@redhat.com>
Message-ID: <20260825124139.6900-1-anisinha@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/misc/vmlaunchupdate.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/misc/vmlaunchupdate.c b/hw/misc/vmlaunchupdate.c
index afa2d278aefc..847d2d963f10 100644
--- a/hw/misc/vmlaunchupdate.c
+++ b/hw/misc/vmlaunchupdate.c
@@ -41,7 +41,6 @@ static bool vmlaunchupdate_supported(void)
static void init_vm_launch_update(VMLaunchUpdateState *s)
{
s->launch_update.capabilities = VM_LAUNCHUPDATE_FORMAT_IGVM;
- s->launch_update.control = 0;
if (s->disabled) {
s->launch_update.control |= VM_LAUNCHUPDATE_CTL_DISABLE;
--
2.55.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PULL 00/13] Firmware 20260901 patches
2026-09-01 8:25 [PULL 00/13] Firmware 20260901 patches Gerd Hoffmann
` (10 preceding siblings ...)
2026-09-01 8:25 ` [PULL 13/13] hw/misc/vmlaunchupdate: do not clear control bits upon fw-cfg select op Gerd Hoffmann
@ 2026-09-01 13:20 ` Peter Maydell
11 siblings, 0 replies; 13+ messages in thread
From: Peter Maydell @ 2026-09-01 13:20 UTC (permalink / raw)
To: Gerd Hoffmann
Cc: qemu-devel, Igor Mammedov, qemu-arm, Ani Sinha,
Michael S. Tsirkin
On Tue, 1 Sept 2026 at 09:26, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit d2e570cc0f97b936902a5b1b86b73c0f5998b475:
>
> Merge tag 'pull-ppc-for-11.2-20260828' of https://gitlab.com/harshpb/qemu into staging (2026-08-28 15:17:04 -0700)
>
> are available in the Git repository at:
>
> https://gitlab.com/kraxel/qemu.git tags/firmware-20260901-pull-request
>
> for you to fetch changes up to 5ce32f7fdb786014255d4cfff749de307cdfdbfa:
>
> hw/misc/vmlaunchupdate: do not clear control bits upon fw-cfg select op (2026-09-01 09:25:53 +0200)
>
> ----------------------------------------------------------------
> - edk2: update to 2026-08 stable tag
> - edk2: remove 32-bit platforms (following upstream removal)
> - acpi: test updates for the new edk2 firmware
> - igvm/vmlaunchupdate: fix control bit handling
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/11.2
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2026-09-01 13:23 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-09-01 8:25 [PULL 00/13] Firmware 20260901 patches Gerd Hoffmann
2026-09-01 8:25 ` [PULL 01/13] tests/acpi: enable updates Gerd Hoffmann
2026-09-01 8:25 ` [PULL 02/13] edk2: update build script Gerd Hoffmann
2026-09-01 8:25 ` [PULL 03/13] edk2: update submodule to edk2-stable202608 Gerd Hoffmann
2026-09-01 8:25 ` [PULL 04/13] edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars Gerd Hoffmann
2026-09-01 8:25 ` [PULL 06/13] edk2: rename risc-v firmware builds Gerd Hoffmann
2026-09-01 8:25 ` [PULL 08/13] tests/acpi: log the name of the table checked Gerd Hoffmann
2026-09-01 8:25 ` [PULL 09/13] tests/acpi: skip FPDT oem field test Gerd Hoffmann
2026-09-01 8:25 ` [PULL 10/13] tests/acpi: update expected data files Gerd Hoffmann
2026-09-01 8:25 ` [PULL 11/13] tests/acpi: add FPDT table data for loongarch Gerd Hoffmann
2026-09-01 8:25 ` [PULL 12/13] tests/acpi: disable updates Gerd Hoffmann
2026-09-01 8:25 ` [PULL 13/13] hw/misc/vmlaunchupdate: do not clear control bits upon fw-cfg select op Gerd Hoffmann
2026-09-01 13:20 ` [PULL 00/13] Firmware 20260901 patches Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.