summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXi Wang <[email protected]>2019-09-14 01:13:21 +0800
committerFrans Kaashoek <[email protected]>2019-09-13 17:23:36 -0400
commitb150908354dd166ed9f00287064216d09a3ba807 (patch)
tree0b4d137146af659c28371ea5c5887e58adc64a64
parent036b5edf12fccc06a11287ad58565f253ab2eef6 (diff)
downloadxv6-labs-b150908354dd166ed9f00287064216d09a3ba807.tar.gz
xv6-labs-b150908354dd166ed9f00287064216d09a3ba807.tar.bz2
xv6-labs-b150908354dd166ed9f00287064216d09a3ba807.zip
add `-bios none' to silence qemu
QEMU 4.1+ emits warnings if -bios is not given, as newer versions will load the OpenSBI firmware in this case. Pass `-bios none' to avoid this issue.
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4324d1c..331e833 100644
--- a/Makefile
+++ b/Makefile
@@ -152,7 +152,9 @@ QEMUGDB = $(shell if $(QEMU) -help | grep -q '^-gdb'; \
ifndef CPUS
CPUS := 3
endif
-QEMUOPTS = -machine virt -kernel $K/kernel -m 3G -smp $(CPUS) -nographic
+
+QEMUEXTRA = -drive file=fs1.img,if=none,format=raw,id=x1 -device virtio-blk-device,drive=x1,bus=virtio-mmio-bus.1
+QEMUOPTS = -machine virt -bios none -kernel $K/kernel -m 3G -smp $(CPUS) -nographic
QEMUOPTS += -drive file=fs.img,if=none,format=raw,id=x0 -device virtio-blk-device,drive=x0,bus=virtio-mmio-bus.0
qemu: $K/kernel fs.img