Skip to content
Snippets Groups Projects
Commit 0df9d7ba authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Merge branch 'less_qemu_logs' into 'master' 

Only enable -d cpu_reset for qemu when debugging

See merge request !1419
parents 000f0c45 69364ba1
Branches
Tags
1 merge request!1419Only enable -d cpu_reset for qemu when debugging
Pipeline #14151 failed
Stage: test
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
mk/qemu.mk
+ 2
− 2
View file @ 0df9d7ba
QEMU=SDL_VIDEO_X11_DGAMOUSE=0 qemu-system-$(QEMU_ARCH) QEMU=SDL_VIDEO_X11_DGAMOUSE=0 qemu-system-$(QEMU_ARCH)
QEMUFLAGS=-d cpu_reset,guest_errors -name "Redox OS $(ARCH)" QEMUFLAGS=-d guest_errors -name "Redox OS $(ARCH)"
ifeq ($(ARCH),i686) ifeq ($(ARCH),i686)
audio?=ac97 audio?=ac97
...@@ -121,7 +121,7 @@ ifneq ($(usb),no) ...@@ -121,7 +121,7 @@ ifneq ($(usb),no)
endif endif
ifeq ($(gdb),yes) ifeq ($(gdb),yes)
QEMUFLAGS+=-s -S QEMUFLAGS+=-d cpu_reset -s -S
endif endif
ifeq ($(UNAME),Linux) ifeq ($(UNAME),Linux)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment