Skip to content

Commit

Permalink
delete some envvar
Browse files Browse the repository at this point in the history
  • Loading branch information
fslongjin committed Nov 24, 2023
1 parent 5e151d0 commit 3338a42
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
3 changes: 2 additions & 1 deletion kernel/src/syscall/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1207,7 +1207,8 @@ impl Syscall {
}

SYS_MADVISE => {
kwarn!("SYS_MADVISE has not yet been implemented");
// 这个太吵了,总是打印,先注释掉
// kwarn!("SYS_MADVISE has not yet been implemented");
Ok(0)
}
SYS_GETTID => Self::gettid().map(|tid| tid.into()),
Expand Down
2 changes: 1 addition & 1 deletion tools/run-qemu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ QEMU_DEVICES="-device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -netdev
# QEMU_DEVICES="-device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -netdev user,id=hostnet0,hostfwd=tcp::12580-:12580 -net nic,model=e1000e,netdev=hostnet0,id=net0 -netdev user,id=hostnet1,hostfwd=tcp::12581-:12581 -device virtio-net-pci,vectors=5,netdev=hostnet1,id=net1 -usb -device qemu-xhci,id=xhci,p2=8,p3=4 "
QEMU_ARGUMENT="-d ${QEMU_DISK_IMAGE} -m ${QEMU_MEMORY} -smp ${QEMU_SMP} -boot order=d -monitor ${QEMU_MONITOR} -d ${qemu_trace_std} "

QEMU_ARGUMENT+="-s ${QEMU_MACHINE} ${QEMU_CPU_FEATURES} ${QEMU_RTC_CLOCK} ${QEMU_SERIAL} -drive ${QEMU_DRIVE} ${QEMU_DEVICES} --nographic"
QEMU_ARGUMENT+="-s ${QEMU_MACHINE} ${QEMU_CPU_FEATURES} ${QEMU_RTC_CLOCK} ${QEMU_SERIAL} -drive ${QEMU_DRIVE} ${QEMU_DEVICES}"
QEMU_ARGUMENT+=" ${QEMU_SHM_OBJECT} "
QEMU_ARGUMENT+=" ${QEMU_ACCELARATE} "

Expand Down
8 changes: 1 addition & 7 deletions user/dadk/config/nova_shell-0.1.0.dadk
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"task_type": {
"BuildFromSource": {
"Git": {
"url": "https://git.mirrors.dragonos.org/DragonOS-Community/NovaShell.git",
"url": "https://git.mirrors.dragonos.org.cn/DragonOS-Community/NovaShell.git",
"revision": "81c6126119"
}
}
Expand All @@ -20,10 +20,4 @@
"install": {
"in_dragonos_path": "/"
},
"envs": [
{
"key": "TARGET",
"value": "${ROOT_PATH}/user/dadk/target/x86_64-unknown-dragonos.json"
}
]
}

0 comments on commit 3338a42

Please sign in to comment.