From 5e6f7c2bda040adf81389ca79706dbfc3d5aec13 Mon Sep 17 00:00:00 2001 From: Seph Gentle Date: Fri, 23 May 2025 11:04:21 +1000 Subject: [PATCH] Fix QEMU regex to work for version 10 (#1463) Fixes #1462 Signed-off-by: Seph Gentle --- src/plat/qemu-arm-virt/config.cmake | 2 +- src/plat/qemu-riscv-virt/config.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plat/qemu-arm-virt/config.cmake b/src/plat/qemu-arm-virt/config.cmake index af98c16e9..1b81b6e26 100644 --- a/src/plat/qemu-arm-virt/config.cmake +++ b/src/plat/qemu-arm-virt/config.cmake @@ -107,7 +107,7 @@ if(KernelPlatformQEMUArmVirt) string( REGEX MATCH - "[0-9](\\.[0-9])+" + "[0-9]+(\\.[0-9]+)+" QEMU_VERSION "${QEMU_STDOUT_MESSAGE}" ) diff --git a/src/plat/qemu-riscv-virt/config.cmake b/src/plat/qemu-riscv-virt/config.cmake index de62061d6..af6016b89 100644 --- a/src/plat/qemu-riscv-virt/config.cmake +++ b/src/plat/qemu-riscv-virt/config.cmake @@ -44,7 +44,7 @@ if(KernelPlatformQEMURiscVVirt) string( REGEX MATCH - "[0-9](\\.[0-9])+" + "[0-9]+(\\.[0-9]+)+" QEMU_VERSION "${QEMU_STDOUT_MESSAGE}" )