Merge branch 'master' of https://github.com/rcore-os/rCore_tutorial

rcore-os · Feb 12, 2020 · f658dcd · f658dcd
2 parents 5461f93 + 02323c8
commit f658dcd
Show file tree

Hide file tree

Showing 16 changed files with 614 additions and 21 deletions.
diff --git a/os/Makefile b/os/Makefile
@@ -23,6 +23,8 @@ $(bin): kernel
 
 asm:
 	$(objdump) -d $(kernel) | less
+assembly:
+	$(objdump) -d $(kernel) > target/os.asm
 
 build: $(bin)
 
@@ -34,6 +36,8 @@ qemu: build
 		-machine virt \
 		-nographic \
 		-bios default \
-		-device loader,file=$(bin),addr=0x80200000
+		-device loader,file=$(bin),addr=0x80200000 \
+		-drive file=../usr/build/riscv64.img,if=none,format=raw,id=x0 \
+		-device virtio-blk-device,drive=x0,bus=virtio-mmio-bus.0
 
 run: build qemu
diff --git a/os/src/drivers/mod.rs b/os/src/drivers/mod.rs
@@ -0,0 +1 @@
+pub mod virtio_disk;