Merge pull request #91 from kinvolk/vbatts/arm

qemu_template: use more cpus for ARM if available
This commit is contained in:
Vincent Batts 2020-12-15 08:29:10 -05:00 committed by GitHub
commit d46b95ba29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -162,7 +162,12 @@ else
arm64-usr+aarch64) arm64-usr+aarch64)
set -- -machine virt,accel=kvm,gic-version=3 -cpu host -smp "${VM_NCPUS}" -nographic "$@" ;; set -- -machine virt,accel=kvm,gic-version=3 -cpu host -smp "${VM_NCPUS}" -nographic "$@" ;;
arm64-usr+*) arm64-usr+*)
set -- -machine virt -cpu cortex-a57 -smp 1 -nographic "$@" ;; if test "${VM_NCPUS}" -gt 4 ; then
VM_NCPUS=4
elif test "${VM_NCPUS}" -gt 2 ; then
VM_NCPUS=2
fi
set -- -machine virt -cpu cortex-a57 -smp "${VM_NCPUS}" -nographic "$@" ;;
*) *)
die "Unsupported arch" ;; die "Unsupported arch" ;;
esac esac