]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
riscv: weaken capscheck for rv64gc_v_zvkned_hwprobe entry
authorChristoph Müllner <christoph.muellner@vrull.eu>
Tue, 7 Apr 2026 20:09:46 +0000 (22:09 +0200)
committerTomas Mraz <tomas@openssl.foundation>
Thu, 16 Apr 2026 17:03:19 +0000 (19:03 +0200)
QEMU 8.2.2 (ubuntu-latest) does not report ZVKNED via hwprobe
despite zvkned=true being set in QEMU_CPU, so the _V_ZVKNED
assertion would fail in CI for a reason unrelated to OpenSSL.

Weaken the check to _V, which QEMU 8.2.2 does report correctly.
The ZVKNED assertion can be restored once the CI moves to a QEMU
version with full Zvk* hwprobe coverage.

Signed-off-by: Christoph Müllner <christoph.muellner@vrull.eu>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Thu Apr 16 17:03:43 2026
(Merged from https://github.com/openssl/openssl/pull/30713)

.github/workflows/riscv-more-cross-compiles.yml

index 3d4378aeefc7617b7884a964b278c5c78c817975..cac662b8d34fc3d47c21d74acf4a494d7200d837 100644 (file)
@@ -230,8 +230,10 @@ jobs:
             qemucpu: "rv64,v=true,vlen=128,zvkned=true",
             # No opensslcapsname: hwprobe is used for capability detection.
             opensslcaps: "rv64gc_v_zvkned_hwprobe",
-            # Both V and ZVKNED must be detected.
-            capscheck: "_V_ZVKNED|_ZVKNED.*_V",
+            # V must be detected. ZVKNED is not reported by QEMU 8.2.2 (ubuntu-latest)
+            # via hwprobe despite being set in QEMU_CPU; tighten once CI moves to a
+            # newer QEMU that reports all Zvk* extensions via hwprobe.
+            capscheck: "_V",
           }
         ]
     runs-on: ubuntu-latest