summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2020-07-17 16:29:43 -0400
committerFrans Kaashoek <[email protected]>2020-08-10 11:19:10 -0400
commit82981fab6bbd36dc0ff24201a11d365c4a2c6b1d (patch)
treefcb7c8bae80ecd02267a51e4864a465ea9100958 /Makefile
parentaf9eb9114c2f8700d4315eaa1e2d637c2aaaf210 (diff)
downloadxv6-labs-82981fab6bbd36dc0ff24201a11d365c4a2c6b1d.tar.gz
xv6-labs-82981fab6bbd36dc0ff24201a11d365c4a2c6b1d.tar.bz2
xv6-labs-82981fab6bbd36dc0ff24201a11d365c4a2c6b1d.zip
drop QEMUEXTRA
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 7bfee58..96f1c14 100644
--- a/Makefile
+++ b/Makefile
@@ -156,9 +156,9 @@ ifndef CPUS
CPUS := 3
endif
-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 128M -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
+QEMUOPTS += -drive file=fs.img,if=none,format=raw,id=x0
+QEMUOPTS += -device virtio-blk-device,drive=x0,bus=virtio-mmio-bus.0
qemu: $K/kernel fs.img
$(QEMU) $(QEMUOPTS)