[PATCH 7/8] tests/acpi: update expected data files

[PATCH 7/8] tests/acpi: update expected data files

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 tests/data/acpi/microvm/DSDT.usb | Bin 414 -> 426 bytes
 tests/data/acpi/virt/DSDT.usb    | Bin 0 -> 5257 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/data/acpi/microvm/DSDT.usb b/tests/data/acpi/microvm/DSDT.usb
index 14423381ea235ed42f6f0f7d98e793c271a4e7c1..bceef778d2633793d5192846e02fb4719de503a0 100644
GIT binary patch
delta 57
zcmbQoyo#C2CD<io6(a)!)6<Du(o8Pm8`aGjrL7}8oIN?>Jv?1_953(+aKwjtx-f9W
NJ3BivPR?aC1OT2T4c`C&

delta 45
zcmZ3*Jdc^nCD<io9wP$-Q_(~&X(kV`jq2u%{Q40d&Ym3c9-b~dju&_ZCRZ{V0s!~<
B3f}+#

diff --git a/tests/data/acpi/virt/DSDT.usb b/tests/data/acpi/virt/DSDT.usb
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a5a46e044bb788da9028a572f55bc28036ce38bf 100644
GIT binary patch
literal 5257
zcmZvg%WoT16o>EFlh__VGIpHz!zq*s3RHeHP5LDE*oj@@#CX!CQYyI;0#UN5M1@o;
zq!6J(yQ7g<2PqQ&1`;b4NZob8nhpN|JIuLrXOiDh&qx{1nYrhi`;Cv|<J<I`JI{+s
z#r|w;du@NIaj)k!>71pM(#QJM{eIoLKkyray~A0rTrMXE?M^dW_j(-)R#b9ur_)q>
zhu6IAZgj2RZI{cHN_Z_f@cMp!)|q;iQW}_2u2RoOm1Uiy=n3VnuJ3y5hWkmYdxyAH
z%Jp~ZPMVUvx@8b~Cub0`)O46xx9|3&DQ#}`w<&e`?6#+wXE%3LEWCLc5fyWHj?lM#
z0})eah)RfP=vh=HgcFk(HZZElsELfY#25ue4H=h3hAlCYz_^TzWsxx=F&tnlBjbw5
z7?l_qU|d1QipWSvj2tjlkg+N<k`luO#ws$dij0)RC;;OsFe>4PgO`}&NQ@#dt|3D#
zQ~n`|N_`R-*O4LDX-1mIG%#);L$1@T#Fz!fO=QS*nv)pwz_^7BxlYF<#v(92LWW$Y
zuEbaZ#u_r@I?YRrw}4SchFqrwiE$nn4P?l5IxaCT0K)@DRj$*b#CR7NO=QS*Iw3JG
z0;7ctxlSh~#s|PyM}}OdQxfA6FgB1O*XgvxC<CL747pBcBt{h&9c0LLIx8_Q1LHO_
z<T{;`7*~MtF*4*jotGG^z}Q5FT&D{X;~Fr!z^KV}x+pPj0AmXoa-EhW#w}oMhm5UX
zdtN7;M{lcFu9sJ-`S7ScGEq%;F|7^SHyT@~ZHd3r&zGF}p7K;jeWsRFnf{t|^tF1Z
zKBZTsAwlEO>+g(je&rk#(sp_{R2zP$tjw`R#}!q`=<`mDf@&1RDX6JJ*3JxvmeM&i
zE{t>*4a}KqK^_f_LY+zcU@Ub>W^5Sg%xEaJK>Cg}G{~e-XGV942bs|f;!0;mL*pis
zh6b4w>P(tZa2GqsjAmd5nbA;cnL^7TlS1?yVV)yFX5=|yGNZ{;h@PX&lbTYRPc)QT
zEcB!hJrm3`!8{Y(lS1@NGS4LQq?QalDMZf{^Q3m#JiXwNq_`)A=;<&|hj~&9hn^Io
zXPSAYnP-}NQiz@z=9yuh)bgPxh3J`Oo>}IZ<(?FxXO4O1m?yP}=t&`Zjxo<M<~hba
zDMU~DIb&)(sA89SQcH=R6ryLIdFGjCo_kV=o(1MvV4l>1q9=vuInF%Cnddn7q!2yn
zhaz|unJ2ZZ=t&`ZPB702<~hMVDMZgn<~hkcsl`Q43ej_lc}_9UDeg%jdeV<e@SJ9z
z)Doj7h3GlMJZG5a4ELlEJ!hHcEc2um8a*jQ&pGBf$2{k_Cxz%a&phXuC$-$@Ng;YJ
zFwX_%xxhUsM9)R$xyU@JMMqBx(X+%nOU$#xJt;Jvdxsrczm?|aoBmSv%Il|J#64P;
z$T{g?DdO$mE1kY~-#Aws9r%6U3Q=Llz)-YKfT;5V%A7kz-PW@T8(fCc>jlVqM_`$A
zoE0{@oJH#f$hsh~%(;+NbO&Ceu1@HGsB+h6XC6m8;XM8^t77!;oVKCfSwGOHD?{By
zu(`wGfBI(`ZNp1+#mZ0*U^Z%6XdBX1OTBm>a)QeT`kLN?=xnFYKT%2lPOqnu-cEm0
z71vXPZQrwB>?^OiTRCngj=so`JMLchuiC$*`L&;SAJ>1o`TFx0`;JWms`Q$q*V-c;
zXpTOpY1C7_b4q%D?7lpDXnjjpD#7T=@#M>+Xq-9i>Wh!`V152%|CgLOuWwR0*)M)L
zX!>3I_?(%|tCc_g_Lslu{xtPZcjkAmdz?D@Qk~@EmZf*J(ABm3EuU4RUg**_S98j5
zJfGk_pr=z>J9{+xh`w*kx>+M}|B_yr+h{chro_#%TtzpYv@DmU3nAasdE9!>q#m^T
z)R)pbnoK$N-gjvodM&@Txl~*jwC?Vt9_ir0v3vCNfusAqXT9Bi!#UVHyne6kb%L8^
j>aVh{S^gu3pkHMRed&~13)k8%h7+FA6#OuHW}@nU`oteS

literal 0
HcmV?d00001

-- 
2.27.0

[PATCH 0/8] edk2: update to edk2-stable202511

[Gerd Hoffmann]

Update edk2 firmware images to latest upstream release.

Noteworthy edk2 upstream change is that 32-bit architectures (ia32 and
arm) are not supported any more, so the qemu builds of these are removed
too.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Gerd Hoffmann (8):
  tests/acpi: enable updates
  edk2: update build script
  edk2: update submodule to edk2-stable202511
  edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars
  edk2: drop 32-bit binaries (ia32 and arm)
  edk2: update binaries to edk2-stable202511
  tests/acpi: update expected data files
  tests/acpi: disable updates

 roms/edk2-build.py                            |  21 +++++++--
 tests/qtest/bios-tables-test.c                |  28 +++++------
 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/edk2-aarch64-code.fd.bz2              | Bin 1565763 -> 1662423 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 -> 1178146 bytes
 pc-bios/edk2-riscv-code.fd.bz2                | Bin 1296526 -> 1252448 bytes
 pc-bios/edk2-x86_64-code.fd.bz2               | Bin 1907255 -> 2138026 bytes
 pc-bios/edk2-x86_64-microvm.fd.bz2            | Bin 1787244 -> 1996414 bytes
 pc-bios/edk2-x86_64-secure-code.fd.bz2        | Bin 1962992 -> 2293816 bytes
 pc-bios/meson.build                           |   6 +--
 roms/edk2                                     |   2 +-
 roms/edk2-build.config                        |  44 ++----------------
 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
 24 files changed, 39 insertions(+), 169 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

-- 
2.52.0

[PATCH 1/8] tests/acpi: enable updates

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 tests/qtest/bios-tables-test-allowed-diff.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8bf4..c3c0d53211c7 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,3 @@
 /* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/aarch64/virt/HEST",
+"tests/data/acpi/aarch64/virt/SSDT.memhp",
-- 
2.52.0

[PATCH 2/8] edk2: update build script

[Gerd Hoffmann]

sync with https://gitlab.com/kraxel/edk2-build-config/

Signed-off-by: Gerd Hoffmann <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.52.0

[PATCH 3/8] edk2: update submodule to edk2-stable202511

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <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..46548b1adac8 160000
--- a/roms/edk2
+++ b/roms/edk2
@@ -1 +1 @@
-Subproject commit 4dfdca63a93497203f197ec98ba20e2327e4afe4
+Subproject commit 46548b1adac82211d8d11da12dd914f41e7aa775
diff --git a/roms/edk2-version b/roms/edk2-version
index 069f19f8bf49..1c2e9c9819df 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-stable202511
+EDK2_DATE = 11/19/2025
-- 
2.52.0

[PATCH 4/8] edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars

[Gerd Hoffmann]

Upstream edk2 has dropped support for 32-bit architectures.  Remove the
build config for these builds, update aarch64 (which used to share the
'vars' image with arm).

Drop references to the 32-bit builds in a number of places.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 tests/qtest/bios-tables-test.c               | 28 ++++++-------
 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 ++------------------
 8 files changed, 19 insertions(+), 162 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/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 6b892ef23e1a..e65db5e7fce7 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1619,7 +1619,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,
@@ -1650,7 +1650,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,
@@ -1674,7 +1674,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,
@@ -1788,7 +1788,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,
@@ -1811,7 +1811,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,
     };
@@ -1844,7 +1844,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,
@@ -1924,7 +1924,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,
@@ -2200,7 +2200,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,
@@ -2221,7 +2221,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,
@@ -2240,7 +2240,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,
@@ -2326,7 +2326,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,
@@ -2344,7 +2344,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,
     };
@@ -2383,7 +2383,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,
     };
@@ -2590,7 +2590,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 9260aaad78e8..7c3d56478345 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.52.0

[PATCH 7/8] tests/acpi: update expected data files

[Gerd Hoffmann]

New firmware builds change the memory layout a bit,
so some addresses in the acpi tables need an update.

Signed-off-by: Gerd Hoffmann <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..cc1641fdb4e7144a72278f7ef502352139d7b9e1 100644
GIT binary patch
delta 56
zcmaFB_<)hi!!<bM0RsaA<A;e{793`73=9km95NFFMJ6V&PTbGQBEVqgHnBjD$;@ry
K0xb|(AOZlXP!7ES

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..a6c8bd9ea06c8704f82a35792d6415f42e0de23d 100644
GIT binary patch
delta 22
dcmbQqH<OPmIM^jblAVEp(RL#jFFTW&8vr>C1VR7+

delta 22
dcmbQqH<OPmIM^jblAVEpan43AUUsHi&Hz111wsG-

-- 
2.52.0

[PATCH 8/8] tests/acpi: disable updates

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 tests/qtest/bios-tables-test-allowed-diff.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index c3c0d53211c7..dfb8523c8bf4 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,3 +1 @@
 /* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/aarch64/virt/HEST",
-"tests/data/acpi/aarch64/virt/SSDT.memhp",
-- 
2.52.0

Re: [PATCH 4/8] edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars

[Philippe Mathieu-Daudé]

On 26/11/25 15:21, Gerd Hoffmann wrote:
> Upstream edk2 has dropped support for 32-bit architectures.  Remove the
> build config for these builds, update aarch64 (which used to share the
> 'vars' image with arm).
> 
> Drop references to the 32-bit builds in a number of places.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>   tests/qtest/bios-tables-test.c               | 28 ++++++-------
>   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 ++------------------
>   8 files changed, 19 insertions(+), 162 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

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH 0/8] edk2: update to edk2-stable202511

[Philippe Mathieu-Daudé]

On 26/11/25 15:21, Gerd Hoffmann wrote:
> Update edk2 firmware images to latest upstream release.
> 
> Noteworthy edk2 upstream change is that 32-bit architectures (ia32 and
> arm) are not supported any more, so the qemu builds of these are removed
> too.

Thanks for doing this work.

>   roms/edk2-build.py                            |  21 +++++++--
>   tests/qtest/bios-tables-test.c                |  28 +++++------
>   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/edk2-aarch64-code.fd.bz2              | Bin 1565763 -> 1662423 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 -> 1178146 bytes
>   pc-bios/edk2-riscv-code.fd.bz2                | Bin 1296526 -> 1252448 bytes

Since here, could we rename this one as edk2-riscv64-code.fd.bz2 for
coherency and clarity?

>   pc-bios/edk2-x86_64-code.fd.bz2               | Bin 1907255 -> 2138026 bytes
>   pc-bios/edk2-x86_64-microvm.fd.bz2            | Bin 1787244 -> 1996414 bytes
>   pc-bios/edk2-x86_64-secure-code.fd.bz2        | Bin 1962992 -> 2293816 bytes

Re: [PATCH 7/8] tests/acpi: update expected data files

[Michael S. Tsirkin]

On Wed, Nov 26, 2025 at 03:21:08PM +0100, Gerd Hoffmann wrote:
> New firmware builds change the memory layout a bit,
> so some addresses in the acpi tables need an update.

Please, show the diff of the disassembled tables
in the commit log.
Otherwise the change is impossible to review or rebase.


> Signed-off-by: Gerd Hoffmann <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..cc1641fdb4e7144a72278f7ef502352139d7b9e1 100644
> GIT binary patch
> delta 56
> zcmaFB_<)hi!!<bM0RsaA<A;e{793`73=9km95NFFMJ6V&PTbGQBEVqgHnBjD$;@ry
> K0xb|(AOZlXP!7ES
> 
> 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..a6c8bd9ea06c8704f82a35792d6415f42e0de23d 100644
> GIT binary patch
> delta 22
> dcmbQqH<OPmIM^jblAVEp(RL#jFFTW&8vr>C1VR7+
> 
> delta 22
> dcmbQqH<OPmIM^jblAVEpan43AUUsHi&Hz111wsG-
> 
> -- 
> 2.52.0