qemu/launchers/kvm

@@ -1,21 +1,34 @@
-#!/usr/bin/env sh
-set -x
+#!/usr/bin/env python3
 
-# How many CPU cores to use
-nproc=$QEMUSH_NPROC
-[ -z "$nproc" ] && nproc=$(($(nproc) / 2))
+# Set number of vCPUs to use to the environment variable QEMUSH_NPROC or
+# half of total vCPUs installed if it fails
+try:
+    from os import environ
+    nproc = environ['QEMUSH_NPROC']
+except KeyError:
+    from multiprocessing import cpu_count
+    nproc = str(cpu_count() // 2)
 
-# How much RAM to use
-ram=$QEMUSH_RAM
-[ -z "$ram" ] && ram=$(($(free | grep '^Mem:\s' | awk '{ print $NF }') / 2))K
+# Set amount of RAM to use to the environment variable QEMUSH_RAM or half
+# of total RAM installed if it fails
+try:
+    ram = environ['QEMUSH_RAM']
+except KeyError:
+    from psutil import virtual_memory
+    ram = str(virtual_memory().available // 2 // (1024 ** 2))
 
-# Set the arguments
-set -- qemu-system-x86_64 \
-    -enable-kvm \
-    -M q35 \
-    -cpu host -smp "$nproc" \
-    -m "$ram" \
-    "$@"
+# Set the command to initialize; all required parameters to make a sane KVM
+# are included and optional arguments are appended from argv
+from sys import argv
+command = [
+    'qemu-system-x86_64',
+    '-enable-kvm',
+    '-M', 'q35',
+    '-cpu', 'host', '-smp', nproc,
+    '-m', ram,
+] + argv[1:]
 
-# Start the machine
-exec "$@"
+# Print the final command and replace the main process with it
+print(command)
+from os import execvp
+execvp(command[0], command)

qemu/launchers/spice

@@ -1,6 +1,6 @@
 #!/bin/sh -x
 base=$(echo "$QEMUSH_BASE" | cut -d , -f 1)
-QEMUSH_BASE=$(echo "$QEMUSH_BASE" | sed "s/^${base}//" | sed 's/^,//')
+QEMUSH_BASE=$(echo "$QEMUSH_BASE" | cut -d , -f 2-)
 
 exec "$base" \
 	-vga qxl \