bin/qemush

@@ -65,9 +65,6 @@ error_usage() {
 public_start() {
     QEMUSH_NAME="$1"
 
-    set -- "$@" \
-        -monitor "unix:$(sockpath),server,nowait" \
-        -daemonize
     if ! "$@"; then
         perror "error launching virtual machine \"${QEMUSH_NAME}\""
         return 2
@@ -80,7 +77,7 @@ public_watch() {
     QEMUSH_NAME="$1"
     shift
 
-    exec socat -,echo=0,icanon=0 "UNIX-CONNECT:$(sockpath)"
+    socat -,echo=0,icanon=0 "UNIX-CONNECT:$(sockpath)"
 }
 
 # List running virtual machines

qemu/launchers/kvm

@@ -1,5 +1,13 @@
 #!/usr/bin/env python3
 
+# Retrieve the name of the monitor socket
+from subprocess import CalledProcessError
+try:
+    from subprocess import check_output
+    socket = 'unix:%s,server,nowait' % (check_output(["sockpath"], text=True))
+except CalledProcessError as e:
+    exit(e.returncode)
+
 # Set number of vCPUs to use to the environment variable QEMUSH_NPROC or
 # half of total vCPUs installed if it fails
 try:
@@ -22,7 +30,8 @@ except KeyError:
 from sys import argv
 command = [
     'qemu-system-x86_64',
-    '-enable-kvm',
+    '-enable-kvm', '-daemonize',
+    '-monitor', socket,
     '-M', 'q35',
     '-cpu', 'host', '-smp', nproc,
     '-m', ram,