mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-21 21:51:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #721 from glevand/for-merge-qemu

Browse Source 
build_library: Update qemu script to run on arm64 machines
This commit is contained in:
David Michael 2017-07-28 15:02:48 -07:00 committed by GitHub
commit 2ebd6c0ec4
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build_library/qemu_template.sh
View File

@ -39,6 +39,11 @@ Any arguments after -a and -p will be passed through to qemu, -- may be
used as an explicit separator. See the qemu(1) man page for more details. used as an explicit separator. See the qemu(1) man page for more details.
" "
die(){
echo "${1}"
exit 1
}
check_conflict() { check_conflict() {
if [ -n "${CLOUD_CONFIG_FILE}${CONFIG_IMAGE}${SSH_KEYS}" ]; then if [ -n "${CLOUD_CONFIG_FILE}${CONFIG_IMAGE}${SSH_KEYS}" ]; then
echo "The -u -c and -a options cannot be combined!" >&2 echo "The -u -c and -a options cannot be combined!" >&2
@ -142,14 +147,18 @@ if [ "${SAFE_ARGS}" -eq 1 ]; then
# Disable KVM, for testing things like UEFI which don't like it # Disable KVM, for testing things like UEFI which don't like it
set -- -machine accel=tcg "$@" set -- -machine accel=tcg "$@"
else else
case "${VM_BOARD}" in case "${VM_BOARD}+$(uname -m)" in
amd64-usr) amd64-usr+x86_64)
# Emulate the host CPU closely in both features and cores. # Emulate the host CPU closely in both features and cores.
set -- -machine accel=kvm -cpu host -smp "${VM_NCPUS}" "$@" ;; set -- -machine accel=kvm -cpu host -smp "${VM_NCPUS}" "$@" ;;
arm64-usr) amd64-usr+*)
#FIXME(andrejro): tune the smp parameter set -- -machine pc-q35-2.8 -cpu kvm64 -smp 1 -nographic "$@" ;;
set -- -machine virt -cpu cortex-a57 -machine type=virt -smp 1 "$@" ;; arm64-usr+aarch64)
*) die "Unsupported arch" ;; set -- -machine virt,accel=kvm,gic-version=3 -cpu host -smp "${VM_NCPUS}" -nographic "$@" ;;
arm64-usr+*)
set -- -machine virt -cpu cortex-a57 -smp 1 -nographic "$@" ;;
*)
die "Unsupported arch" ;;
esac esac
fi fi
@ -213,7 +222,7 @@ case "${VM_BOARD}" in
"$@" "$@"
;; ;;
arm64-usr) arm64-usr)
qemu-system-aarch64 -nographic \ qemu-system-aarch64 \
-name "$VM_NAME" \ -name "$VM_NAME" \
-m ${VM_MEMORY} \ -m ${VM_MEMORY} \
-netdev user,id=eth0,hostfwd=tcp::"${SSH_PORT}"-:22,hostname="${VM_NAME}" \ -netdev user,id=eth0,hostfwd=tcp::"${SSH_PORT}"-:22,hostname="${VM_NAME}" \