QEMU: Don't spawn a VNC session

5 years ago · 821c7e2103
parent 9d77f46759
commit 821c7e2103
16 changed files with 32 additions and 33 deletions
--- a/03_hacky_hello_world/Makefile
+++ b/03_hacky_hello_world/Makefile
@ -13,7 +13,7 @@ ifeq ($(BSP),rpi3)
 	OUTPUT = kernel8.img
 	QEMU_BINARY = qemu-system-aarch64
 	QEMU_MACHINE_TYPE = raspi3
-	QEMU_MISC_ARGS = -serial stdio
+	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 	RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
 else ifeq ($(BSP),rpi4)
@ -21,7 +21,7 @@ else ifeq ($(BSP),rpi4)
 	OUTPUT = kernel8.img
 #	QEMU_BINARY = qemu-system-aarch64
 #	QEMU_MACHINE_TYPE =
-#	QEMU_MISC_ARGS = -serial stdio
+#	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 	RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
 endif
--- a/03_hacky_hello_world/README.md
+++ b/03_hacky_hello_world/README.md
@ -34,7 +34,7 @@ diff -uNr 02_runtime_init/Makefile 03_hacky_hello_world/Makefile
 	QEMU_BINARY = qemu-system-aarch64
 	QEMU_MACHINE_TYPE = raspi3
 -	QEMU_MISC_ARGS = -d in_asm
-+	QEMU_MISC_ARGS = -serial stdio
+	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 	RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
 else ifeq ($(BSP),rpi4)
@ -43,7 +43,7 @@ diff -uNr 02_runtime_init/Makefile 03_hacky_hello_world/Makefile
 #	QEMU_BINARY = qemu-system-aarch64
 #	QEMU_MACHINE_TYPE =
 -#	QEMU_MISC_ARGS = -d in_asm
-+#	QEMU_MISC_ARGS = -serial stdio
+#	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 	RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
 endif
--- a/04_zero_overhead_abstraction/Makefile
+++ b/04_zero_overhead_abstraction/Makefile
@ -13,7 +13,7 @@ ifeq ($(BSP),rpi3)
 	OUTPUT = kernel8.img
 	QEMU_BINARY = qemu-system-aarch64
 	QEMU_MACHINE_TYPE = raspi3
-	QEMU_MISC_ARGS = -serial stdio
+	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 	RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
 else ifeq ($(BSP),rpi4)
@ -21,7 +21,7 @@ else ifeq ($(BSP),rpi4)
 	OUTPUT = kernel8.img
 #	QEMU_BINARY = qemu-system-aarch64
 #	QEMU_MACHINE_TYPE =
-#	QEMU_MISC_ARGS = -serial stdio
+#	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 	RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
 endif
--- a/05_safe_globals/Makefile
+++ b/05_safe_globals/Makefile
@ -13,7 +13,7 @@ ifeq ($(BSP),rpi3)
 	OUTPUT = kernel8.img
 	QEMU_BINARY = qemu-system-aarch64
 	QEMU_MACHINE_TYPE = raspi3
-	QEMU_MISC_ARGS = -serial stdio
+	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 	RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
 else ifeq ($(BSP),rpi4)
@ -21,7 +21,7 @@ else ifeq ($(BSP),rpi4)
 	OUTPUT = kernel8.img
 #	QEMU_BINARY = qemu-system-aarch64
 #	QEMU_MACHINE_TYPE =
-#	QEMU_MISC_ARGS = -serial stdio
+#	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 	RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
 endif
--- a/06_drivers_gpio_uart/Makefile
+++ b/06_drivers_gpio_uart/Makefile
@ -13,7 +13,7 @@ ifeq ($(BSP),rpi3)
 	OUTPUT = kernel8.img
 	QEMU_BINARY = qemu-system-aarch64
 	QEMU_MACHINE_TYPE = raspi3
-	QEMU_MISC_ARGS = -serial stdio
+	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 	RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
 else ifeq ($(BSP),rpi4)
@ -21,7 +21,7 @@ else ifeq ($(BSP),rpi4)
 	OUTPUT = kernel8.img
 #	QEMU_BINARY = qemu-system-aarch64
 #	QEMU_MACHINE_TYPE =
-#	QEMU_MISC_ARGS = -serial stdio
+#	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 	RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
 endif
