Skip to content

boot-qemu.sh: Combine x86 and x86_64 for shared KVM handling #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickdesaulniers merged 1 commit into from
May 4, 2020
Merged

boot-qemu.sh: Combine x86 and x86_64 for shared KVM handling #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions boot-qemu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,20 +180,16 @@ function setup_qemu_args() {
QEMU=(qemu-system-ppc64)
;;

x86)
KIMAGE=bzImage
QEMU_ARCH_ARGS=(-append "console=ttyS0${RDINIT}" -enable-kvm)
QEMU_RAM=512m
QEMU=(qemu-system-i386)
;;

x86_64)
x86 | x86_64)
KIMAGE=bzImage
QEMU_ARCH_ARGS=(-append "console=ttyS0${RDINIT}")
# Use KVM if the processor supports it (first part) and the KVM module is loaded (second part)
[[ $(grep -c -E 'vmx|svm' /proc/cpuinfo) -gt 0 && $(lsmod 2>/dev/null | grep -c kvm) -gt 0 ]] &&
QEMU_ARCH_ARGS=("${QEMU_ARCH_ARGS[@]}" -cpu host -d "unimp,guest_errors" -enable-kvm)
QEMU=(qemu-system-x86_64)
case ${ARCH} in
x86) QEMU=(qemu-system-i386) ;;
x86_64) QEMU=(qemu-system-x86_64) ;;
esac
;;
esac
checkbin "${QEMU[*]}"
Expand Down