From 3338a42ca14262fa6e059454f68a2da2a3efd00b Mon Sep 17 00:00:00 2001 From: longjin Date: Fri, 24 Nov 2023 16:21:37 +0800 Subject: [PATCH] delete some envvar --- kernel/src/syscall/mod.rs | 3 ++- tools/run-qemu.sh | 2 +- user/dadk/config/nova_shell-0.1.0.dadk | 8 +------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/kernel/src/syscall/mod.rs b/kernel/src/syscall/mod.rs index 1f7a777b8..94c78822f 100644 --- a/kernel/src/syscall/mod.rs +++ b/kernel/src/syscall/mod.rs @@ -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()), diff --git a/tools/run-qemu.sh b/tools/run-qemu.sh index fff554d81..9405b6272 100644 --- a/tools/run-qemu.sh +++ b/tools/run-qemu.sh @@ -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} " diff --git a/user/dadk/config/nova_shell-0.1.0.dadk b/user/dadk/config/nova_shell-0.1.0.dadk index dd3b2e9d6..3aeea51c7 100644 --- a/user/dadk/config/nova_shell-0.1.0.dadk +++ b/user/dadk/config/nova_shell-0.1.0.dadk @@ -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" } } @@ -20,10 +20,4 @@ "install": { "in_dragonos_path": "/" }, - "envs": [ - { - "key": "TARGET", - "value": "${ROOT_PATH}/user/dadk/target/x86_64-unknown-dragonos.json" - } - ] }