andrey/rCore
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore.git synced 2024-11-23 00:16:17 +04:00
Code Issues Projects Releases Wiki Activity

user: fix build error

Browse Source
This commit is contained in:
equation314 2018-12-03 12:30:03 +08:00
parent 3f2beab52d
commit d5a6eb2020
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/Cargo.toml
View File

@ -63,6 +63,7 @@ minimum-image-size = 0 # The minimum output file size (in MiB)
# (the "{}" will be replaced with the path to the bootable disk image) # (the "{}" will be replaced with the path to the bootable disk image)
run-command = ["qemu-system-x86_64", run-command = ["qemu-system-x86_64",
"-drive", "format=raw,file={}", "-drive", "format=raw,file={}",
# TODO: use SFSIMG environment variable
"-drive", "format=raw,file=../user/img/ucore-i386-pic.img,media=disk,cache=writeback", "-drive", "format=raw,file=../user/img/ucore-i386-pic.img,media=disk,cache=writeback",
"-serial", "mon:stdio", "-serial", "mon:stdio",
"-device", "isa-debug-exit", "-device", "isa-debug-exit",

2
kernel/Makefile
View File

@ -48,7 +48,7 @@ qemu_opts := \
ifeq ($(arch), x86_64) ifeq ($(arch), x86_64)
qemu_opts += \ qemu_opts += \
-drive format=raw,file=$(bootimage) \ -drive format=raw,file=$(bootimage) \
-drive format=raw,file="../user/img/ucore-i386-pic.img",media=disk,cache=writeback \ -drive format=raw,file=$(SFSIMG),media=disk,cache=writeback \
-serial mon:stdio \ -serial mon:stdio \
-device isa-debug-exit -device isa-debug-exit

4
user/ucore-ulib/src/lang_items.rs
View File

@ -1,5 +1,5 @@
use syscall::{sys_close, sys_dup, sys_exit, sys_open}; use crate::syscall::{sys_close, sys_dup, sys_exit, sys_open};
use syscall::{O_RDONLY, O_WRONLY}; use crate::syscall::{O_RDONLY, O_WRONLY};
use core::alloc::Layout; use core::alloc::Layout;
use core::panic::PanicInfo; use core::panic::PanicInfo;