From 54e55ec13387767a61e62c8980467e116d358d1e Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Sun, 28 May 2017 11:09:37 +0100
Subject: [PATCH] Failed kgdb ARM attempt

---
 README.md |  1 +
 runqemu   | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index fa17a2f..d347b20 100644
--- a/README.md
+++ b/README.md
@@ -207,6 +207,7 @@ ARM TODOs:
 -   Ctrl + C kills the emulator, not sent to guest. See:
     - <https://github.com/cloudius-systems/osv/issues/49>
     - <https://unix.stackexchange.com/questions/167165/how-to-pass-ctrl-c-in-qemu>
+-   GDB not connecting to KGDB. Possibly linked to `-serial stdio`.
 
 ## KGDB
 
diff --git a/runqemu b/runqemu
index 17aa0fd..822f312 100755
--- a/runqemu
+++ b/runqemu
@@ -5,6 +5,7 @@ set -e
 # CLI handling.
 arch=x86_64
 debug=false
+kgdb=false
 nographic=false
 extra_append=''
 extra_flags=''
@@ -19,10 +20,11 @@ while getopts a:dkn OPT; do
       ;;
     k)
       debug=true
-      extra_append="$extra_append kgdbwait kgdboc=ttyS0,115200"
+      extra_append="$extra_append kgdbwait"
       # For those who want to try KDB.
       #extra_append="$extra_append kgdbwait kgdboc=kbd"
       extra_flags="$extra_flags -serial tcp::1234,server,nowait"
+      kgdb=true
       ;;
     n)
       extra_append="$extra_append console=ttyS0"
@@ -35,6 +37,9 @@ done
 images_dir='buildroot/output/images'
 case "$arch" in
   x86_64)
+      if $kgdb; then
+        extra_append="$extra_append kgdboc=ttyS0,115200"
+      fi
       # If we turn on buildroot host QEMU some day.
       #cmd="./buildroot/output/host/usr/bin/qemu-system-x86_64 \
       cmd="qemu-system-x86_64 \
@@ -50,9 +55,12 @@ case "$arch" in
       "
     ;;
   arm)
+    if $kgdb; then
+      extra_append="$extra_append kgdboc=ttyAMA0,115200"
+    fi
     cmd="qemu-system-arm \
       -M versatilepb \
-      -append 'root=/dev/sda console=ttyAMA0,115200' \
+      -append 'root=/dev/sda $extra_append' \
       -drive file=${images_dir}/rootfs.ext2,if=scsi,format=raw \
       -dtb ${images_dir}/versatile-pb.dtb \
       -kernel ${images_dir}/zImage \
@@ -64,7 +72,6 @@ case "$arch" in
       $extra_flags"
     ;;
 esac
-
 if "$debug" && ! "$nographic" && [ ! "$arch" = 'arm'  ]; then
   eval "$cmd" &>/dev/null &
   # TODO: Ctrl +C gets sent to QEMU? Why? Does not happen if I run