--- a/07_uart_chainloader/Makefile
+++ b/07_uart_chainloader/Makefile
@ -13,7 +13,7 @@ ifeq ($(BSP),rpi3)
 	OUTPUT = kernel8.img
 	QEMU_BINARY = qemu-system-aarch64
 	QEMU_MACHINE_TYPE = raspi3
-	QEMU_MISC_ARGS = -serial stdio
+	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 	RUSTC_MISC_ARGS = -C target-cpu=cortex-a53 -C relocation-model=pic
 	CHAINBOOT_DEMO_PAYLOAD = demo_payload_rpi3.img
@ -22,7 +22,7 @@ else ifeq ($(BSP),rpi4)
 	OUTPUT = kernel8.img
 #	QEMU_BINARY = qemu-system-aarch64
 #	QEMU_MACHINE_TYPE =
-#	QEMU_MISC_ARGS = -serial stdio
+#	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 	RUSTC_MISC_ARGS = -C target-cpu=cortex-a72 -C relocation-model=pic
 	CHAINBOOT_DEMO_PAYLOAD = demo_payload_rpi4.img
--- a/07_uart_chainloader/README.md
+++ b/07_uart_chainloader/README.md
@ -85,7 +85,7 @@ diff -uNr 06_drivers_gpio_uart/Makefile 07_uart_chainloader/Makefile
 +++ 07_uart_chainloader/Makefile
@@ -15,7 +15,8 @@
 	QEMU_MACHINE_TYPE = raspi3
- 	QEMU_MISC_ARGS = -serial stdio
+ 	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 -	RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
 +	RUSTC_MISC_ARGS = -C target-cpu=cortex-a53 -C relocation-model=pic
@ -95,7 +95,7 @@ diff -uNr 06_drivers_gpio_uart/Makefile 07_uart_chainloader/Makefile
 	OUTPUT = kernel8.img
@@ -23,7 +24,8 @@
 #	QEMU_MACHINE_TYPE =
- #	QEMU_MISC_ARGS = -serial stdio
+ #	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 -	RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
 +	RUSTC_MISC_ARGS = -C target-cpu=cortex-a72 -C relocation-model=pic
--- a/08_timestamps/Makefile
+++ b/08_timestamps/Makefile
@ -13,7 +13,7 @@ ifeq ($(BSP),rpi3)
 	OUTPUT = kernel8.img
 	QEMU_BINARY = qemu-system-aarch64
 	QEMU_MACHINE_TYPE = raspi3
-	QEMU_MISC_ARGS = -serial stdio
+	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 	RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
 else ifeq ($(BSP),rpi4)
@ -21,7 +21,7 @@ else ifeq ($(BSP),rpi4)
 	OUTPUT = kernel8.img
 #	QEMU_BINARY = qemu-system-aarch64
 #	QEMU_MACHINE_TYPE =
-#	QEMU_MISC_ARGS = -serial stdio
+#	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 	RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
 endif
--- a/08_timestamps/README.md
+++ b/08_timestamps/README.md
@ -43,7 +43,7 @@ diff -uNr 07_uart_chainloader/Makefile 08_timestamps/Makefile
 +++ 08_timestamps/Makefile
@@ -15,8 +15,7 @@
 	QEMU_MACHINE_TYPE = raspi3
- 	QEMU_MISC_ARGS = -serial stdio
+ 	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 -	RUSTC_MISC_ARGS = -C target-cpu=cortex-a53 -C relocation-model=pic
 -	CHAINBOOT_DEMO_PAYLOAD = demo_payload_rpi3.img
@ -53,7 +53,7 @@ diff -uNr 07_uart_chainloader/Makefile 08_timestamps/Makefile
 	OUTPUT = kernel8.img
@@ -24,8 +23,7 @@
 #	QEMU_MACHINE_TYPE =
- #	QEMU_MISC_ARGS = -serial stdio
+ #	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 -	RUSTC_MISC_ARGS = -C target-cpu=cortex-a72 -C relocation-model=pic
 -	CHAINBOOT_DEMO_PAYLOAD = demo_payload_rpi4.img
