summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter H. Froehlich <[email protected]>2015-09-26 17:38:04 -0400
committerFrans Kaashoek <[email protected]>2016-08-18 14:30:30 -0400
commit5faed8ba6489c60e2df4971af0bd28a6af55b00a (patch)
tree0e9805dad8d9914860aee0128ed13ad8c62c7fc3
parent0f3d9d9d68eb429c5ce0c5bbf66cac6740f3d87c (diff)
downloadxv6-labs-5faed8ba6489c60e2df4971af0bd28a6af55b00a.tar.gz
xv6-labs-5faed8ba6489c60e2df4971af0bd28a6af55b00a.tar.bz2
xv6-labs-5faed8ba6489c60e2df4971af0bd28a6af55b00a.zip
Fixed QEMU command line avoids raw image warning.
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6737a4f..a635b64 100644
--- a/Makefile
+++ b/Makefile
@@ -210,7 +210,7 @@ QEMUGDB = $(shell if $(QEMU) -help | grep -q '^-gdb'; \
ifndef CPUS
CPUS := 2
endif
-QEMUOPTS = -hdb fs.img xv6.img -smp $(CPUS) -m 512 $(QEMUEXTRA)
+QEMUOPTS = -drive file=fs.img,index=1,media=disk,format=raw -drive file=xv6.img,index=0,media=disk,format=raw -smp $(CPUS) -m 512 $(QEMUEXTRA)
qemu: fs.img xv6.img
$(QEMU) -serial mon:stdio $(QEMUOPTS)