DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-21 22:43:23 +00:00
Code Issues Releases Wiki Activity

fix(tools):支持在无kvm支持下运行DragonOS (#1010)

Browse Source 
* fix(tools):支持在无kvm支持下运行DragonOS

* fix: 修正问题：在非Linux上面加速选项选择的不正确

---------

Co-authored-by: jinlong <jinlong@tencent.com>
This commit is contained in:
黄铭涛
2024-10-25 14:26:37 +08:00
committed by GitHub
parent b9966addf1
commit 80c9e8f8f0
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/run-qemu.sh
View File

@ -48,10 +48,16 @@ qemu_trace_usb=trace:usb_xhci_reset,trace:usb_xhci_run,trace:usb_xhci_stop,trace
# 根据架构设置qemu的加速方式 # 根据架构设置qemu的加速方式
if [ ${ARCH} == "i386" ] || [ ${ARCH} == "x86_64" ]; then if [ ${ARCH} == "i386" ] || [ ${ARCH} == "x86_64" ]; then
qemu_accel="kvm" qemu_accel="kvm"
if [ $(uname) == Darwin ]; then if [ $(uname) == Darwin ]; then
qemu_accel=hvf qemu_accel=hvf
else
# 判断系统kvm模块是否加载
if [ ! -e /dev/kvm ]; then
# kvm模块未加载，使用tcg加速
qemu_accel="tcg"
fi fi
fi
fi fi
# uboot版本 # uboot版本
@ -82,7 +88,10 @@ BIOS_TYPE=""
VIRTIO_BLK_DEVICE=false VIRTIO_BLK_DEVICE=false
# 如果qemu_accel不为空 # 如果qemu_accel不为空
if [ -n "${qemu_accel}" ]; then if [ -n "${qemu_accel}" ]; then
QEMU_ACCELARATE="-machine accel=${qemu_accel} -enable-kvm " QEMU_ACCELARATE=" -machine accel=${qemu_accel} "
if [ "${qemu_accel}" == "kvm" ]; then
QEMU_ACCELARATE+=" -enable-kvm "
fi
fi fi
if [ ${ARCH} == "i386" ] || [ ${ARCH} == "x86_64" ]; then if [ ${ARCH} == "i386" ] || [ ${ARCH} == "x86_64" ]; then