--- a/09_hw_debug_JTAG/Makefile
+++ b/09_hw_debug_JTAG/Makefile
@ -13,7 +13,7 @@ ifeq ($(BSP),rpi3)
 	OUTPUT = kernel8.img
 	QEMU_BINARY = qemu-system-aarch64
 	QEMU_MACHINE_TYPE = raspi3
-	QEMU_MISC_ARGS = -serial stdio
+	QEMU_MISC_ARGS = -serial stdio -display none
 	OPENOCD_ARG = -f /openocd/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg -f /openocd/rpi3.cfg
 	JTAG_BOOT_IMAGE = jtag_boot_rpi3.img
 	LINKER_FILE = src/bsp/rpi/link.ld
@ -23,7 +23,7 @@ else ifeq ($(BSP),rpi4)
 	OUTPUT = kernel8.img
 #	QEMU_BINARY = qemu-system-aarch64
 #	QEMU_MACHINE_TYPE =
-#	QEMU_MISC_ARGS = -serial stdio
+#	QEMU_MISC_ARGS = -serial stdio -display none
 	OPENOCD_ARG = -f /openocd/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg -f /openocd/rpi4.cfg
 	JTAG_BOOT_IMAGE = jtag_boot_rpi4.img
 	LINKER_FILE = src/bsp/rpi/link.ld
--- a/09_hw_debug_JTAG/README.md
+++ b/09_hw_debug_JTAG/README.md
@ -287,7 +287,7 @@ diff -uNr 08_timestamps/Makefile 09_hw_debug_JTAG/Makefile
@@ -14,6 +14,8 @@
 	QEMU_BINARY = qemu-system-aarch64
 	QEMU_MACHINE_TYPE = raspi3
- 	QEMU_MISC_ARGS = -serial stdio
+ 	QEMU_MISC_ARGS = -serial stdio -display none
 +	OPENOCD_ARG = -f /openocd/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg -f /openocd/rpi3.cfg
 +	JTAG_BOOT_IMAGE = jtag_boot_rpi3.img
 	LINKER_FILE = src/bsp/rpi/link.ld
@ -296,7 +296,7 @@ diff -uNr 08_timestamps/Makefile 09_hw_debug_JTAG/Makefile
@@ -22,6 +24,8 @@
 #	QEMU_BINARY = qemu-system-aarch64
 #	QEMU_MACHINE_TYPE =
- #	QEMU_MISC_ARGS = -serial stdio
+ #	QEMU_MISC_ARGS = -serial stdio -display none
 +	OPENOCD_ARG = -f /openocd/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg -f /openocd/rpi4.cfg
 +	JTAG_BOOT_IMAGE = jtag_boot_rpi4.img
 	LINKER_FILE = src/bsp/rpi/link.ld
--- a/10_privilege_level/Makefile
+++ b/10_privilege_level/Makefile
@ -13,7 +13,7 @@ ifeq ($(BSP),rpi3)
 	OUTPUT = kernel8.img
 	QEMU_BINARY = qemu-system-aarch64
 	QEMU_MACHINE_TYPE = raspi3
-	QEMU_MISC_ARGS = -serial stdio
+	QEMU_MISC_ARGS = -serial stdio -display none
 	OPENOCD_ARG = -f /openocd/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg -f /openocd/rpi3.cfg
 	JTAG_BOOT_IMAGE = jtag_boot_rpi3.img
 	LINKER_FILE = src/bsp/rpi/link.ld
@ -23,7 +23,7 @@ else ifeq ($(BSP),rpi4)
 	OUTPUT = kernel8.img
 #	QEMU_BINARY = qemu-system-aarch64
 #	QEMU_MACHINE_TYPE =
-#	QEMU_MISC_ARGS = -serial stdio
+#	QEMU_MISC_ARGS = -serial stdio -display none
 	OPENOCD_ARG = -f /openocd/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg -f /openocd/rpi4.cfg
 	JTAG_BOOT_IMAGE = jtag_boot_rpi4.img
 	LINKER_FILE = src/bsp/rpi/link.ld
--- a/11_virtual_memory/Makefile
+++ b/11_virtual_memory/Makefile
@ -13,7 +13,7 @@ ifeq ($(BSP),rpi3)
 	OUTPUT = kernel8.img
 	QEMU_BINARY = qemu-system-aarch64
 	QEMU_MACHINE_TYPE = raspi3
