Add 'nokaslr' when running QEMU with GDB enabled

KASLR prevents us from breaking in EL1 otherwise.

Change-Id: I4bdbd3adc57866c7b9a382b367dd9909ad5c0fe2
diff --git a/aarch64/run_qemu.sh b/aarch64/run_qemu.sh
index 19a54ac..75002b7 100755
--- a/aarch64/run_qemu.sh
+++ b/aarch64/run_qemu.sh
@@ -53,6 +53,7 @@
 }
 
 CMD=()
+APPEND=()
 EXTRA_ARGS=()
 EXTRA_RO_MOUNTS=()
 
@@ -97,6 +98,7 @@
 	CMD+=(timeout -k 1s --foreground "${TIMEOUT}")
 fi
 CMD+=("${QEMU}")
+APPEND+=(rootwait root=/dev/vda)
 
 for MOUNT in "${EXTRA_RO_MOUNTS[@]}"; do
 	EXTRA_ARGS+=(-drive "file=${MOUNT},readonly,if=virtio,format=raw")
@@ -104,6 +106,7 @@
 
 if [ "${GDB}" -eq 1 ]; then
 	EXTRA_ARGS+=(-S -s)
+	APPEND+=(nokaslr)
 fi
 
 if [ "${VERBOSE}" -eq 1 ]; then
@@ -119,5 +122,5 @@
 	-object rng-random,filename=/dev/urandom,id=rng0		\
 	-device virtio-rng-pci,rng=rng0					\
 	-nographic -nodefaults -serial stdio				\
-	-append "rootwait root=/dev/vda"				\
+	-append "${APPEND[*]}"						\
 	"${EXTRA_ARGS[@]}"						\