rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-21 18:31:31 +00:00
Code Issues Releases Wiki Activity

scripts/run: enable KVM on arm/arm64 too

Browse Source
This commit is contained in:
Ivan Mikushin 2016-03-23 13:28:05 -07:00
parent 2ec32c14e2
commit dc86eb8c6d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/run
View File

@ -11,7 +11,8 @@ ARCH=${ARCH:-amd64}
declare -A qemuarch=( ["amd64"]="x86_64" ["arm"]="arm" ["arm64"]="aarch64" ) declare -A qemuarch=( ["amd64"]="x86_64" ["arm"]="arm" ["arm64"]="aarch64" )
declare -A ttycons=( ["amd64"]="ttyS0" ["arm"]="ttyAMA0" ["arm64"]="ttyAMA0" ) declare -A ttycons=( ["amd64"]="ttyS0" ["arm"]="ttyAMA0" ["arm64"]="ttyAMA0" )
declare -A machine=( ["amd64"]="" ["arm"]="-M virt -cpu cortex-a8" ["arm64"]="-M virt -cpu cortex-a57" ) declare -A machine=( ["amd64"]="" ["arm"]="-M virt" ["arm64"]="-M virt" )
declare -A cpu=( ["amd64"]="" ["arm"]="-cpu cortex-a8" ["arm64"]="-cpu cortex-a57" )
declare -A network=( declare -A network=(
["amd64"]="-net nic,vlan=0,model=virtio -net user,vlan=0,hostfwd=tcp::2222-:22,hostname=rancher-dev" ["amd64"]="-net nic,vlan=0,model=virtio -net user,vlan=0,hostfwd=tcp::2222-:22,hostname=rancher-dev"
["arm"]="-netdev user,id=unet,hostfwd=tcp::2222-:22,hostname=rancher-dev -device virtio-net-device,netdev=unet" ["arm"]="-netdev user,id=unet,hostfwd=tcp::2222-:22,hostname=rancher-dev -device virtio-net-device,netdev=unet"
@ -192,17 +193,20 @@ if [ "$XHYVE" == "1" ] || [ "$QEMU" == "1" ]; then
elif [ "$QEMU" == "1" ]; then elif [ "$QEMU" == "1" ]; then
CPU=${cpu["$ARCH"]}
if [ "$KVM" == "1" ] && [ "$ARCH" == "$HOST_ARCH" ]; then if [ "$KVM" == "1" ] && [ "$ARCH" == "$HOST_ARCH" ]; then
KVM_ENABLE="-machine accel=kvm -cpu host" KVM_ENABLE="-enable-kvm"
CPU="-cpu host"
fi fi
exec qemu-system-${QEMUARCH} -serial stdio \ exec qemu-system-${QEMUARCH} -serial stdio \
${KVM_ENABLE} \
${CPU} \
${machine["$ARCH"]} \ ${machine["$ARCH"]} \
-kernel ${KERNEL} \ -kernel ${KERNEL} \
-initrd ${INITRD} \ -initrd ${INITRD} \
-m 1024 \ -m 1024 \
${network["$ARCH"]} \ ${network["$ARCH"]} \
$(eval "${hd["$ARCH"]} ${HD}") \ $(eval "${hd["$ARCH"]} ${HD}") \
${KVM_ENABLE} \
-smp 1 \ -smp 1 \
-cdrom ${CLOUD_CONFIG_ISO} \ -cdrom ${CLOUD_CONFIG_ISO} \
-append "${KERNEL_ARGS}" \ -append "${KERNEL_ARGS}" \