runtime: Adjust probe_maxsmp for older QEMU
PATCH 1/1 runtime: Adjust probe_maxsmp for older QEMU
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.
--- scripts/runtime.bash | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
scripts/runtime.bash +3 -1
@@ -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
Signature · 1 line
2.44.0
Quoted 18 lines · Andrew Jones
probe_maxsmpis 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 <[email protected]>--- scripts/runtime.bash | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)scripts/runtime.bash +0
-0@@ -204,8 +204,10 @@ function probe_maxsmp() {
scripts/runtime.bash function probe_maxsmp() · line 213
Quoted 10 lines
scripts/runtime.bash +3
-1local 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
Quoted 31 lines · Andrew Jones
probe_maxsmpis 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 <[email protected]>--- scripts/runtime.bash | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)scripts/runtime.bash +3
-1@@ -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 fiSignature · 1 line
2.44.0
Merged.
Thanks,
drew