DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-18 08:06:32 +00:00
Code Issues Releases Wiki Activity

feat: 支持在rv64下，运行rust编写的helloworld程序 (#1125)

Browse Source 
* 添加 riscv_rust_init 这个helloworld程序

Signed-off-by: longjin <longjin@DragonOS.org>

* feat: 支持在riscv下启动rust编写的hello world程序

TODO: 支持sys ppoll

Signed-off-by: longjin <longjin@DragonOS.org>

* chore: 更新构建容器版本至v1.9

Signed-off-by: longjin <longjin@DragonOS.org>

* 1

---------

Signed-off-by: longjin <longjin@DragonOS.org>
This commit is contained in:
LoGin
2025-03-30 01:28:41 +08:00
committed by GitHub
parent 55833537f1
commit 03015e2559
17 changed files with 152 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
tools/run-qemu.sh
View File

@ -85,7 +85,10 @@ QEMU_ACCELARATE=""
QEMU_ARGUMENT=" -no-reboot "
QEMU_DEVICES=""
KERNEL_CMDLINE=""
# 设置无图形界面模式
QEMU_NOGRAPHIC=false
KERNEL_CMDLINE=" "
BIOS_TYPE=""
#这个变量为true则使用virtio磁盘
@ -116,15 +119,12 @@ fi
if [ ${ARCH} == "riscv64" ]; then
# 如果是riscv64架构，就不需要图形界面
QEMU_ARGUMENT+=" --nographic "
# 从控制台显示
QEMU_MONITOR=""
QEMU_SERIAL=""
QEMU_NOGRAPHIC=true
fi
while true;do
case "$1" in
--bios)
--bios)
case "$2" in
uefi) #uefi启动新增ovmf.fd固件
BIOS_TYPE=uefi
@ -141,21 +141,43 @@ while true;do
window)
;;
nographic)
QEMU_SERIAL=" -serial chardev:mux -monitor chardev:mux -chardev stdio,id=mux,mux=on,signal=off,logfile=${QEMU_SERIAL_LOG_FILE} "
# 添加 virtio console 设备
QEMU_DEVICES+=" -device virtio-serial -device virtconsole,chardev=mux "
KERNEL_CMDLINE+=" console=/dev/hvc0 "
QEMU_MONITOR=""
QEMU_ARGUMENT+=" --nographic "
QEMU_ARGUMENT+=" -kernel ../bin/kernel/kernel.elf "
QEMU_ARGUMENT+="-append ${KERNEL_CMDLINE}"
QEMU_NOGRAPHIC=true
;;
esac;shift 2;;
*) break
esac
esac
done
if [ ${QEMU_NOGRAPHIC} == true ]; then
QEMU_SERIAL=" -serial chardev:mux -monitor chardev:mux -chardev stdio,id=mux,mux=on,signal=off,logfile=${QEMU_SERIAL_LOG_FILE} "
# 添加 virtio console 设备
if [${ARCH} == "x86_64" ]; then
QEMU_DEVICES+=" -device virtio-serial -device virtconsole,chardev=mux "
elif [ ${ARCH} == "riscv64" ]; then
QEMU_DEVICES+=" -device virtio-serial-device -device virtconsole,chardev=mux "
fi
KERNEL_CMDLINE+=" console=/dev/hvc0 "
QEMU_MONITOR=""
QEMU_ARGUMENT+=" --nographic "
if [ ${ARCH} == "x86_64" ]; then
QEMU_ARGUMENT+=" -kernel ../bin/kernel/kernel.elf "
fi
fi
setup_kernel_init_program() {
if [ ${ARCH} == "x86_64" ]; then
KERNEL_CMDLINE+=" init=/bin/dragonreach "
elif [ ${ARCH} == "riscv64" ]; then
KERNEL_CMDLINE+=" init=/bin/riscv_rust_init "
fi
}
# 设置内核init程序
setup_kernel_init_program
# 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 "
@ -222,7 +244,7 @@ else
elif [ ${ARCH} == riscv64 ] ;then
# 如果是riscv64架构，就与efi启动一样
install_riscv_uboot
sudo ${QEMU} -kernel ${RISCV64_UBOOT_PATH}/u-boot.bin ${QEMU_ARGUMENT}
sudo ${QEMU} -kernel ${RISCV64_UBOOT_PATH}/u-boot.bin ${QEMU_ARGUMENT} -append "${KERNEL_CMDLINE}"
else
echo "不支持的架构: ${ARCH}"
fi