On 02/05/2024 10.09, Andrew Jones wrote:
probe_maxsmp is really just for Arm and for older QEMU which doesn't default to gicv3. So, even though later QEMU has a new error message format, we want to be able to parse the old error message format in order to use --probe-maxsmp when necessary. Adjust the parsing so it can handle both the old and new formats. Fixes: 5dd20ec76ea6 ("runtime: Update MAX_SMP probe") Signed-off-by: Andrew Jones <andrew.jones@xxxxxxxxx> --- scripts/runtime.bash | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/runtime.bash b/scripts/runtime.bash index e7af9bda953a..fd16fd4cfa25 100644 --- a/scripts/runtime.bash +++ b/scripts/runtime.bash @@ -204,8 +204,10 @@ function probe_maxsmp() { local smp- if smp=$($RUNTIME_arch_run _NO_FILE_4Uhere_ -smp $MAX_SMP |& grep 'Invalid SMP CPUs'); then+ if smp=$($RUNTIME_arch_run _NO_FILE_4Uhere_ -smp $MAX_SMP |& grep 'SMP CPUs'); then smp=${smp##* } + smp=${smp/\(} + smp=${smp/\)} echo "Restricting MAX_SMP from ($MAX_SMP) to the max supported ($smp)" >&2 MAX_SMP=$smp fi
Reviewed-by: Thomas Huth <thuth@xxxxxxxxxx>
