From c8e545dfb1738fa915c0ca3885baff51a861b6db Mon Sep 17 00:00:00 2001 From: yuchen Date: Tue, 10 Mar 2015 22:03:43 +0800 Subject: [PATCH] update Makefiles with qemu -no-reboot option --- labcodes/lab1/Makefile | 6 +++--- labcodes/lab2/Makefile | 6 +++--- labcodes/lab3/Makefile | 6 +++--- labcodes/lab4/Makefile | 6 +++--- labcodes/lab5/Makefile | 6 +++--- labcodes/lab6/Makefile | 6 +++--- labcodes/lab7/Makefile | 6 +++--- labcodes/lab8/Makefile | 8 ++++---- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/labcodes/lab1/Makefile b/labcodes/lab1/Makefile index eacc043..d7e7daf 100644 --- a/labcodes/lab1/Makefile +++ b/labcodes/lab1/Makefile @@ -208,12 +208,12 @@ TARGETS: $(TARGETS) .PHONY: qemu qemu-nox debug debug-nox qemu-mon: $(UCOREIMG) - $(V)$(QEMU) -monitor stdio -hda $< -serial null + $(V)$(QEMU) -no-reboot -monitor stdio -hda $< -serial null qemu: $(UCOREIMG) - $(V)$(QEMU) -parallel stdio -hda $< -serial null + $(V)$(QEMU) -no-reboot -parallel stdio -hda $< -serial null qemu-nox: $(UCOREIMG) - $(V)$(QEMU) -serial mon:stdio -hda $< -nographic + $(V)$(QEMU) -no-reboot -serial mon:stdio -hda $< -nographic TERMINAL :=gnome-terminal debug: $(UCOREIMG) $(V)$(QEMU) -S -s -parallel stdio -hda $< -serial null & diff --git a/labcodes/lab2/Makefile b/labcodes/lab2/Makefile index c7dc43d..5496909 100644 --- a/labcodes/lab2/Makefile +++ b/labcodes/lab2/Makefile @@ -232,12 +232,12 @@ QEMUOPTS = -hda $(UCOREIMG) .PHONY: qemu qemu-nox gdb debug debug-mon debug-nox qemu-mon: targets - $(V)$(QEMU) -monitor stdio $(QEMUOPTS) -serial null + $(V)$(QEMU) -no-reboot -monitor stdio $(QEMUOPTS) -serial null qemu: targets - $(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null + $(V)$(QEMU) -no-reboot -parallel stdio $(QEMUOPTS) -serial null qemu-nox: targets - $(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic + $(V)$(QEMU) -no-reboot -serial mon:stdio $(QEMUOPTS) -nographic gdb: $(V)$(GDB) -q -x tools/gdbinit diff --git a/labcodes/lab3/Makefile b/labcodes/lab3/Makefile index bdc49e6..0628063 100644 --- a/labcodes/lab3/Makefile +++ b/labcodes/lab3/Makefile @@ -226,12 +226,12 @@ QEMUOPTS = -hda $(UCOREIMG) -drive file=$(SWAPIMG),media=disk,cache=writeback .PHONY: qemu qemu-nox debug debug-nox qemu-mon: $(UCOREIMG) $(SWAPIMG) - $(V)$(QEMU) -monitor stdio $(QEMUOPTS) -serial null + $(V)$(QEMU) -no-reboot -monitor stdio $(QEMUOPTS) -serial null qemu: $(UCOREIMG) $(SWAPIMG) - $(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null + $(V)$(QEMU) -no-reboot -parallel stdio $(QEMUOPTS) -serial null qemu-nox: $(UCOREIMG) $(SWAPIMG) - $(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic + $(V)$(QEMU) -no-reboot -serial mon:stdio $(QEMUOPTS) -nographic TERMINAL := gnome-terminal diff --git a/labcodes/lab4/Makefile b/labcodes/lab4/Makefile index 74cc61d..a79cf9f 100644 --- a/labcodes/lab4/Makefile +++ b/labcodes/lab4/Makefile @@ -230,12 +230,12 @@ QEMUOPTS = -hda $(UCOREIMG) -drive file=$(SWAPIMG),media=disk,cache=writeback .PHONY: qemu qemu-nox debug debug-nox qemu-mon: $(UCOREIMG) $(SWAPIMG) - $(V)$(QEMU) -monitor stdio $(QEMUOPTS) -serial null + $(V)$(QEMU) -no-reboot -monitor stdio $(QEMUOPTS) -serial null qemu: $(UCOREIMG) $(SWAPIMG) - $(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null + $(V)$(QEMU) -no-reboot -parallel stdio $(QEMUOPTS) -serial null qemu-nox: $(UCOREIMG) $(SWAPIMG) - $(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic + $(V)$(QEMU) -no-reboot -serial mon:stdio $(QEMUOPTS) -nographic TERMINAL := gnome-terminal diff --git a/labcodes/lab5/Makefile b/labcodes/lab5/Makefile index 0ebae6d..d5ea58f 100644 --- a/labcodes/lab5/Makefile +++ b/labcodes/lab5/Makefile @@ -269,12 +269,12 @@ QEMUOPTS = -hda $(UCOREIMG) -drive file=$(SWAPIMG),media=disk,cache=writeback .PHONY: qemu qemu-nox debug debug-nox qemu-mon: $(UCOREIMG) $(SWAPIMG) - $(V)$(QEMU) -monitor stdio $(QEMUOPTS) -serial null + $(V)$(QEMU) -no-reboot -monitor stdio $(QEMUOPTS) -serial null qemu: $(UCOREIMG) $(SWAPIMG) - $(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null + $(V)$(QEMU) -no-reboot -parallel stdio $(QEMUOPTS) -serial null qemu-nox: $(UCOREIMG) $(SWAPIMG) - $(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic + $(V)$(QEMU) -no-reboot -serial mon:stdio $(QEMUOPTS) -nographic TERMINAL := gnome-terminal diff --git a/labcodes/lab6/Makefile b/labcodes/lab6/Makefile index e87d265..fe161c0 100644 --- a/labcodes/lab6/Makefile +++ b/labcodes/lab6/Makefile @@ -269,12 +269,12 @@ QEMUOPTS = -hda $(UCOREIMG) -drive file=$(SWAPIMG),media=disk,cache=writeback .PHONY: qemu qemu-nox debug debug-nox qemu-mon: $(UCOREIMG) $(SWAPIMG) - $(V)$(QEMU) -monitor stdio $(QEMUOPTS) -serial null + $(V)$(QEMU) -no-reboot -monitor stdio $(QEMUOPTS) -serial null qemu: $(UCOREIMG) $(SWAPIMG) - $(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null + $(V)$(QEMU) -no-reboot -parallel stdio $(QEMUOPTS) -serial null qemu-nox: $(UCOREIMG) $(SWAPIMG) - $(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic + $(V)$(QEMU) -no-reboot -serial mon:stdio $(QEMUOPTS) -nographic TERMINAL := gnome-terminal diff --git a/labcodes/lab7/Makefile b/labcodes/lab7/Makefile index b1a879b..613b097 100644 --- a/labcodes/lab7/Makefile +++ b/labcodes/lab7/Makefile @@ -269,12 +269,12 @@ QEMUOPTS = -hda $(UCOREIMG) -drive file=$(SWAPIMG),media=disk,cache=writeback .PHONY: qemu qemu-nox debug debug-nox qemu-mon: $(UCOREIMG) $(SWAPIMG) - $(V)$(QEMU) -monitor stdio $(QEMUOPTS) -serial null + $(V)$(QEMU) -no-reboot -monitor stdio $(QEMUOPTS) -serial null qemu: $(UCOREIMG) $(SWAPIMG) - $(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null + $(V)$(QEMU) -no-reboot -parallel stdio $(QEMUOPTS) -serial null qemu-nox: $(UCOREIMG) $(SWAPIMG) - $(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic + $(V)$(QEMU) -no-reboot -serial mon:stdio $(QEMUOPTS) -nographic TERMINAL := gnome-terminal diff --git a/labcodes/lab8/Makefile b/labcodes/lab8/Makefile index 1125da0..d87f0a8 100644 --- a/labcodes/lab8/Makefile +++ b/labcodes/lab8/Makefile @@ -309,15 +309,15 @@ QEMUOPTS = -hda $(UCOREIMG) -drive file=$(SWAPIMG),media=disk,cache=writeback -d .PHONY: qemu qemu-nox debug debug-nox monitor qemu-mon: $(UCOREIMG) $(SWAPIMG) $(SFSIMG) - $(V)$(QEMU) -monitor stdio $(QEMUOPTS) -serial null + $(V)$(QEMU) -no-reboot -monitor stdio $(QEMUOPTS) -serial null qemu: $(UCOREIMG) $(SWAPIMG) $(SFSIMG) - $(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null + $(V)$(QEMU) -no-reboot -parallel stdio $(QEMUOPTS) -serial null qemu-nox: $(UCOREIMG) $(SWAPIMG) $(SFSIMG) - $(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic + $(V)$(QEMU) -no-reboot -serial mon:stdio $(QEMUOPTS) -nographic monitor: $(UCOREIMG) $(SWAPING) $(SFSIMG) - $(V)$(QEMU) -monitor stdio $(QEMUOPTS) -serial null + $(V)$(QEMU) -no-reboot -monitor stdio $(QEMUOPTS) -serial null TERMINAL := gnome-terminal