From 2203811312b1dfe3476d48207619ad29e13be008 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Tue, 2 May 2023 01:24:03 +0200
Subject: [PATCH 1/4] Print debug info

---
 run/run.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/run/run.sh b/run/run.sh
index f6a7d4b..7efac0f 100755
--- a/run/run.sh
+++ b/run/run.sh
@@ -72,16 +72,14 @@ EXTRA_OPTS="$EXTRA_OPTS -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,ad
 ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${MAC_OPTS} ${MON_OPTS} ${SERIAL_OPTS} ${NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS}"
 ARGS=$(echo "$ARGS" | sed 's/\t/ /g' | tr -s ' ')
 
-[ "$DEBUG" = "Y" ] && set -x
-
 set -m
 (
+  [ "$DEBUG" = "Y" ] && set -x
   qemu-system-x86_64 ${ARGS:+ $ARGS} & echo $! > "${_QEMU_PID}"
+  { set +x; } 2>/dev/null
 )
 set +m
 
-{ set +x; } 2>/dev/null
-
 if (( KERNEL > 4 )); then
   pidwait -F "${_QEMU_PID}" & wait $!
 else

From 33da49c762cbc72566d256081eb662fb32958c04 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Tue, 2 May 2023 01:31:29 +0200
Subject: [PATCH 2/4] Add HOST_DEBUG

---
 run/serial.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/run/serial.sh b/run/serial.sh
index 9886b4f..c03ed61 100644
--- a/run/serial.sh
+++ b/run/serial.sh
@@ -5,6 +5,7 @@ set -eu
 
 : ${HOST_CPU:=''}
 : ${HOST_BUILD:=''}
+: ${HOST_DEBUG:=''}
 : ${HOST_SERIAL:=''}
 : ${GUEST_SERIAL:=''}
 : ${HOST_VERSION:=''}
@@ -30,7 +31,7 @@ HOST_ARGS+=("-cpu_arch=${HOST_CPU}")
 [ -n "$HOST_VERSION" ] && HOST_ARGS+=("-version=${HOST_VERSION}")
 [ -n "$HOST_TIMESTAMP" ] && HOST_ARGS+=("-ts=${HOST_TIMESTAMP}")
 
-if [ "$DEBUG" = "Y" ]; then
+if [ "$HOST_DEBUG" = "Y" ]; then
   set -x
   ./run/host.bin "${HOST_ARGS[@]}" &
   { set +x; } 2>/dev/null

From 11ff0cf02ac4ec88394eecd693f4fb088a4faaf1 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Tue, 2 May 2023 01:37:47 +0200
Subject: [PATCH 3/4] Print debug info

---
 run/network.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/run/network.sh b/run/network.sh
index 81d87ce..b165983 100644
--- a/run/network.sh
+++ b/run/network.sh
@@ -67,7 +67,6 @@ configureDHCP() {
   ip address flush "${VM_NET_TAP}"
 
   { set +x; } 2>/dev/null
-  [ "$DEBUG" = "Y" ] && echo
 
   TAP_NR=$(</sys/class/net/"${VM_NET_TAP}"/ifindex)
   TAP_PATH="/dev/tap${TAP_NR}"
@@ -202,7 +201,6 @@ configureNAT () {
   $DNSMASQ ${DNSMASQ_OPTS:+ $DNSMASQ_OPTS}
 
   { set +x; } 2>/dev/null
-  [ "$DEBUG" = "Y" ] && echo
 }
 
 # ######################################
@@ -256,4 +254,5 @@ else
 
 fi
 
+[ "$DEBUG" = "Y" ] && echo "Finished network setup.." && echo
 NET_OPTS="${NET_OPTS} -device virtio-net-pci,romfile=,netdev=hostnet0,mac=${VM_NET_MAC},id=net0"

From db97225ad07e7ec596aef835fbeae321cf99f16d Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Tue, 2 May 2023 01:39:56 +0200
Subject: [PATCH 4/4] Print debug info

---
 run/network.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run/network.sh b/run/network.sh
index b165983..7fea7ec 100644
--- a/run/network.sh
+++ b/run/network.sh
@@ -254,5 +254,5 @@ else
 
 fi
 
-[ "$DEBUG" = "Y" ] && echo "Finished network setup.." && echo
+[ "$DEBUG" = "Y" ] && echo && echo "Finished network setup.." && echo
 NET_OPTS="${NET_OPTS} -device virtio-net-pci,romfile=,netdev=hostnet0,mac=${VM_NET_MAC},id=net0"