From 942f2a77fead9137c6ac651c62d2d0d9c741da62 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 29 Dec 2023 18:53:45 +0100
Subject: [PATCH] feat: QEMU monitor (#287)

* feat: QEMU monitor
---
 src/config.sh  | 3 ++-
 src/network.sh | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/config.sh b/src/config.sh
index 35a995f..5a0c8fc 100644
--- a/src/config.sh
+++ b/src/config.sh
@@ -3,6 +3,7 @@ set -Eeuo pipefail
 
 DEF_OPTS="-nodefaults"
 SERIAL_OPTS="-serial mon:stdio"
+MON_OPTS="-monitor telnet:localhost:7100,server,nowait,nodelay"
 RAM_OPTS=$(echo "-m $RAM_SIZE" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
 CPU_OPTS="-cpu $CPU_MODEL -smp $CPU_CORES,sockets=1,dies=1,cores=$CPU_CORES,threads=1"
 MAC_OPTS="-machine type=q35,graphics=off,usb=off,dump-guest-core=off,hpet=off${KVM_OPTS}"
@@ -10,7 +11,7 @@ DEV_OPTS="-device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4"
 DEV_OPTS="$DEV_OPTS -object rng-random,id=objrng0,filename=/dev/urandom"
 DEV_OPTS="$DEV_OPTS -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,addr=0x1c"
 
-ARGS="$DEF_OPTS $CPU_OPTS $RAM_OPTS $MAC_OPTS $DISPLAY_OPTS $SERIAL_OPTS $NET_OPTS $DISK_OPTS $BOOT_OPTS $DEV_OPTS $ARGUMENTS"
+ARGS="$DEF_OPTS $CPU_OPTS $RAM_OPTS $MAC_OPTS $DISPLAY_OPTS $MON_OPTS $SERIAL_OPTS $NET_OPTS $DISK_OPTS $BOOT_OPTS $DEV_OPTS $ARGUMENTS"
 ARGS=$(echo "$ARGS" | sed 's/\t/ /g' | tr -s ' ')
 
 return 0
diff --git a/src/network.sh b/src/network.sh
index f4cc818..5ae9f85 100644
--- a/src/network.sh
+++ b/src/network.sh
@@ -4,7 +4,7 @@ set -Eeuo pipefail
 # Docker environment variables
 
 : ${DHCP:='N'}
-: ${HOST_PORTS:=''}
+: ${HOST_PORTS:='7100'}
 : ${MAC:='82:cf:d0:5e:57:66'}
 
 : ${VM_NET_DEV:=''}
@@ -145,8 +145,8 @@ configureNAT() {
   update-alternatives --set iptables /usr/sbin/iptables-legacy > /dev/null
   update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy > /dev/null
 
-  if  [[ -z "$HOST_PORTS" ]] && [[ "${DISPLAY,,}" == "vnc" ]]; then
-    HOST_PORTS="5900"
+  if [[ "${DISPLAY,,}" == "vnc" ]] && [[ "$HOST_PORTS" != *"5900"* ]]; then
+    HOST_PORTS="$HOST_PORTS 5900"
   fi
 
   local PORT_ARGS=""