-	QEMU_MISC_ARGS = -serial stdio
+	QEMU_MISC_ARGS = -serial stdio -display none
 	OPENOCD_ARG = -f /openocd/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg -f /openocd/rpi3.cfg
 	JTAG_BOOT_IMAGE = jtag_boot_rpi3.img
 	LINKER_FILE = src/bsp/rpi/link.ld
@ -23,7 +23,7 @@ else ifeq ($(BSP),rpi4)
 	OUTPUT = kernel8.img
 #	QEMU_BINARY = qemu-system-aarch64
 #	QEMU_MACHINE_TYPE =
-#	QEMU_MISC_ARGS = -serial stdio
+#	QEMU_MISC_ARGS = -serial stdio -display none
 	OPENOCD_ARG = -f /openocd/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg -f /openocd/rpi4.cfg
 	JTAG_BOOT_IMAGE = jtag_boot_rpi4.img
 	LINKER_FILE = src/bsp/rpi/link.ld
--- a/12_cpu_exceptions_part1/Makefile
+++ b/12_cpu_exceptions_part1/Makefile
@ -13,7 +13,7 @@ ifeq ($(BSP),rpi3)
 	OUTPUT = kernel8.img
 	QEMU_BINARY = qemu-system-aarch64
 	QEMU_MACHINE_TYPE = raspi3
-	QEMU_MISC_ARGS = -serial stdio
+	QEMU_MISC_ARGS = -serial stdio -display none
 	OPENOCD_ARG = -f /openocd/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg -f /openocd/rpi3.cfg
 	JTAG_BOOT_IMAGE = jtag_boot_rpi3.img
 	LINKER_FILE = src/bsp/rpi/link.ld
@ -23,7 +23,7 @@ else ifeq ($(BSP),rpi4)
 	OUTPUT = kernel8.img
 #	QEMU_BINARY = qemu-system-aarch64
 #	QEMU_MACHINE_TYPE =
-#	QEMU_MISC_ARGS = -serial stdio
+#	QEMU_MISC_ARGS = -serial stdio -display none
 	OPENOCD_ARG = -f /openocd/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg -f /openocd/rpi4.cfg
 	JTAG_BOOT_IMAGE = jtag_boot_rpi4.img
 	LINKER_FILE = src/bsp/rpi/link.ld
--- a/12_cpu_exceptions_part1/README.md
+++ b/12_cpu_exceptions_part1/README.md
@ -166,8 +166,8 @@ Context save and restore is one of the few places in system software where it is
 to use some hand-crafted assembly. Introducing `exception.S`:

 ```asm
-/// Call the function provided by parameter `\handler` after saving exception context, providing the
-/// same as the first parameter.
+/// Call the function provided by parameter `\handler` after saving exception context. Provide the
+/// context as the first parameter to '\handler'.
 .macro CALL_WITH_CONTEXT handler
    // Make room on the stack for the exception context.
    sub    sp,  sp,  #16 * 17
@ -230,7 +230,6 @@ Next, we craft the exception vector table:
 .align 11

 // Export a symbol for the Rust code to use.
-.global __exception_vector_start
 __exception_vector_start:

 // Current exception level with SP_EL0.
--- a/X1_JTAG_boot/Makefile
+++ b/X1_JTAG_boot/Makefile
@ -13,7 +13,7 @@ ifeq ($(BSP),rpi3)
 	OUTPUT = kernel8.img
 	QEMU_BINARY = qemu-system-aarch64
 	QEMU_MACHINE_TYPE = raspi3
-	QEMU_MISC_ARGS = -serial stdio
+	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 	RUSTC_MISC_ARGS = -C target-cpu=cortex-a53
 else ifeq ($(BSP),rpi4)
@ -21,7 +21,7 @@ else ifeq ($(BSP),rpi4)
 	OUTPUT = kernel8.img
 #	QEMU_BINARY = qemu-system-aarch64
 #	QEMU_MACHINE_TYPE =
-#	QEMU_MISC_ARGS = -serial stdio
+#	QEMU_MISC_ARGS = -serial stdio -display none
 	LINKER_FILE = src/bsp/rpi/link.ld
 	RUSTC_MISC_ARGS = -C target-cpu=cortex-a72
 endif