README, Makefile: adjust targets.

Remove "run" and "debug" targets. Adjust "gdb" target to read symbols from TARGET_DEBUG, which has the symbols. Also remove the "-ex 'b _start'" and append -S to QEMU_DEBUG_PARAMS to wait for debugger instead. I am not sure we can even use software breakpoints. Signed-off-by: Johannes Wikner <[email protected]>
KernelTestFramework · Aug 31, 2023 · 5707bd6 · 5707bd6
1 parent 52375e5
commit 5707bd6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -266,8 +266,7 @@ QEMU_PARAMS_NOGFX := -display none -vga none -vnc none
 QEMU_PARAMS_GFX := $(QEMU_PARAMS)
 QEMU_PARAMS += $(QEMU_PARAMS_NOGFX)
 
-QEMU_PARAMS_KERNEL := -append "param1 param2 param3"
-QEMU_PARAMS_DEBUG := -s &
+QEMU_PARAMS_DEBUG := -s -S &
 
 ISO_FILE := boot.iso
 
@@ -298,17 +297,9 @@ boot_gfx: $(ISO_FILE)
 boot_debug: $(ISO_FILE)
 	$(QEMU_BIN) -cdrom $(ISO_FILE) $(QEMU_PARAMS) $(QEMU_PARAMS_DEBUG)
 
-.PHONY: run
-run: $(TARGET)
-	$(QEMU_BIN) -kernel $(TARGET) $(QEMU_PARAMS) $(QEMU_PARAMS_KERNEL)
-
-.PHONY: debug
-debug: $(TARGET)
-	$(QEMU_BIN) -kernel $(TARGET) $(QEMU_PARAMS) $(QEMU_PARAMS_KERNEL) $(QEMU_PARAMS_DEBUG)
-
 .PHONY: gdb
-gdb: debug
-	$(GDB) $(TARGET) -ex 'target remote :1234' -ex 'b _start' -ex 'c'
+gdb: boot_debug
+	$(GDB) $(TARGET_DEBUG) -ex 'target remote :1234' -ex 'hb _start' -ex c
 	killall -9 $(QEMU_BIN)
 
 define all_sources

diff --git a/README.md b/README.md
@@ -106,14 +106,14 @@ For booting run:
 make boot
 ```
 
-For debugging ISO run:
+For debugging run:
 ```
 make boot_debug
 ```
 
-For debugging kernel image run:
+For debugging with gdb run:
 ```
-make debug
+make gdb
 ```
 
 #### Xen guest