mirror of
https://github.com/DragonOS-Community/DragonOS.git
synced 2025-06-18 08:06:32 +00:00
feat: 添加serial console,支持non-graphic启动 (#947)
Signed-off-by: longjin <longjin@dragonos.org>
This commit is contained in:
@ -77,6 +77,7 @@ QEMU_DRIVE="id=disk,file=${QEMU_DISK_IMAGE},if=none"
|
||||
QEMU_ACCELARATE=""
|
||||
QEMU_ARGUMENT=""
|
||||
QEMU_DEVICES=""
|
||||
BIOS_TYPE=""
|
||||
#这个变量为true则使用virtio磁盘
|
||||
VIRTIO_BLK_DEVICE=false
|
||||
# 如果qemu_accel不为空
|
||||
@ -109,6 +110,35 @@ if [ ${ARCH} == "riscv64" ]; then
|
||||
QEMU_SERIAL=""
|
||||
fi
|
||||
|
||||
while true;do
|
||||
case "$1" in
|
||||
--bios)
|
||||
case "$2" in
|
||||
uefi) #uefi启动新增ovmf.fd固件
|
||||
BIOS_TYPE=uefi
|
||||
;;
|
||||
legacy)
|
||||
BIOS_TYPE=legacy
|
||||
;;
|
||||
esac;shift 2;;
|
||||
--display)
|
||||
case "$2" in
|
||||
vnc)
|
||||
QEMU_ARGUMENT+=" -display vnc=:00"
|
||||
;;
|
||||
window)
|
||||
;;
|
||||
nographic)
|
||||
QEMU_SERIAL=" -serial mon:stdio "
|
||||
QEMU_MONITOR=""
|
||||
QEMU_ARGUMENT+=" --nographic "
|
||||
|
||||
;;
|
||||
esac;shift 2;;
|
||||
*) break
|
||||
esac
|
||||
done
|
||||
|
||||
|
||||
# ps: 下面这条使用tap的方式,无法dhcp获取到ip,暂时不知道为什么
|
||||
# QEMU_DEVICES="-device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -net nic,netdev=nic0 -netdev tap,id=nic0,model=virtio-net-pci,script=qemu/ifup-nat,downscript=qemu/ifdown-nat -usb -device qemu-xhci,id=xhci,p2=8,p3=4 "
|
||||
@ -149,28 +179,7 @@ install_riscv_uboot()
|
||||
|
||||
|
||||
if [ $flag_can_run -eq 1 ]; then
|
||||
while true;do
|
||||
case "$1" in
|
||||
--bios)
|
||||
case "$2" in
|
||||
uefi) #uefi启动新增ovmf.fd固件
|
||||
BIOS_TYPE=uefi
|
||||
;;
|
||||
legacy)
|
||||
BIOS_TYPE=legacy
|
||||
;;
|
||||
esac;shift 2;;
|
||||
--display)
|
||||
case "$2" in
|
||||
vnc)
|
||||
QEMU_ARGUMENT+=" -display vnc=:00"
|
||||
;;
|
||||
window)
|
||||
;;
|
||||
esac;shift 2;;
|
||||
*) break
|
||||
esac
|
||||
done
|
||||
|
||||
|
||||
# 删除共享内存
|
||||
sudo rm -rf ${QEMU_MEMORY_BACKEND_PATH_PREFIX}/${QEMU_MEMORY_BACKEND}
|
||||
|
Reference in New Issue
Block a user