From 10e2a6d0daa8d61261f435f1afcae25c962a50ae Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Fri, 14 Jul 2023 13:34:06 +0200
Subject: [PATCH 01/25] Refactor manager to start AMD SEV encrypted VM

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 cmd/manager/script/launch-qemu.sh | 189 ++++++++++++++++++++++++++++++
 1 file changed, 189 insertions(+)
 create mode 100755 cmd/manager/script/launch-qemu.sh

diff --git a/cmd/manager/script/launch-qemu.sh b/cmd/manager/script/launch-qemu.sh
new file mode 100755
index 0000000..41c1bfd
--- /dev/null
+++ b/cmd/manager/script/launch-qemu.sh
@@ -0,0 +1,189 @@
+#!/bin/bash
+
+#
+# user changeable parameters
+#
+HDA_FILE="${HOME}/ubuntu-18.04-desktop.qcow2"
+GUEST_SIZE_IN_MB="4096"
+SEV_GUEST="1"
+SMP_NCPUS="4"
+CONSOLE="qxl"
+QEMU_INSTALL_DIR=/usr/local/bin/
+UEFI_BIOS_CODE="/usr/local/share/qemu/OVMF_CODE.fd"
+UEFI_BIOS_VARS="OVMF_VARS.fd"
+#VNC_PORT=""
+USE_VIRTIO="1"
+
+CBITPOS=51
+
+usage() {
+	echo "$0 [options]"
+	echo "Available <commands>:"
+	echo " -hda          hard disk ($HDA_FILE)"
+	echo " -nosev        disable sev support"
+	echo " -mem          guest memory"
+	echo " -smp          number of cpus"
+	echo " -console      display console to use (serial or gxl)"
+	echo " -vnc          VNC port to use"
+	echo " -bios         bios to use (default $UEFI_BIOS_CODE)"
+	echo " -kernel       kernel to use"
+	echo " -initrd       initrd to use"
+	echo " -cdrom        CDROM image"
+	echo " -virtio       use virtio devices"
+	echo " -gdb          start gdbserver"
+	exit 1
+}
+
+add_opts() {
+	echo -n "$* " >> ${QEMU_CMDLINE}
+}
+
+run_cmd() {
+  if ! "$@"; then
+    echo "Command '$*' failed"
+    exit 1
+  fi
+}
+
+if [ "$(id -u)" -ne 0 ]; then
+  echo "This script must be run as root!"
+  exit 1
+fi
+
+while [[ $1 != "" ]]; do
+	case "$1" in
+		-hda) 		HDA_FILE="${2}"
+				shift
+				;;
+		-nosev) 	SEV_GUEST="0"
+				;;
+		-mem)  		GUEST_SIZE_IN_MB=${2}
+				shift
+				;;
+		-console)	CONSOLE=${2}
+				shift
+				;;
+		-smp)		SMP_NCPUS=$2
+				shift
+				;;
+		-vnc)		VNC_PORT=$2
+				shift
+				if [ "${VNC_PORT}" = "" ]; then
+					usage
+				fi
+				;;
+		-bios)		UEFI_BIOS_CODE="`readlink -f $2`"
+				shift
+				;;
+		-netconsole)	NETCONSOLE_PORT=$2
+				shift
+				;;
+		-initrd)	INITRD_FILE=$2
+				shift
+				;;
+		-kernel)	KERNEL_FILE=$2
+				shift
+				;;
+		-cdrom)		CDROM_FILE=$2
+				shift
+				;;
+		-virtio)        USE_VIRTIO="1"
+				;;
+		-gdb)      	USE_GDB="1"
+				;;
+		*) 		usage;;
+	esac
+	shift
+done
+
+# we add all the qemu command line options into a file
+QEMU_CMDLINE=/tmp/cmdline.$$
+rm -rf ${QEMU_CMDLINE}
+
+add_opts "${QEMU_INSTALL_DIR}qemu-system-x86_64"
+
+# Basic virtual machine property
+add_opts "-enable-kvm -cpu EPYC -machine q35"
+
+# add number of VCPUs
+[ ! -z ${SMP_NCPUS} ] && add_opts "-smp ${SMP_NCPUS},maxcpus=64"
+
+# define guest memory
+add_opts "-m ${GUEST_SIZE_IN_MB}M,slots=5,maxmem=30G"
+
+# The OVMF binary, including the non-volatile variable store, appears as a
+# "normal" qemu drive on the host side, and it is exposed to the guest as a
+# persistent flash device.
+add_opts "-drive if=pflash,format=raw,unit=0,file=${UEFI_BIOS_CODE},readonly"
+add_opts "-drive if=pflash,format=raw,unit=1,file=${UEFI_BIOS_VARS}"
+
+# add CDROM if specified
+[ ! -z ${CDROM_FILE} ] && add_opts "-drive file=${CDROM_FILE},media=cdrom -boot d"
+
+add_opts "-netdev user,id=vmnic,hostfwd=tcp::2222-:22,hostfwd=tcp::9301-:9031,hostfwd=tcp::7020-:7002"
+add_opts "-device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile="
+
+# If harddisk file is specified then add the HDD drive
+if [ ! -z ${HDA_FILE} ]; then
+	if [ "$USE_VIRTIO" = "1" ]; then
+		if [[ ${HDA_FILE} = *"qcow2" ]]; then
+			add_opts "-drive file=${HDA_FILE},if=none,id=disk0,format=qcow2"
+		else
+			add_opts "-drive file=${HDA_FILE},if=none,id=disk0,format=raw"
+		fi
+		add_opts "-device virtio-scsi-pci,id=scsi,disable-legacy=on,iommu_platform=true"
+		add_opts "-device scsi-hd,drive=disk0"
+	else
+		if [[ ${HDA_FILE} = *"qcow2" ]]; then
+			add_opts "-drive file=${HDA_FILE},format=qcow2"
+		else
+			add_opts "-drive file=${HDA_FILE},format=raw"
+		fi
+	fi
+fi
+
+# If this is SEV guest then add the encryption device objects to enable support
+if [ ${SEV_GUEST} = "1" ]; then
+	add_opts "-object sev-guest,id=sev0,cbitpos=${CBITPOS},reduced-phys-bits=1"
+	add_opts "-machine memory-encryption=sev0"
+fi
+
+# if console is serial then disable graphical interface
+if [ "${CONSOLE}" = "serial" ]; then
+	add_opts "-nographic"
+else
+	add_opts "-vga ${CONSOLE}"
+fi
+
+# if -kernel arg is specified then use the kernel provided in command line for boot
+if [ "${KERNEL_FILE}" != "" ]; then
+	add_opts "-kernel $KERNEL_FILE"
+	add_opts "-append \"console=ttyS0 earlyprintk=serial root=/dev/sda2\""
+	[ ! -z ${INITRD_FILE} ] && add_opts "-initrd ${INITRD_FILE}"
+fi
+
+# start vnc server
+[ ! -z ${VNC_PORT} ] && add_opts "-vnc :${VNC_PORT}" && echo "Starting VNC on port ${VNC_PORT}"
+
+# start monitor on pty
+add_opts "-monitor pty"
+
+# log the console  output in stdout.log
+QEMU_CONSOLE_LOG=`pwd`/stdout.log
+
+# save the command line args into log file
+cat $QEMU_CMDLINE | tee ${QEMU_CONSOLE_LOG}
+echo | tee -a ${QEMU_CONSOLE_LOG}
+
+
+# map CTRL-C to CTRL ]
+echo "Mapping CTRL-C to CTRL-]"
+stty intr ^]
+
+echo "Launching VM ..."
+bash ${QEMU_CMDLINE} 2>&1 | tee -a ${QEMU_CONSOLE_LOG}
+
+# restore the mapping
+stty intr ^c
+
+rm -rf ${QEMU_CMDLINE}

From eaef7ddf9a0a0dc4b7fb4166e07737a64e6729ea Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Fri, 14 Jul 2023 14:16:09 +0200
Subject: [PATCH 02/25] Add proper formatting

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 cmd/manager/script/launch-qemu.sh | 202 ++++++++++++++++--------------
 1 file changed, 110 insertions(+), 92 deletions(-)

diff --git a/cmd/manager/script/launch-qemu.sh b/cmd/manager/script/launch-qemu.sh
index 41c1bfd..1b089e3 100755
--- a/cmd/manager/script/launch-qemu.sh
+++ b/cmd/manager/script/launch-qemu.sh
@@ -17,83 +17,101 @@ USE_VIRTIO="1"
 CBITPOS=51
 
 usage() {
-	echo "$0 [options]"
-	echo "Available <commands>:"
-	echo " -hda          hard disk ($HDA_FILE)"
-	echo " -nosev        disable sev support"
-	echo " -mem          guest memory"
-	echo " -smp          number of cpus"
-	echo " -console      display console to use (serial or gxl)"
-	echo " -vnc          VNC port to use"
-	echo " -bios         bios to use (default $UEFI_BIOS_CODE)"
-	echo " -kernel       kernel to use"
-	echo " -initrd       initrd to use"
-	echo " -cdrom        CDROM image"
-	echo " -virtio       use virtio devices"
-	echo " -gdb          start gdbserver"
-	exit 1
+    echo "$0 [options]"
+    echo "Available <commands>:"
+    echo " -hda          hard disk ($HDA_FILE)"
+    echo " -nosev        disable sev support"
+    echo " -mem          guest memory"
+    echo " -smp          number of cpus"
+    echo " -console      display console to use (serial or gxl)"
+    echo " -vnc          VNC port to use"
+    echo " -bios         bios to use (default $UEFI_BIOS_CODE)"
+    echo " -kernel       kernel to use"
+    echo " -initrd       initrd to use"
+    echo " -cdrom        CDROM image"
+    echo " -virtio       use virtio devices"
+    echo " -gdb          start gdbserver"
+    echo " -cbitpos      location of the C-bit"
+    exit 1
 }
 
 add_opts() {
-	echo -n "$* " >> ${QEMU_CMDLINE}
+    echo -n "$* " >> ${QEMU_CMDLINE}
 }
 
 run_cmd() {
-  if ! "$@"; then
-    echo "Command '$*' failed"
-    exit 1
-  fi
+    if ! "$@"; then
+        echo "Command '$*' failed"
+        exit 1
+    fi
 }
 
 if [ "$(id -u)" -ne 0 ]; then
-  echo "This script must be run as root!"
-  exit 1
+    echo "This script must be run as root!"
+    exit 1
 fi
 
 while [[ $1 != "" ]]; do
-	case "$1" in
-		-hda) 		HDA_FILE="${2}"
-				shift
-				;;
-		-nosev) 	SEV_GUEST="0"
-				;;
-		-mem)  		GUEST_SIZE_IN_MB=${2}
-				shift
-				;;
-		-console)	CONSOLE=${2}
-				shift
-				;;
-		-smp)		SMP_NCPUS=$2
-				shift
-				;;
-		-vnc)		VNC_PORT=$2
-				shift
-				if [ "${VNC_PORT}" = "" ]; then
-					usage
-				fi
-				;;
-		-bios)		UEFI_BIOS_CODE="`readlink -f $2`"
-				shift
-				;;
-		-netconsole)	NETCONSOLE_PORT=$2
-				shift
-				;;
-		-initrd)	INITRD_FILE=$2
-				shift
-				;;
-		-kernel)	KERNEL_FILE=$2
-				shift
-				;;
-		-cdrom)		CDROM_FILE=$2
-				shift
-				;;
-		-virtio)        USE_VIRTIO="1"
-				;;
-		-gdb)      	USE_GDB="1"
-				;;
-		*) 		usage;;
-	esac
-	shift
+    case "$1" in
+        -hda)
+            HDA_FILE="${2}"
+            shift
+            ;;
+        -nosev)
+            SEV_GUEST="0"
+            ;;
+        -mem)
+            GUEST_SIZE_IN_MB=${2}
+            shift
+            ;;
+        -console)
+            CONSOLE=${2}
+            shift
+            ;;
+        -smp)
+            SMP_NCPUS=$2
+            shift
+            ;;
+        -vnc)
+            VNC_PORT=$2
+            shift
+            if [ "${VNC_PORT}" = "" ]; then
+                usage
+            fi
+            ;;
+        -bios)
+            UEFI_BIOS_CODE="`readlink -f $2`"
+            shift
+            ;;
+        -netconsole)
+            NETCONSOLE_PORT=$2
+            shift
+            ;;
+        -initrd)
+            INITRD_FILE=$2
+            shift
+            ;;
+        -kernel)
+            KERNEL_FILE=$2
+            shift
+            ;;
+        -cdrom)
+            CDROM_FILE=$2
+            shift
+            ;;
+        -virtio)
+            USE_VIRTIO="1"
+            ;;
+        -gdb)
+            USE_GDB="1"
+            ;;
+        -cbitpos)
+            CBITPOS=$2
+            ;;
+        *)
+            usage;;
+    esac
+    shift
 done
 
 # we add all the qemu command line options into a file
@@ -125,41 +143,41 @@ add_opts "-device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vm
 
 # If harddisk file is specified then add the HDD drive
 if [ ! -z ${HDA_FILE} ]; then
-	if [ "$USE_VIRTIO" = "1" ]; then
-		if [[ ${HDA_FILE} = *"qcow2" ]]; then
-			add_opts "-drive file=${HDA_FILE},if=none,id=disk0,format=qcow2"
-		else
-			add_opts "-drive file=${HDA_FILE},if=none,id=disk0,format=raw"
-		fi
-		add_opts "-device virtio-scsi-pci,id=scsi,disable-legacy=on,iommu_platform=true"
-		add_opts "-device scsi-hd,drive=disk0"
-	else
-		if [[ ${HDA_FILE} = *"qcow2" ]]; then
-			add_opts "-drive file=${HDA_FILE},format=qcow2"
-		else
-			add_opts "-drive file=${HDA_FILE},format=raw"
-		fi
-	fi
+    if [ "$USE_VIRTIO" = "1" ]; then
+        if [[ ${HDA_FILE} = *"qcow2" ]]; then
+            add_opts "-drive file=${HDA_FILE},if=none,id=disk0,format=qcow2"
+        else
+            add_opts "-drive file=${HDA_FILE},if=none,id=disk0,format=raw"
+        fi
+        add_opts "-device virtio-scsi-pci,id=scsi,disable-legacy=on,iommu_platform=true"
+        add_opts "-device scsi-hd,drive=disk0"
+    else
+        if [[ ${HDA_FILE} = *"qcow2" ]]; then
+            add_opts "-drive file=${HDA_FILE},format=qcow2"
+        else
+            add_opts "-drive file=${HDA_FILE},format=raw"
+        fi
+    fi
 fi
 
 # If this is SEV guest then add the encryption device objects to enable support
 if [ ${SEV_GUEST} = "1" ]; then
-	add_opts "-object sev-guest,id=sev0,cbitpos=${CBITPOS},reduced-phys-bits=1"
-	add_opts "-machine memory-encryption=sev0"
+    add_opts "-object sev-guest,id=sev0,cbitpos=${CBITPOS},reduced-phys-bits=1"
+    add_opts "-machine memory-encryption=sev0"
 fi
 
 # if console is serial then disable graphical interface
 if [ "${CONSOLE}" = "serial" ]; then
-	add_opts "-nographic"
+    add_opts "-nographic"
 else
-	add_opts "-vga ${CONSOLE}"
+    add_opts "-vga ${CONSOLE}"
 fi
 
 # if -kernel arg is specified then use the kernel provided in command line for boot
 if [ "${KERNEL_FILE}" != "" ]; then
-	add_opts "-kernel $KERNEL_FILE"
-	add_opts "-append \"console=ttyS0 earlyprintk=serial root=/dev/sda2\""
-	[ ! -z ${INITRD_FILE} ] && add_opts "-initrd ${INITRD_FILE}"
+    add_opts "-kernel $KERNEL_FILE"
+    add_opts "-append \"console=ttyS0 earlyprintk=serial root=/dev/sda2\""
+    [ ! -z ${INITRD_FILE} ] && add_opts "-initrd ${INITRD_FILE}"
 fi
 
 # start vnc server
@@ -180,10 +198,10 @@ echo | tee -a ${QEMU_CONSOLE_LOG}
 echo "Mapping CTRL-C to CTRL-]"
 stty intr ^]
 
-echo "Launching VM ..."
-bash ${QEMU_CMDLINE} 2>&1 | tee -a ${QEMU_CONSOLE_LOG}
+            echo "Launching VM ..."
+            bash ${QEMU_CMDLINE} 2>&1 | tee -a ${QEMU_CONSOLE_LOG}
 
-# restore the mapping
-stty intr ^c
+            # restore the mapping
+            stty intr ^c
 
-rm -rf ${QEMU_CMDLINE}
+            rm -rf ${QEMU_CMDLINE}

From b92c698800c756fdcd5a1b2c6befd3003df4d32c Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Fri, 14 Jul 2023 14:44:44 +0200
Subject: [PATCH 03/25] Add host-guest http and grpc port parametrization

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 cmd/manager/script/launch-qemu.sh | 42 +++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/cmd/manager/script/launch-qemu.sh b/cmd/manager/script/launch-qemu.sh
index 1b089e3..d9c6abd 100755
--- a/cmd/manager/script/launch-qemu.sh
+++ b/cmd/manager/script/launch-qemu.sh
@@ -15,6 +15,10 @@ UEFI_BIOS_VARS="OVMF_VARS.fd"
 USE_VIRTIO="1"
 
 CBITPOS=51
+HOST_HTTP_PORT=9301
+GUEST_HTTP_PORT=9031
+HOST_GRPC_PORT=7020
+GUEST_GRPC_PORT=7002
 
 usage() {
     echo "$0 [options]"
@@ -32,6 +36,10 @@ usage() {
     echo " -virtio       use virtio devices"
     echo " -gdb          start gdbserver"
     echo " -cbitpos      location of the C-bit"
+    echo " -hosthttp     host http port"
+    echo " -guesthttp    guest http port"
+    echo " -hostgrpc     host grpc port"
+    echo " -guestgrpc    guest grpc port"
     exit 1
 }
 
@@ -80,7 +88,7 @@ while [[ $1 != "" ]]; do
             fi
             ;;
         -bios)
-            UEFI_BIOS_CODE="`readlink -f $2`"
+            UEFI_BIOS_CODE=$(readlink -f "$2")
             shift
             ;;
         -netconsole)
@@ -108,6 +116,18 @@ while [[ $1 != "" ]]; do
         -cbitpos)
             CBITPOS=$2
             ;;
+        -hosthttp)
+            HOST_HTTP_PORT=$2
+            ;;
+        -guesthttp)
+            GUEST_HTTP_PORT=$2
+            ;;
+        -hostgrpc)
+            HOST_GRPC_PORT=$2
+            ;;
+        -guestgrpc)
+            GUEST_GRPC_PORT=$2
+            ;;
         *)
             usage;;
     esac
@@ -124,7 +144,7 @@ add_opts "${QEMU_INSTALL_DIR}qemu-system-x86_64"
 add_opts "-enable-kvm -cpu EPYC -machine q35"
 
 # add number of VCPUs
-[ ! -z ${SMP_NCPUS} ] && add_opts "-smp ${SMP_NCPUS},maxcpus=64"
+[ -n "$SMP_NCPUS" ] && add_opts "-smp ${SMP_NCPUS},maxcpus=64"
 
 # define guest memory
 add_opts "-m ${GUEST_SIZE_IN_MB}M,slots=5,maxmem=30G"
@@ -136,13 +156,13 @@ add_opts "-drive if=pflash,format=raw,unit=0,file=${UEFI_BIOS_CODE},readonly"
 add_opts "-drive if=pflash,format=raw,unit=1,file=${UEFI_BIOS_VARS}"
 
 # add CDROM if specified
-[ ! -z ${CDROM_FILE} ] && add_opts "-drive file=${CDROM_FILE},media=cdrom -boot d"
+[ -n "$CDROM_FILE" ] && add_opts "-drive file=${CDROM_FILE},media=cdrom -boot d"
 
-add_opts "-netdev user,id=vmnic,hostfwd=tcp::2222-:22,hostfwd=tcp::9301-:9031,hostfwd=tcp::7020-:7002"
+add_opts "-netdev user,id=vmnic,hostfwd=tcp::2222-:22,hostfwd=tcp::$HOST_HTTP_PORT-:$GUEST_HTTP_PORT,hostfwd=tcp::$HOST_GRPC_PORT-:$GUEST_GRPC_PORT"
 add_opts "-device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile="
 
 # If harddisk file is specified then add the HDD drive
-if [ ! -z ${HDA_FILE} ]; then
+if [ -n "$HDA_FILE" ]; then
     if [ "$USE_VIRTIO" = "1" ]; then
         if [[ ${HDA_FILE} = *"qcow2" ]]; then
             add_opts "-drive file=${HDA_FILE},if=none,id=disk0,format=qcow2"
@@ -177,21 +197,21 @@ fi
 if [ "${KERNEL_FILE}" != "" ]; then
     add_opts "-kernel $KERNEL_FILE"
     add_opts "-append \"console=ttyS0 earlyprintk=serial root=/dev/sda2\""
-    [ ! -z ${INITRD_FILE} ] && add_opts "-initrd ${INITRD_FILE}"
+    [ -n "$INITRD_FILE" ] && add_opts "-initrd ${INITRD_FILE}"
 fi
 
 # start vnc server
-[ ! -z ${VNC_PORT} ] && add_opts "-vnc :${VNC_PORT}" && echo "Starting VNC on port ${VNC_PORT}"
+[ -n "$VNC_PORT" ] && add_opts "-vnc :${VNC_PORT}" && echo "Starting VNC on port ${VNC_PORT}"
 
 # start monitor on pty
 add_opts "-monitor pty"
 
 # log the console  output in stdout.log
-QEMU_CONSOLE_LOG=`pwd`/stdout.log
+QEMU_CONSOLE_LOG=$(pwd)/stdout.log
 
 # save the command line args into log file
-cat $QEMU_CMDLINE | tee ${QEMU_CONSOLE_LOG}
-echo | tee -a ${QEMU_CONSOLE_LOG}
+cat $QEMU_CMDLINE | tee "${QEMU_CONSOLE_LOG}"
+echo | tee -a "${QEMU_CONSOLE_LOG}"
 
 
 # map CTRL-C to CTRL ]
@@ -199,7 +219,7 @@ echo "Mapping CTRL-C to CTRL-]"
 stty intr ^]
 
             echo "Launching VM ..."
-            bash ${QEMU_CMDLINE} 2>&1 | tee -a ${QEMU_CONSOLE_LOG}
+            bash ${QEMU_CMDLINE} 2>&1 | tee -a "${QEMU_CONSOLE_LOG}"
 
             # restore the mapping
             stty intr ^c

From b92806c3b55ab920599620ed9c79022f74abeb52 Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Mon, 31 Jul 2023 17:32:48 +0200
Subject: [PATCH 04/25] Refactor dom.xml to start
 focal-server-cloudimg-amd64.qcow2

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 cmd/manager/script/launch-qemu-cmd.sh | 17 +++++++
 cmd/manager/xml/copy.bkp.xml          | 69 +++++++++++++++++++++++++++
 cmd/manager/xml/dom.xml               | 21 +++-----
 manager/libvirt.go                    | 43 +++++++++--------
 4 files changed, 115 insertions(+), 35 deletions(-)
 create mode 100644 cmd/manager/script/launch-qemu-cmd.sh
 create mode 100644 cmd/manager/xml/copy.bkp.xml

diff --git a/cmd/manager/script/launch-qemu-cmd.sh b/cmd/manager/script/launch-qemu-cmd.sh
new file mode 100644
index 0000000..816d078
--- /dev/null
+++ b/cmd/manager/script/launch-qemu-cmd.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+/usr/bin/qemu-system-x86_64 \
+  -enable-kvm \
+  -cpu EPYC \
+  -machine q35 \
+  -smp 4,maxcpus=64 \
+  -m 4096M,slots=5,maxmem=30G \
+  -drive if=pflash,format=raw,unit=0,file=/usr/share/OVMF/OVMF_CODE.fd,readonly \
+  -drive if=pflash,format=raw,unit=1,file=OVMF_VARS.fd \
+  -netdev user,id=vmnic,hostfwd=tcp::2222-:22,hostfwd=tcp::9301-:9031,hostfwd=tcp::7020-:7002 \
+  -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile= \
+  -drive file=./focal-server-cloudimg-amd64.qcow2,if=none,id=disk0,format=qcow2 \
+  -device virtio-scsi-pci,id=scsi,disable-legacy=on,iommu_platform=true \
+  -device scsi-hd,drive=disk0 \
+  -vga qxl \
+  -monitor pty
diff --git a/cmd/manager/xml/copy.bkp.xml b/cmd/manager/xml/copy.bkp.xml
new file mode 100644
index 0000000..8fd5546
--- /dev/null
+++ b/cmd/manager/xml/copy.bkp.xml
@@ -0,0 +1,69 @@
+<domain type="kvm">
+  <name>QEmu-alpine-standard-x86_64</name>
+  <uuid>c7a5fdbd-cdaf-9455-926a-d65c16db1809</uuid>
+  <metadata>
+    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
+      <libosinfo:os id="http://alpinelinux.org/alpinelinux/3.15"/>
+    </libosinfo:libosinfo>
+  </metadata>
+  <memory unit="KiB">786432</memory>
+  <currentMemory unit="KiB">786432</currentMemory>
+  <vcpu placement="static">1</vcpu>
+  <os>
+    <type arch="x86_64" machine="pc-q35-6.2">hvm</type>
+    <!-- <boot dev="cdrom"/> -->
+    <bootmenu enable="yes"/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <vmport state="off"/>
+  </features>
+  <cpu mode="host-passthrough" check="none" migratable="on"/>
+  <clock offset="utc">
+    <timer name="rtc" tickpolicy="catchup"/>
+    <timer name="pit" tickpolicy="delay"/>
+    <timer name="hpet" present="no"/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <pm>
+    <suspend-to-mem enabled="no"/>
+    <suspend-to-disk enabled="no"/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type="file" device="disk">
+      <driver name="qemu" type="qcow2" discard="unmap"/>
+      <source file="./img/boot.img"/>
+      <target dev="vda" bus="virtio"/>
+      <address type="pci" domain="0x0000" bus="0x04" slot="0x00" function="0x0"/>
+      <!-- <snapshot name="snapshot1"/> -->
+      <boot order="1"/>
+    </disk>
+    <disk type="file" device="cdrom">
+      <source file='./iso/alpine-virt-3.18.0-x86_64.iso'/>    
+      <driver name="qemu" type="raw"/>
+      <target dev="sda" bus="sata"/>
+      <readonly/>
+      <address type="drive" controller="0" bus="0" target="0" unit="0"/>
+      <boot order="2"/>
+    </disk>
+    <graphics type="spice" autoport="yes">
+      <listen type="address"/>
+      <image compression="off"/>
+    </graphics>
+    <video>
+      <model type="qxl" ram="65536" vram="65536" vgamem="16384" heads="1" primary="yes"/>
+      <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x0"/>
+    </video>
+    <interface type="network">
+      <mac address="52:54:00:03:7b:5f"/>
+      <source network="default"/>
+      <model type="virtio"/>
+      <address type="pci" domain="0x0000" bus="0x01" slot="0x00" function="0x0"/>
+    </interface>
+  </devices>
+
+</domain>
diff --git a/cmd/manager/xml/dom.xml b/cmd/manager/xml/dom.xml
index 8fd5546..2cccad4 100644
--- a/cmd/manager/xml/dom.xml
+++ b/cmd/manager/xml/dom.xml
@@ -6,13 +6,15 @@
       <libosinfo:os id="http://alpinelinux.org/alpinelinux/3.15"/>
     </libosinfo:libosinfo>
   </metadata>
-  <memory unit="KiB">786432</memory>
-  <currentMemory unit="KiB">786432</currentMemory>
+  <memory unit="KiB">4194304</memory>
+  <currentMemory unit="KiB">4194304</currentMemory>
   <vcpu placement="static">1</vcpu>
   <os>
-    <type arch="x86_64" machine="pc-q35-6.2">hvm</type>
-    <!-- <boot dev="cdrom"/> -->
+    <type arch="x86_64" machine="q35">hvm</type>
     <bootmenu enable="yes"/>
+    <loader readonly="yes" type="pflash">/usr/share/OVMF/OVMF_CODE.fd</loader>
+    <nvram template='/usr/share/OVMF/OVMF_VARS.fd'>./img/OVMF_VARS.fd</nvram>
+    <!-- <boot dev='hd'/> -->
   </os>
   <features>
     <acpi/>
@@ -36,20 +38,11 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2" discard="unmap"/>
-      <source file="./img/boot.img"/>
+      <source file="./img/focal-server-cloudimg-amd64.qcow2"/>
       <target dev="vda" bus="virtio"/>
       <address type="pci" domain="0x0000" bus="0x04" slot="0x00" function="0x0"/>
-      <!-- <snapshot name="snapshot1"/> -->
       <boot order="1"/>
     </disk>
-    <disk type="file" device="cdrom">
-      <source file='./iso/alpine-virt-3.18.0-x86_64.iso'/>    
-      <driver name="qemu" type="raw"/>
-      <target dev="sda" bus="sata"/>
-      <readonly/>
-      <address type="drive" controller="0" bus="0" target="0" unit="0"/>
-      <boot order="2"/>
-    </disk>
     <graphics type="spice" autoport="yes">
       <listen type="address"/>
       <image compression="off"/>
diff --git a/manager/libvirt.go b/manager/libvirt.go
index 576ee59..d40340e 100644
--- a/manager/libvirt.go
+++ b/manager/libvirt.go
@@ -9,7 +9,7 @@ import (
 
 var re = regexp.MustCompile(`'([^']*)'`)
 
-const bootTime = 12 * time.Second
+const bootTime = 5 * time.Second
 
 func entityName(msg string) (string, error) {
 	match := re.FindStringSubmatch(msg)
@@ -22,6 +22,7 @@ func entityName(msg string) (string, error) {
 
 func createDomain(libvirtConn *libvirt.Libvirt, poolXML string, volXML string, domXML string) (libvirt.Domain, error) {
 	pool, err := libvirtConn.StoragePoolCreateXML(poolXML, 0)
+	_ = pool
 	if err != nil {
 		lvErr := err.(libvirt.Error)
 		if lvErr.Code == 9 {
@@ -41,26 +42,26 @@ func createDomain(libvirtConn *libvirt.Libvirt, poolXML string, volXML string, d
 	}
 pool_exists:
 
-	_, err = libvirtConn.StorageVolCreateXML(pool, volXML, 0)
-	if err != nil {
-		lvErr := err.(libvirt.Error)
-		if lvErr.Code == 90 {
-			name, err := entityName(lvErr.Message)
-			if err != nil {
-				return libvirt.Domain{}, err
-			}
-			_, err = libvirtConn.StorageVolLookupByName(pool, name)
-			if err != nil {
-				return libvirt.Domain{}, err
-			}
-
-			goto vol_exists
-		}
-
-		return libvirt.Domain{}, err
-	}
-
-vol_exists:
+	// _, err = libvirtConn.StorageVolCreateXML(pool, volXML, 0)
+	// if err != nil {
+	// 	lvErr := err.(libvirt.Error)
+	// 	if lvErr.Code == 90 {
+	// 		name, err := entityName(lvErr.Message)
+	// 		if err != nil {
+	// 			return libvirt.Domain{}, err
+	// 		}
+	// 		_, err = libvirtConn.StorageVolLookupByName(pool, name)
+	// 		if err != nil {
+	// 			return libvirt.Domain{}, err
+	// 		}
+
+	// 		goto vol_exists
+	// 	}
+
+	// 	return libvirt.Domain{}, err
+	// }
+
+	// vol_exists:
 
 	dom, err := libvirtConn.DomainDefineXMLFlags(domXML, 0)
 	if err != nil {

From f6d5b616d2b25465660faf9480e5dccd487662b2 Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Mon, 7 Aug 2023 14:13:49 +0200
Subject: [PATCH 05/25] Add uefi bios vars, exec cmd line and log to file
 parameters

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 cmd/manager/script/launch-qemu-cmd.sh |  17 ---
 cmd/manager/script/launch-qemu.sh     | 177 ++++++++++++++++----------
 2 files changed, 111 insertions(+), 83 deletions(-)
 delete mode 100644 cmd/manager/script/launch-qemu-cmd.sh

diff --git a/cmd/manager/script/launch-qemu-cmd.sh b/cmd/manager/script/launch-qemu-cmd.sh
deleted file mode 100644
index 816d078..0000000
--- a/cmd/manager/script/launch-qemu-cmd.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-/usr/bin/qemu-system-x86_64 \
-  -enable-kvm \
-  -cpu EPYC \
-  -machine q35 \
-  -smp 4,maxcpus=64 \
-  -m 4096M,slots=5,maxmem=30G \
-  -drive if=pflash,format=raw,unit=0,file=/usr/share/OVMF/OVMF_CODE.fd,readonly \
-  -drive if=pflash,format=raw,unit=1,file=OVMF_VARS.fd \
-  -netdev user,id=vmnic,hostfwd=tcp::2222-:22,hostfwd=tcp::9301-:9031,hostfwd=tcp::7020-:7002 \
-  -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile= \
-  -drive file=./focal-server-cloudimg-amd64.qcow2,if=none,id=disk0,format=qcow2 \
-  -device virtio-scsi-pci,id=scsi,disable-legacy=on,iommu_platform=true \
-  -device scsi-hd,drive=disk0 \
-  -vga qxl \
-  -monitor pty
diff --git a/cmd/manager/script/launch-qemu.sh b/cmd/manager/script/launch-qemu.sh
index d9c6abd..0426f3a 100755
--- a/cmd/manager/script/launch-qemu.sh
+++ b/cmd/manager/script/launch-qemu.sh
@@ -3,66 +3,58 @@
 #
 # user changeable parameters
 #
-HDA_FILE="${HOME}/ubuntu-18.04-desktop.qcow2"
+
+HDA_FILE="cmd/manager/img/focal-server-cloudimg-amd64.qcow2"
 GUEST_SIZE_IN_MB="4096"
 SEV_GUEST="1"
 SMP_NCPUS="4"
-CONSOLE="qxl"
-QEMU_INSTALL_DIR=/usr/local/bin/
-UEFI_BIOS_CODE="/usr/local/share/qemu/OVMF_CODE.fd"
-UEFI_BIOS_VARS="OVMF_VARS.fd"
-#VNC_PORT=""
+CONSOLE="serial" # for gtk, use qxl
+VNC_PORT=""
 USE_VIRTIO="1"
 
+UEFI_BIOS_CODE="/usr/share/OVMF/OVMF_CODE.fd"
+UEFI_BIOS_VARS_ORIG="/usr/share/OVMF/OVMF_VARS.fd"
+UEFI_BIOS_VARS_COPY="cmd/manager/img/OVMF_VARS.fd"
+
 CBITPOS=51
 HOST_HTTP_PORT=9301
 GUEST_HTTP_PORT=9031
 HOST_GRPC_PORT=7020
 GUEST_GRPC_PORT=7002
 
+ENABLE_FILE_LOG="0"
+EXEC_QEMU_CMDLINE="0"
+
 usage() {
     echo "$0 [options]"
     echo "Available <commands>:"
-    echo " -hda          hard disk ($HDA_FILE)"
-    echo " -nosev        disable sev support"
-    echo " -mem          guest memory"
-    echo " -smp          number of cpus"
-    echo " -console      display console to use (serial or gxl)"
-    echo " -vnc          VNC port to use"
-    echo " -bios         bios to use (default $UEFI_BIOS_CODE)"
-    echo " -kernel       kernel to use"
-    echo " -initrd       initrd to use"
-    echo " -cdrom        CDROM image"
-    echo " -virtio       use virtio devices"
-    echo " -gdb          start gdbserver"
-    echo " -cbitpos      location of the C-bit"
-    echo " -hosthttp     host http port"
-    echo " -guesthttp    guest http port"
-    echo " -hostgrpc     host grpc port"
-    echo " -guestgrpc    guest grpc port"
+    echo " -hda           hard disk ($HDA_FILE)"
+    echo " -nosev         disable sev support"
+    echo " -mem           guest memory"
+    echo " -smp           number of cpus"
+    echo " -console       display console to use (serial or gxl)"
+    echo " -vnc           VNC port to use"
+    echo " -bios          bios to use (default $UEFI_BIOS_CODE)"
+    echo " -kernel        kernel to use"
+    echo " -initrd        initrd to use"
+    echo " -cdrom         CDROM image"
+    echo " -virtio        use virtio devices"
+    echo " -cbitpos       location of the C-bit"
+    echo " -hosthttp      host http port"
+    echo " -guesthttp     guest http port"
+    echo " -hostgrpc      host grpc port"
+    echo " -guestgrpc     guest grpc port"
+    echo " -origuefivars  UEFI BIOS vars original file (default $UEFI_BIOS_VARS_ORIG)"
+    echo " -copyuefivars  UEFI BIOS vars copy file (default $UEFI_BIOS_VARS_COPY)"
+    echo " -exec          execute the QEMU command (default $EXEC_QEMU_CMDLINE)"
+    echo " -filelog       enable/disable QEMU cmd line file log (default: $ENABLE_FILE_LOG)"
     exit 1
 }
 
-add_opts() {
-    echo -n "$* " >> ${QEMU_CMDLINE}
-}
-
-run_cmd() {
-    if ! "$@"; then
-        echo "Command '$*' failed"
-        exit 1
-    fi
-}
-
-if [ "$(id -u)" -ne 0 ]; then
-    echo "This script must be run as root!"
-    exit 1
-fi
-
 while [[ $1 != "" ]]; do
     case "$1" in
         -hda)
-            HDA_FILE="${2}"
+            HDA_FILE=${2}
             shift
             ;;
         -nosev)
@@ -83,16 +75,9 @@ while [[ $1 != "" ]]; do
         -vnc)
             VNC_PORT=$2
             shift
-            if [ "${VNC_PORT}" = "" ]; then
-                usage
-            fi
             ;;
         -bios)
-            UEFI_BIOS_CODE=$(readlink -f "$2")
-            shift
-            ;;
-        -netconsole)
-            NETCONSOLE_PORT=$2
+            UEFI_BIOS_CODE=$2
             shift
             ;;
         -initrd)
@@ -110,35 +95,74 @@ while [[ $1 != "" ]]; do
         -virtio)
             USE_VIRTIO="1"
             ;;
-        -gdb)
-            USE_GDB="1"
-            ;;
         -cbitpos)
             CBITPOS=$2
+            shift
             ;;
         -hosthttp)
             HOST_HTTP_PORT=$2
+            shift
             ;;
         -guesthttp)
             GUEST_HTTP_PORT=$2
+            shift
             ;;
         -hostgrpc)
             HOST_GRPC_PORT=$2
+            shift
             ;;
-        -guestgrpc)
-            GUEST_GRPC_PORT=$2
+        -origuefivars)
+            UEFI_BIOS_VARS_ORIG=$2
+            shift
             ;;
+        -copyuefivars)
+            UEFI_BIOS_VARS_COPY=$2
+            shift
+            ;;        
+        -exec)
+            EXEC_QEMU_CMDLINE="1"
+            ;;      
+        -filelog)
+            ENABLE_FILE_LOG="1"
+            ;;                           
         *)
             usage;;
     esac
     shift
 done
 
+#
+# func definitions
+#
+
+add_opts() {
+    echo -n "$* " >> ${QEMU_CMDLINE}
+}
+
+run_cmd() {
+    if ! "$@"; then
+        echo "Command '$*' failed"
+        exit 1
+    fi
+}
+
+if [ "$(id -u)" -ne 0 ]; then
+    echo "This script must be run as root!"
+    exit 1
+fi
+
+# copy BIOS variables to new dest for VM use without modifying the original ones
+cp "$UEFI_BIOS_VARS_ORIG" "$UEFI_BIOS_VARS_COPY"
+
+#
+# Qemu cmd line construction
+#
+
 # we add all the qemu command line options into a file
 QEMU_CMDLINE=/tmp/cmdline.$$
 rm -rf ${QEMU_CMDLINE}
 
-add_opts "${QEMU_INSTALL_DIR}qemu-system-x86_64"
+add_opts "$(which qemu-system-x86_64)"
 
 # Basic virtual machine property
 add_opts "-enable-kvm -cpu EPYC -machine q35"
@@ -152,8 +176,8 @@ add_opts "-m ${GUEST_SIZE_IN_MB}M,slots=5,maxmem=30G"
 # The OVMF binary, including the non-volatile variable store, appears as a
 # "normal" qemu drive on the host side, and it is exposed to the guest as a
 # persistent flash device.
-add_opts "-drive if=pflash,format=raw,unit=0,file=${UEFI_BIOS_CODE},readonly"
-add_opts "-drive if=pflash,format=raw,unit=1,file=${UEFI_BIOS_VARS}"
+add_opts "-drive if=pflash,format=raw,unit=0,file=${UEFI_BIOS_CODE},readonly=on"
+add_opts "-drive if=pflash,format=raw,unit=1,file=${UEFI_BIOS_VARS_COPY}"
 
 # add CDROM if specified
 [ -n "$CDROM_FILE" ] && add_opts "-drive file=${CDROM_FILE},media=cdrom -boot d"
@@ -206,22 +230,43 @@ fi
 # start monitor on pty
 add_opts "-monitor pty"
 
-# log the console  output in stdout.log
-QEMU_CONSOLE_LOG=$(pwd)/stdout.log
+#
+# Qemu cmd line log
+#
 
-# save the command line args into log file
-cat $QEMU_CMDLINE | tee "${QEMU_CONSOLE_LOG}"
-echo | tee -a "${QEMU_CONSOLE_LOG}"
+# Set the log file path if ENABLE_FILE_LOG is 1
+if [ "$ENABLE_FILE_LOG" = "1" ]; then
+    LOG_FILE=$(pwd)/stdout.log
+
+    # Save the command line args into log file
+    cat "$QEMU_CMDLINE" > "$LOG_FILE"
+    echo >> "$LOG_FILE"
+fi
 
+ # Log the command line to the console
+cat "$QEMU_CMDLINE"
+echo
+
+#
+# Qemu cmd line execution
+#
+
+if [[ "${EXEC_QEMU_CMDLINE}" = "0" ]]; then
+    exit 0
+fi
 
 # map CTRL-C to CTRL ]
 echo "Mapping CTRL-C to CTRL-]"
 stty intr ^]
 
-            echo "Launching VM ..."
-            bash ${QEMU_CMDLINE} 2>&1 | tee -a "${QEMU_CONSOLE_LOG}"
+echo "Launching VM ..."
+if [ "$ENABLE_FILE_LOG" = "1" ]; then
+    bash ${QEMU_CMDLINE} 2>&1 | tee -a "${LOG_FILE}"
+else 
+    bash ${QEMU_CMDLINE} 2>&1
+fi
 
-            # restore the mapping
-            stty intr ^c
+# restore the mapping
+stty intr ^c
 
-            rm -rf ${QEMU_CMDLINE}
+rm -rf ${QEMU_CMDLINE}

From ada7cb96b74d3c5938639c9392f5375fc0dcdcd0 Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Mon, 7 Aug 2023 17:44:50 +0200
Subject: [PATCH 06/25] Parse env vars for qemu cmd line config

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 cmd/manager/main.go          |  6 ++++
 cmd/manager/xml/copy.bkp.xml | 69 ------------------------------------
 manager/libvirt.go           | 60 ++++++++++++++++++++-----------
 3 files changed, 46 insertions(+), 89 deletions(-)
 delete mode 100644 cmd/manager/xml/copy.bkp.xml

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index 56dec7a..3b3a68a 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -42,6 +42,7 @@ const (
 	envPrefixHTTP      = "MANAGER_HTTP_"
 	envPrefixGRPC      = "MANAGER_GRPC_"
 	envPrefixAgentGRPC = "AGENT_GRPC_"
+	envPrefixQemu      = "MANAGER_QEMU_"
 	defSvcGRPCPort     = "7001"
 	defSvcHTTPPort     = "9021"
 )
@@ -103,6 +104,11 @@ func main() {
 
 	logger.Info("Successfully connected to agent grpc server " + agentGRPCClient.Secure())
 
+	qemuConfig := manager.Config{}
+	if err := env.Parse(&qemuConfig, env.Options{Prefix: envPrefixQemu}); err != nil {
+		logger.Fatal(fmt.Sprintf("failed to load %s QEMU configuration : %s", svcName, err))
+	}
+
 	svc := newService(libvirtConn, agentClient, logger, tracer)
 
 	var httpServerConfig = server.Config{Port: defSvcHTTPPort}
diff --git a/cmd/manager/xml/copy.bkp.xml b/cmd/manager/xml/copy.bkp.xml
deleted file mode 100644
index 8fd5546..0000000
--- a/cmd/manager/xml/copy.bkp.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<domain type="kvm">
-  <name>QEmu-alpine-standard-x86_64</name>
-  <uuid>c7a5fdbd-cdaf-9455-926a-d65c16db1809</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://alpinelinux.org/alpinelinux/3.15"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit="KiB">786432</memory>
-  <currentMemory unit="KiB">786432</currentMemory>
-  <vcpu placement="static">1</vcpu>
-  <os>
-    <type arch="x86_64" machine="pc-q35-6.2">hvm</type>
-    <!-- <boot dev="cdrom"/> -->
-    <bootmenu enable="yes"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state="off"/>
-  </features>
-  <cpu mode="host-passthrough" check="none" migratable="on"/>
-  <clock offset="utc">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled="no"/>
-    <suspend-to-disk enabled="no"/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="qcow2" discard="unmap"/>
-      <source file="./img/boot.img"/>
-      <target dev="vda" bus="virtio"/>
-      <address type="pci" domain="0x0000" bus="0x04" slot="0x00" function="0x0"/>
-      <!-- <snapshot name="snapshot1"/> -->
-      <boot order="1"/>
-    </disk>
-    <disk type="file" device="cdrom">
-      <source file='./iso/alpine-virt-3.18.0-x86_64.iso'/>    
-      <driver name="qemu" type="raw"/>
-      <target dev="sda" bus="sata"/>
-      <readonly/>
-      <address type="drive" controller="0" bus="0" target="0" unit="0"/>
-      <boot order="2"/>
-    </disk>
-    <graphics type="spice" autoport="yes">
-      <listen type="address"/>
-      <image compression="off"/>
-    </graphics>
-    <video>
-      <model type="qxl" ram="65536" vram="65536" vgamem="16384" heads="1" primary="yes"/>
-      <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x0"/>
-    </video>
-    <interface type="network">
-      <mac address="52:54:00:03:7b:5f"/>
-      <source network="default"/>
-      <model type="virtio"/>
-      <address type="pci" domain="0x0000" bus="0x01" slot="0x00" function="0x0"/>
-    </interface>
-  </devices>
-
-</domain>
diff --git a/manager/libvirt.go b/manager/libvirt.go
index d40340e..f7ad34c 100644
--- a/manager/libvirt.go
+++ b/manager/libvirt.go
@@ -7,6 +7,26 @@ import (
 	libvirt "github.com/digitalocean/go-libvirt"
 )
 
+type Config struct {
+	HDAFile          string `env:"HDA_FILE" envDefault:"cmd/manager/img/focal-server-cloudimg-amd64.qcow2"`
+	GuestSizeInMB    int    `env:"GUEST_SIZE_IN_MB" envDefault:"4096"`
+	SevGuest         int    `env:"SEV_GUEST" envDefault:"1"`
+	SmpNCPUs         int    `env:"SMP_NCPUS" envDefault:"4"`
+	Console          string `env:"CONSOLE" envDefault:"serial"`
+	VNCPort          string `env:"VNC_PORT"`
+	UseVirtio        int    `env:"USE_VIRTIO" envDefault:"1"`
+	UEFIBiosCode     string `env:"UEFI_BIOS_CODE" envDefault:"/usr/share/OVMF/OVMF_CODE.fd"`
+	UEFIBiosVarsOrig string `env:"UEFI_BIOS_VARS_ORIG" envDefault:"/usr/share/OVMF/OVMF_VARS.fd"`
+	UEFIBiosVarsCopy string `env:"UEFI_BIOS_VARS_COPY" envDefault:"cmd/manager/img/OVMF_VARS.fd"`
+	CBitPos          int    `env:"CBITPOS" envDefault:"51"`
+	HostHTTPPort     int    `env:"HOST_HTTP_PORT" envDefault:"9301"`
+	GuestHTTPPort    int    `env:"GUEST_HTTP_PORT" envDefault:"9031"`
+	HostGRPCPort     int    `env:"HOST_GRPC_PORT" envDefault:"7020"`
+	GuestGRPCPort    int    `env:"GUEST_GRPC_PORT" envDefault:"7002"`
+	EnableFileLog    int    `env:"ENABLE_FILE_LOG" envDefault:"0"`
+	ExecQemuCmdLine  int    `env:"EXEC_QEMU_CMDLINE" envDefault:"1"`
+}
+
 var re = regexp.MustCompile(`'([^']*)'`)
 
 const bootTime = 5 * time.Second
@@ -42,26 +62,26 @@ func createDomain(libvirtConn *libvirt.Libvirt, poolXML string, volXML string, d
 	}
 pool_exists:
 
-	// _, err = libvirtConn.StorageVolCreateXML(pool, volXML, 0)
-	// if err != nil {
-	// 	lvErr := err.(libvirt.Error)
-	// 	if lvErr.Code == 90 {
-	// 		name, err := entityName(lvErr.Message)
-	// 		if err != nil {
-	// 			return libvirt.Domain{}, err
-	// 		}
-	// 		_, err = libvirtConn.StorageVolLookupByName(pool, name)
-	// 		if err != nil {
-	// 			return libvirt.Domain{}, err
-	// 		}
-
-	// 		goto vol_exists
-	// 	}
-
-	// 	return libvirt.Domain{}, err
-	// }
-
-	// vol_exists:
+	_, err = libvirtConn.StorageVolCreateXML(pool, volXML, 0)
+	if err != nil {
+		lvErr := err.(libvirt.Error)
+		if lvErr.Code == 90 {
+			name, err := entityName(lvErr.Message)
+			if err != nil {
+				return libvirt.Domain{}, err
+			}
+			_, err = libvirtConn.StorageVolLookupByName(pool, name)
+			if err != nil {
+				return libvirt.Domain{}, err
+			}
+
+			goto vol_exists
+		}
+
+		return libvirt.Domain{}, err
+	}
+
+vol_exists:
 
 	dom, err := libvirtConn.DomainDefineXMLFlags(domXML, 0)
 	if err != nil {

From 6294117de82a086a46b4b9bf2e0558d3b6290330 Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Mon, 7 Aug 2023 18:37:44 +0200
Subject: [PATCH 07/25] Add ConstructQemuCommand and fix guestgrpc bug in sh

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 cmd/manager/main.go               |  12 ++++
 cmd/manager/script/launch-qemu.sh |   4 ++
 manager/libvirt.go                |  20 ------
 manager/qemu.go                   | 107 ++++++++++++++++++++++++++++++
 4 files changed, 123 insertions(+), 20 deletions(-)
 create mode 100644 manager/qemu.go

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index 3b3a68a..359ec90 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -104,11 +104,23 @@ func main() {
 
 	logger.Info("Successfully connected to agent grpc server " + agentGRPCClient.Secure())
 
+	// QEMU
 	qemuConfig := manager.Config{}
 	if err := env.Parse(&qemuConfig, env.Options{Prefix: envPrefixQemu}); err != nil {
 		logger.Fatal(fmt.Sprintf("failed to load %s QEMU configuration : %s", svcName, err))
 	}
 
+	args := manager.ConstructQemuCommand(qemuConfig)
+	fmt.Println(args)
+
+	script := "cmd/manager/script/launch-qemu.sh"
+	output, err := manager.RunShellCommand(script, args...)
+	if err != nil {
+		logger.Fatal(fmt.Sprintf("failed to execute %s QEMU script: %s", script, err))
+	}
+	fmt.Println(output)
+
+	//SVC
 	svc := newService(libvirtConn, agentClient, logger, tracer)
 
 	var httpServerConfig = server.Config{Port: defSvcHTTPPort}
diff --git a/cmd/manager/script/launch-qemu.sh b/cmd/manager/script/launch-qemu.sh
index 0426f3a..25cc47f 100755
--- a/cmd/manager/script/launch-qemu.sh
+++ b/cmd/manager/script/launch-qemu.sh
@@ -107,6 +107,10 @@ while [[ $1 != "" ]]; do
             GUEST_HTTP_PORT=$2
             shift
             ;;
+        -guestgrpc)
+            GUEST_GRPC_PORT=$2
+            shift
+            ;;
         -hostgrpc)
             HOST_GRPC_PORT=$2
             shift
diff --git a/manager/libvirt.go b/manager/libvirt.go
index f7ad34c..86c8eb5 100644
--- a/manager/libvirt.go
+++ b/manager/libvirt.go
@@ -7,26 +7,6 @@ import (
 	libvirt "github.com/digitalocean/go-libvirt"
 )
 
-type Config struct {
-	HDAFile          string `env:"HDA_FILE" envDefault:"cmd/manager/img/focal-server-cloudimg-amd64.qcow2"`
-	GuestSizeInMB    int    `env:"GUEST_SIZE_IN_MB" envDefault:"4096"`
-	SevGuest         int    `env:"SEV_GUEST" envDefault:"1"`
-	SmpNCPUs         int    `env:"SMP_NCPUS" envDefault:"4"`
-	Console          string `env:"CONSOLE" envDefault:"serial"`
-	VNCPort          string `env:"VNC_PORT"`
-	UseVirtio        int    `env:"USE_VIRTIO" envDefault:"1"`
-	UEFIBiosCode     string `env:"UEFI_BIOS_CODE" envDefault:"/usr/share/OVMF/OVMF_CODE.fd"`
-	UEFIBiosVarsOrig string `env:"UEFI_BIOS_VARS_ORIG" envDefault:"/usr/share/OVMF/OVMF_VARS.fd"`
-	UEFIBiosVarsCopy string `env:"UEFI_BIOS_VARS_COPY" envDefault:"cmd/manager/img/OVMF_VARS.fd"`
-	CBitPos          int    `env:"CBITPOS" envDefault:"51"`
-	HostHTTPPort     int    `env:"HOST_HTTP_PORT" envDefault:"9301"`
-	GuestHTTPPort    int    `env:"GUEST_HTTP_PORT" envDefault:"9031"`
-	HostGRPCPort     int    `env:"HOST_GRPC_PORT" envDefault:"7020"`
-	GuestGRPCPort    int    `env:"GUEST_GRPC_PORT" envDefault:"7002"`
-	EnableFileLog    int    `env:"ENABLE_FILE_LOG" envDefault:"0"`
-	ExecQemuCmdLine  int    `env:"EXEC_QEMU_CMDLINE" envDefault:"1"`
-}
-
 var re = regexp.MustCompile(`'([^']*)'`)
 
 const bootTime = 5 * time.Second
diff --git a/manager/qemu.go b/manager/qemu.go
new file mode 100644
index 0000000..6139a31
--- /dev/null
+++ b/manager/qemu.go
@@ -0,0 +1,107 @@
+package manager
+
+import (
+	"fmt"
+	"os/exec"
+	"strconv"
+)
+
+type Config struct {
+	HDAFile          string `env:"HDA_FILE" envDefault:"cmd/manager/img/focal-server-cloudimg-amd64.qcow2"`
+	GuestSizeInMB    int    `env:"GUEST_SIZE_IN_MB" envDefault:"4096"`
+	SevGuest         bool   `env:"SEV_GUEST" envDefault:"1"`
+	SmpNCPUs         int    `env:"SMP_NCPUS" envDefault:"4"`
+	Console          string `env:"CONSOLE" envDefault:"serial"`
+	VNCPort          string `env:"VNC_PORT"`
+	UseVirtio        bool   `env:"USE_VIRTIO" envDefault:"1"`
+	UEFIBiosCode     string `env:"UEFI_BIOS_CODE" envDefault:"/usr/share/OVMF/OVMF_CODE.fd"`
+	UEFIBiosVarsOrig string `env:"UEFI_BIOS_VARS_ORIG" envDefault:"/usr/share/OVMF/OVMF_VARS.fd"`
+	UEFIBiosVarsCopy string `env:"UEFI_BIOS_VARS_COPY" envDefault:"cmd/manager/img/OVMF_VARS.fd"`
+	CBitPos          int    `env:"CBITPOS" envDefault:"51"`
+	HostHTTPPort     int    `env:"HOST_HTTP_PORT" envDefault:"9301"`
+	GuestHTTPPort    int    `env:"GUEST_HTTP_PORT" envDefault:"9031"`
+	HostGRPCPort     int    `env:"HOST_GRPC_PORT" envDefault:"7020"`
+	GuestGRPCPort    int    `env:"GUEST_GRPC_PORT" envDefault:"7002"`
+	EnableFileLog    bool   `env:"ENABLE_FILE_LOG" envDefault:"0"`
+	ExecQemuCmdLine  bool   `env:"EXEC_QEMU_CMDLINE" envDefault:"1"`
+}
+
+func RunShellCommand(command string, args ...string) (string, error) {
+	cmd := exec.Command(command, args...)
+
+	output, err := cmd.Output()
+	if err != nil {
+		return "", fmt.Errorf("error executing command '%s': %s", cmd.String(), err)
+	}
+
+	return string(output), nil
+}
+
+func ConstructQemuCommand(config Config) []string {
+	args := []string{
+		"-hda", config.HDAFile,
+		"-mem", strconv.Itoa(config.GuestSizeInMB),
+	}
+
+	if !config.SevGuest {
+		args = append(args, "-nosev")
+	}
+
+	if config.VNCPort != "" {
+		args = append(args, "-vnc", config.VNCPort)
+	}
+
+	if config.UseVirtio {
+		args = append(args, "-virtio")
+	}
+
+	if config.EnableFileLog {
+		args = append(args, "-filelog")
+	}
+
+	if config.ExecQemuCmdLine {
+		args = append(args, "-exec")
+	}
+
+	if config.HostHTTPPort != 0 {
+		args = append(args, "-hosthttp", strconv.Itoa(config.HostHTTPPort))
+	}
+
+	if config.GuestHTTPPort != 0 {
+		args = append(args, "-guesthttp", strconv.Itoa(config.GuestHTTPPort))
+	}
+
+	if config.HostGRPCPort != 0 {
+		args = append(args, "-hostgrpc", strconv.Itoa(config.HostGRPCPort))
+	}
+
+	if config.GuestGRPCPort != 0 {
+		args = append(args, "-guestgrpc", strconv.Itoa(config.GuestGRPCPort))
+	}
+
+	if config.UEFIBiosCode != "" {
+		args = append(args, "-bios", config.UEFIBiosCode)
+	}
+
+	if config.UEFIBiosVarsOrig != "" {
+		args = append(args, "-origuefivars", config.UEFIBiosVarsOrig)
+	}
+
+	if config.UEFIBiosVarsCopy != "" {
+		args = append(args, "-copyuefivars", config.UEFIBiosVarsCopy)
+	}
+
+	if config.Console != "" {
+		args = append(args, "-console", config.Console)
+	}
+
+	if config.CBitPos != 0 {
+		args = append(args, "-cbitpos", strconv.Itoa(config.CBitPos))
+	}
+
+	if config.SmpNCPUs != 0 {
+		args = append(args, "-smp", strconv.Itoa(config.SmpNCPUs))
+	}
+
+	return args
+}

From ff479052479a1c232d9c2826412b5fc0fd2b2c37 Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Tue, 8 Aug 2023 14:29:14 +0200
Subject: [PATCH 08/25] Remove sudo necessity

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 cmd/manager/script/launch-qemu.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd/manager/script/launch-qemu.sh b/cmd/manager/script/launch-qemu.sh
index 25cc47f..400da93 100755
--- a/cmd/manager/script/launch-qemu.sh
+++ b/cmd/manager/script/launch-qemu.sh
@@ -150,10 +150,10 @@ run_cmd() {
     fi
 }
 
-if [ "$(id -u)" -ne 0 ]; then
-    echo "This script must be run as root!"
-    exit 1
-fi
+# if [ "$(id -u)" -ne 0 ]; then
+#     echo "This script must be run as root!"
+#     exit 1
+# fi
 
 # copy BIOS variables to new dest for VM use without modifying the original ones
 cp "$UEFI_BIOS_VARS_ORIG" "$UEFI_BIOS_VARS_COPY"

From 9c545d3c7c0eb0e2b9f5b8c96ce0693fa6d432f5 Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Tue, 8 Aug 2023 16:03:16 +0200
Subject: [PATCH 09/25] Replace cmd.Output() with cmd.Start()

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 cmd/manager/main.go               |  3 +--
 cmd/manager/script/launch-qemu.sh |  2 +-
 manager/qemu.go                   | 19 +++++++++++++++----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index 359ec90..db202bc 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -114,11 +114,10 @@ func main() {
 	fmt.Println(args)
 
 	script := "cmd/manager/script/launch-qemu.sh"
-	output, err := manager.RunShellCommand(script, args...)
+	_, err = manager.RunShellCommand(script, args...)
 	if err != nil {
 		logger.Fatal(fmt.Sprintf("failed to execute %s QEMU script: %s", script, err))
 	}
-	fmt.Println(output)
 
 	//SVC
 	svc := newService(libvirtConn, agentClient, logger, tracer)
diff --git a/cmd/manager/script/launch-qemu.sh b/cmd/manager/script/launch-qemu.sh
index 400da93..75b61ce 100755
--- a/cmd/manager/script/launch-qemu.sh
+++ b/cmd/manager/script/launch-qemu.sh
@@ -8,7 +8,7 @@ HDA_FILE="cmd/manager/img/focal-server-cloudimg-amd64.qcow2"
 GUEST_SIZE_IN_MB="4096"
 SEV_GUEST="1"
 SMP_NCPUS="4"
-CONSOLE="serial" # for gtk, use qxl
+CONSOLE="serial"
 VNC_PORT=""
 USE_VIRTIO="1"
 
diff --git a/manager/qemu.go b/manager/qemu.go
index 6139a31..2016f3e 100644
--- a/manager/qemu.go
+++ b/manager/qemu.go
@@ -26,15 +26,26 @@ type Config struct {
 	ExecQemuCmdLine  bool   `env:"EXEC_QEMU_CMDLINE" envDefault:"1"`
 }
 
-func RunShellCommand(command string, args ...string) (string, error) {
+// func RunShellCommand(command string, args ...string) (string, error) {
+// 	cmd := exec.Command(command, args...)
+
+// 	output, err := cmd.Output()
+// 	if err != nil {
+// 		return "", fmt.Errorf("error executing command '%s': %s", cmd.String(), err)
+// 	}
+
+// 	return string(output), nil
+// }
+
+func RunShellCommand(command string, args ...string) (*exec.Cmd, error) {
 	cmd := exec.Command(command, args...)
 
-	output, err := cmd.Output()
+	err := cmd.Start()
 	if err != nil {
-		return "", fmt.Errorf("error executing command '%s': %s", cmd.String(), err)
+		return nil, fmt.Errorf("error starting command '%s': %s", cmd.String(), err)
 	}
 
-	return string(output), nil
+	return cmd, nil
 }
 
 func ConstructQemuCommand(config Config) []string {

From 3caaf6a631bfec36e654a7afc97317900ca56c33 Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Wed, 9 Aug 2023 14:21:01 +0200
Subject: [PATCH 10/25] Add a tmp file to read qemu cmd line constr output

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 cmd/manager/main.go               | 24 ++++++++++-
 cmd/manager/script/launch-qemu.sh |  1 -
 manager/qemu.go                   | 69 ++++++++++++++++++++++++++-----
 3 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index db202bc..6a2e0b5 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -111,13 +111,33 @@ func main() {
 	}
 
 	args := manager.ConstructQemuCommand(qemuConfig)
-	fmt.Println(args)
+	// fmt.Println(args)
+
+	// script := "cmd/manager/script/launch-qemu.sh"
+	// _, err = manager.RunShellCommand(script, args...)
+	// if err != nil {
+	// 	logger.Fatal(fmt.Sprintf("failed to execute %s QEMU script: %s", script, err))
+	// }
 
 	script := "cmd/manager/script/launch-qemu.sh"
-	_, err = manager.RunShellCommand(script, args...)
+	tmpFile, err := manager.RunShellCommandWithCapture(script, args...)
 	if err != nil {
 		logger.Fatal(fmt.Sprintf("failed to execute %s QEMU script: %s", script, err))
 	}
+	output, err := manager.ReadTmpFileToString(tmpFile)
+	if err != nil {
+		logger.Fatal(fmt.Sprintf("failed to read temporary file: %s", err))
+	}
+	os.Remove(tmpFile.Name())
+	tmpFile.Close()
+	// fmt.Println(output)
+
+	command, args := manager.ExtractCommandAndArgs(output)
+
+	_, err = manager.RunShellCommandStart(command, args...)
+	if err != nil {
+		logger.Fatal(fmt.Sprintf("failed to read temporary file: %s", err))
+	}
 
 	//SVC
 	svc := newService(libvirtConn, agentClient, logger, tracer)
diff --git a/cmd/manager/script/launch-qemu.sh b/cmd/manager/script/launch-qemu.sh
index 75b61ce..c909192 100755
--- a/cmd/manager/script/launch-qemu.sh
+++ b/cmd/manager/script/launch-qemu.sh
@@ -249,7 +249,6 @@ fi
 
  # Log the command line to the console
 cat "$QEMU_CMDLINE"
-echo
 
 #
 # Qemu cmd line execution
diff --git a/manager/qemu.go b/manager/qemu.go
index 2016f3e..149cd78 100644
--- a/manager/qemu.go
+++ b/manager/qemu.go
@@ -2,8 +2,11 @@ package manager
 
 import (
 	"fmt"
+	"io"
+	"os"
 	"os/exec"
 	"strconv"
+	"strings"
 )
 
 type Config struct {
@@ -23,21 +26,21 @@ type Config struct {
 	HostGRPCPort     int    `env:"HOST_GRPC_PORT" envDefault:"7020"`
 	GuestGRPCPort    int    `env:"GUEST_GRPC_PORT" envDefault:"7002"`
 	EnableFileLog    bool   `env:"ENABLE_FILE_LOG" envDefault:"0"`
-	ExecQemuCmdLine  bool   `env:"EXEC_QEMU_CMDLINE" envDefault:"1"`
+	ExecQemuCmdLine  bool   `env:"EXEC_QEMU_CMDLINE" envDefault:"0"`
 }
 
-// func RunShellCommand(command string, args ...string) (string, error) {
-// 	cmd := exec.Command(command, args...)
+func RunShellCommandOutput(command string, args ...string) (string, error) {
+	cmd := exec.Command(command, args...)
 
-// 	output, err := cmd.Output()
-// 	if err != nil {
-// 		return "", fmt.Errorf("error executing command '%s': %s", cmd.String(), err)
-// 	}
+	output, err := cmd.Output()
+	if err != nil {
+		return "", fmt.Errorf("error executing command '%s': %s", cmd.String(), err)
+	}
 
-// 	return string(output), nil
-// }
+	return string(output), nil
+}
 
-func RunShellCommand(command string, args ...string) (*exec.Cmd, error) {
+func RunShellCommandStart(command string, args ...string) (*exec.Cmd, error) {
 	cmd := exec.Command(command, args...)
 
 	err := cmd.Start()
@@ -48,6 +51,52 @@ func RunShellCommand(command string, args ...string) (*exec.Cmd, error) {
 	return cmd, nil
 }
 
+func RunShellCommandWithCapture(command string, args ...string) (*os.File, error) {
+	tmpFile, err := os.CreateTemp("", "qemu-output-*.log")
+	if err != nil {
+		return nil, fmt.Errorf("failed to create temporary file: %s", err)
+	}
+	defer tmpFile.Close()
+
+	cmd := exec.Command(command, args...)
+
+	cmd.Stdout = io.MultiWriter(tmpFile, os.Stdout)
+	cmd.Stderr = os.Stderr
+
+	err = cmd.Run()
+	if err != nil {
+		return nil, fmt.Errorf("error executing command '%s': %s", cmd.String(), err)
+	}
+
+	return tmpFile, nil
+}
+
+func ReadTmpFileToString(tmpFile *os.File) (string, error) {
+	content, err := os.ReadFile(tmpFile.Name())
+	if err != nil {
+		return "", fmt.Errorf("failed to read temporary file: %s", err)
+	}
+
+	return string(content), nil
+}
+
+func ExtractCommandAndArgs(output string) (string, []string) {
+	lines := strings.Split(output, "\n")
+	if len(lines) == 0 {
+		return "", nil
+	}
+
+	parts := strings.Fields(lines[0])
+	if len(parts) == 0 {
+		return "", nil
+	}
+
+	command := parts[0]
+	args := parts[1:]
+
+	return command, args
+}
+
 func ConstructQemuCommand(config Config) []string {
 	args := []string{
 		"-hda", config.HDAFile,

From 1012d2cb0e8e219f664c56634e2b3012b43a8f7c Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Wed, 9 Aug 2023 16:05:40 +0200
Subject: [PATCH 11/25] Add sudo env var

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 cmd/manager/main.go | 2 +-
 manager/qemu.go     | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index 6a2e0b5..af67c91 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -132,7 +132,7 @@ func main() {
 	tmpFile.Close()
 	// fmt.Println(output)
 
-	command, args := manager.ExtractCommandAndArgs(output)
+	command, args := manager.ExtractCommandAndArgs(output, qemuConfig.Sudo)
 
 	_, err = manager.RunShellCommandStart(command, args...)
 	if err != nil {
diff --git a/manager/qemu.go b/manager/qemu.go
index 149cd78..e245b99 100644
--- a/manager/qemu.go
+++ b/manager/qemu.go
@@ -27,6 +27,7 @@ type Config struct {
 	GuestGRPCPort    int    `env:"GUEST_GRPC_PORT" envDefault:"7002"`
 	EnableFileLog    bool   `env:"ENABLE_FILE_LOG" envDefault:"0"`
 	ExecQemuCmdLine  bool   `env:"EXEC_QEMU_CMDLINE" envDefault:"0"`
+	Sudo             bool   `env:"SUDO" envDefault:"0"`
 }
 
 func RunShellCommandOutput(command string, args ...string) (string, error) {
@@ -80,7 +81,7 @@ func ReadTmpFileToString(tmpFile *os.File) (string, error) {
 	return string(content), nil
 }
 
-func ExtractCommandAndArgs(output string) (string, []string) {
+func ExtractCommandAndArgs(output string, sudo bool) (string, []string) {
 	lines := strings.Split(output, "\n")
 	if len(lines) == 0 {
 		return "", nil
@@ -91,6 +92,10 @@ func ExtractCommandAndArgs(output string) (string, []string) {
 		return "", nil
 	}
 
+	if sudo {
+		parts = append([]string{"sudo"}, parts...)
+	}
+
 	command := parts[0]
 	args := parts[1:]
 

From 7e21a173171892b43753440e09ff9be4693fd187 Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Thu, 10 Aug 2023 10:54:34 +0200
Subject: [PATCH 12/25] Remove tmp file creation and capture stdout with buffer

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 cmd/manager/main.go |  35 +++--------
 manager/qemu.go     | 144 +++++++++++++++++++++++++-------------------
 2 files changed, 91 insertions(+), 88 deletions(-)

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index af67c91..75c2c3c 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -110,34 +110,19 @@ func main() {
 		logger.Fatal(fmt.Sprintf("failed to load %s QEMU configuration : %s", svcName, err))
 	}
 
-	args := manager.ConstructQemuCommand(qemuConfig)
-	// fmt.Println(args)
-
-	// script := "cmd/manager/script/launch-qemu.sh"
-	// _, err = manager.RunShellCommand(script, args...)
-	// if err != nil {
-	// 	logger.Fatal(fmt.Sprintf("failed to execute %s QEMU script: %s", script, err))
-	// }
-
-	script := "cmd/manager/script/launch-qemu.sh"
-	tmpFile, err := manager.RunShellCommandWithCapture(script, args...)
-	if err != nil {
-		logger.Fatal(fmt.Sprintf("failed to execute %s QEMU script: %s", script, err))
-	}
-	output, err := manager.ReadTmpFileToString(tmpFile)
+	// Run the QEMU virtual machine
+	// qemuCmd, err := manager.RunQemuVM(qemuConfig, logger)
+	_, err = manager.RunQemuVM(qemuConfig, logger)
 	if err != nil {
-		logger.Fatal(fmt.Sprintf("failed to read temporary file: %s", err))
+		log.Fatalf("Failed to run QEMU VM: %s", err)
 	}
-	os.Remove(tmpFile.Name())
-	tmpFile.Close()
-	// fmt.Println(output)
 
-	command, args := manager.ExtractCommandAndArgs(output, qemuConfig.Sudo)
-
-	_, err = manager.RunShellCommandStart(command, args...)
-	if err != nil {
-		logger.Fatal(fmt.Sprintf("failed to read temporary file: %s", err))
-	}
+	// TODO: we can't wait here because it's blocking
+	// // Wait for the QEMU process to finish
+	// err = qemuCmd.Wait()
+	// if err != nil {
+	// 	log.Fatalf("QEMU process error: %s", err)
+	// }
 
 	//SVC
 	svc := newService(libvirtConn, agentClient, logger, tracer)
diff --git a/manager/qemu.go b/manager/qemu.go
index e245b99..b73af8a 100644
--- a/manager/qemu.go
+++ b/manager/qemu.go
@@ -1,14 +1,19 @@
 package manager
 
 import (
+	"bytes"
 	"fmt"
 	"io"
 	"os"
 	"os/exec"
 	"strconv"
 	"strings"
+
+	"github.com/mainflux/mainflux/logger"
 )
 
+const script = "cmd/manager/script/launch-qemu.sh"
+
 type Config struct {
 	HDAFile          string `env:"HDA_FILE" envDefault:"cmd/manager/img/focal-server-cloudimg-amd64.qcow2"`
 	GuestSizeInMB    int    `env:"GUEST_SIZE_IN_MB" envDefault:"4096"`
@@ -30,79 +35,28 @@ type Config struct {
 	Sudo             bool   `env:"SUDO" envDefault:"0"`
 }
 
-func RunShellCommandOutput(command string, args ...string) (string, error) {
-	cmd := exec.Command(command, args...)
+// RunQemuVM runs a QEMU virtual machine: constructs the QEMU command line arguments by executing the launch-qemu.sh,
+// extracts the QEMU command and its arguments, and starts the QEMU process
+func RunQemuVM(qemuConfig Config, logger logger.Logger) (*exec.Cmd, error) {
+	args := constructQemuCmd(qemuConfig)
 
-	output, err := cmd.Output()
+	output, err := ExeShCmdStdout(script, args...)
 	if err != nil {
-		return "", fmt.Errorf("error executing command '%s': %s", cmd.String(), err)
+		return nil, err
 	}
 
-	return string(output), nil
-}
-
-func RunShellCommandStart(command string, args ...string) (*exec.Cmd, error) {
-	cmd := exec.Command(command, args...)
-
-	err := cmd.Start()
+	command, args := ExtractCmdAndArgs(output, qemuConfig.Sudo)
+	cmd, err := RunCmdStart(command, args...)
 	if err != nil {
-		return nil, fmt.Errorf("error starting command '%s': %s", cmd.String(), err)
+		return nil, err
 	}
 
 	return cmd, nil
 }
 
-func RunShellCommandWithCapture(command string, args ...string) (*os.File, error) {
-	tmpFile, err := os.CreateTemp("", "qemu-output-*.log")
-	if err != nil {
-		return nil, fmt.Errorf("failed to create temporary file: %s", err)
-	}
-	defer tmpFile.Close()
-
-	cmd := exec.Command(command, args...)
-
-	cmd.Stdout = io.MultiWriter(tmpFile, os.Stdout)
-	cmd.Stderr = os.Stderr
-
-	err = cmd.Run()
-	if err != nil {
-		return nil, fmt.Errorf("error executing command '%s': %s", cmd.String(), err)
-	}
-
-	return tmpFile, nil
-}
-
-func ReadTmpFileToString(tmpFile *os.File) (string, error) {
-	content, err := os.ReadFile(tmpFile.Name())
-	if err != nil {
-		return "", fmt.Errorf("failed to read temporary file: %s", err)
-	}
-
-	return string(content), nil
-}
-
-func ExtractCommandAndArgs(output string, sudo bool) (string, []string) {
-	lines := strings.Split(output, "\n")
-	if len(lines) == 0 {
-		return "", nil
-	}
-
-	parts := strings.Fields(lines[0])
-	if len(parts) == 0 {
-		return "", nil
-	}
-
-	if sudo {
-		parts = append([]string{"sudo"}, parts...)
-	}
-
-	command := parts[0]
-	args := parts[1:]
-
-	return command, args
-}
-
-func ConstructQemuCommand(config Config) []string {
+// constructQemuCmd constructs the command line arguments for executing the launch-qemu.sh script,
+// which in turn provides the QEMU command to run
+func constructQemuCmd(config Config) []string {
 	args := []string{
 		"-hda", config.HDAFile,
 		"-mem", strconv.Itoa(config.GuestSizeInMB),
@@ -170,3 +124,67 @@ func ConstructQemuCommand(config Config) []string {
 
 	return args
 }
+
+// ExeShCmdStdout executes a shell command capturing the standard output
+func ExeShCmdStdout(command string, args ...string) (string, error) {
+	var stdoutBuf, stderrBuf bytes.Buffer
+
+	cmd := exec.Command(command, args...)
+
+	// Capture stdout and stderr using buffers
+	cmd.Stdout = io.MultiWriter(&stdoutBuf, os.Stdout)
+	cmd.Stderr = io.MultiWriter(&stderrBuf, os.Stderr)
+
+	err := cmd.Run()
+	if err != nil {
+		return "", fmt.Errorf("error executing command '%s': %s", cmd.String(), err)
+	}
+
+	return stdoutBuf.String(), nil
+}
+
+// ExtractCmdAndArgs extracts the command and its arguments from the output string
+func ExtractCmdAndArgs(cmdLine string, sudo bool) (string, []string) {
+	lines := strings.Split(cmdLine, "\n")
+	if len(lines) == 0 {
+		return "", nil
+	}
+
+	parts := strings.Fields(lines[0])
+	if len(parts) == 0 {
+		return "", nil
+	}
+
+	if sudo {
+		parts = append([]string{"sudo"}, parts...)
+	}
+
+	cmd := parts[0]
+	args := parts[1:]
+
+	return cmd, args
+}
+
+// RunCmdOutput runs the specified command and returns its standard output as a string
+func RunCmdOutput(command string, args ...string) (string, error) {
+	cmd := exec.Command(command, args...)
+
+	output, err := cmd.Output()
+	if err != nil {
+		return "", fmt.Errorf("error executing command '%s': %s", cmd.String(), err)
+	}
+
+	return string(output), nil
+}
+
+// RunCmdStart starts the specified command and returns the *exec.Cmd for the running process
+func RunCmdStart(command string, args ...string) (*exec.Cmd, error) {
+	cmd := exec.Command(command, args...)
+
+	err := cmd.Start()
+	if err != nil {
+		return nil, fmt.Errorf("error starting command '%s': %s", cmd.String(), err)
+	}
+
+	return cmd, nil
+}

From d7aca933bd0d7fd15d7b92a7d437e15ab95a15d7 Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Thu, 10 Aug 2023 16:49:26 +0200
Subject: [PATCH 13/25] Move cmd funcs to internal/cmd.go

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 cmd/manager/main.go               |  1 -
 cmd/manager/script/launch-qemu.sh |  5 --
 internal/cmd.go                   | 74 ++++++++++++++++++++++++++++++
 manager/qemu.go                   | 76 ++-----------------------------
 4 files changed, 78 insertions(+), 78 deletions(-)
 create mode 100644 internal/cmd.go

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index 75c2c3c..7029dd6 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -111,7 +111,6 @@ func main() {
 	}
 
 	// Run the QEMU virtual machine
-	// qemuCmd, err := manager.RunQemuVM(qemuConfig, logger)
 	_, err = manager.RunQemuVM(qemuConfig, logger)
 	if err != nil {
 		log.Fatalf("Failed to run QEMU VM: %s", err)
diff --git a/cmd/manager/script/launch-qemu.sh b/cmd/manager/script/launch-qemu.sh
index c909192..06b83b8 100755
--- a/cmd/manager/script/launch-qemu.sh
+++ b/cmd/manager/script/launch-qemu.sh
@@ -150,11 +150,6 @@ run_cmd() {
     fi
 }
 
-# if [ "$(id -u)" -ne 0 ]; then
-#     echo "This script must be run as root!"
-#     exit 1
-# fi
-
 # copy BIOS variables to new dest for VM use without modifying the original ones
 cp "$UEFI_BIOS_VARS_ORIG" "$UEFI_BIOS_VARS_COPY"
 
diff --git a/internal/cmd.go b/internal/cmd.go
new file mode 100644
index 0000000..650db67
--- /dev/null
+++ b/internal/cmd.go
@@ -0,0 +1,74 @@
+package internal
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"os"
+	"os/exec"
+	"strings"
+)
+
+// ExeShCmdStdout executes a shell command capturing the standard output
+func ExeShCmdStdout(command string, args ...string) (string, error) {
+	var stdoutBuf, stderrBuf bytes.Buffer
+
+	cmd := exec.Command(command, args...)
+
+	// Capture stdout and stderr using buffers
+	cmd.Stdout = io.MultiWriter(&stdoutBuf, os.Stdout)
+	cmd.Stderr = io.MultiWriter(&stderrBuf, os.Stderr)
+
+	err := cmd.Run()
+	if err != nil {
+		return "", fmt.Errorf("error executing command '%s': %s", cmd.String(), err)
+	}
+
+	return stdoutBuf.String(), nil
+}
+
+// ExtractCmdAndArgs extracts the command and its arguments from the output string
+func ExtractCmdAndArgs(cmdLine string, sudo bool) (string, []string) {
+	lines := strings.Split(cmdLine, "\n")
+	if len(lines) == 0 {
+		return "", nil
+	}
+
+	parts := strings.Fields(lines[0])
+	if len(parts) == 0 {
+		return "", nil
+	}
+
+	if sudo {
+		parts = append([]string{"sudo"}, parts...)
+	}
+
+	cmd := parts[0]
+	args := parts[1:]
+
+	return cmd, args
+}
+
+// RunCmdOutput runs the specified command and returns its standard output as a string
+func RunCmdOutput(command string, args ...string) (string, error) {
+	cmd := exec.Command(command, args...)
+
+	output, err := cmd.Output()
+	if err != nil {
+		return "", fmt.Errorf("error executing command '%s': %s", cmd.String(), err)
+	}
+
+	return string(output), nil
+}
+
+// RunCmdStart starts the specified command and returns the *exec.Cmd for the running process
+func RunCmdStart(command string, args ...string) (*exec.Cmd, error) {
+	cmd := exec.Command(command, args...)
+
+	err := cmd.Start()
+	if err != nil {
+		return nil, fmt.Errorf("error starting command '%s': %s", cmd.String(), err)
+	}
+
+	return cmd, nil
+}
diff --git a/manager/qemu.go b/manager/qemu.go
index b73af8a..5d4aae1 100644
--- a/manager/qemu.go
+++ b/manager/qemu.go
@@ -1,15 +1,11 @@
 package manager
 
 import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
 	"os/exec"
 	"strconv"
-	"strings"
 
 	"github.com/mainflux/mainflux/logger"
+	"github.com/ultravioletrs/manager/internal"
 )
 
 const script = "cmd/manager/script/launch-qemu.sh"
@@ -40,13 +36,13 @@ type Config struct {
 func RunQemuVM(qemuConfig Config, logger logger.Logger) (*exec.Cmd, error) {
 	args := constructQemuCmd(qemuConfig)
 
-	output, err := ExeShCmdStdout(script, args...)
+	output, err := internal.ExeShCmdStdout(script, args...)
 	if err != nil {
 		return nil, err
 	}
 
-	command, args := ExtractCmdAndArgs(output, qemuConfig.Sudo)
-	cmd, err := RunCmdStart(command, args...)
+	command, args := internal.ExtractCmdAndArgs(output, qemuConfig.Sudo)
+	cmd, err := internal.RunCmdStart(command, args...)
 	if err != nil {
 		return nil, err
 	}
@@ -124,67 +120,3 @@ func constructQemuCmd(config Config) []string {
 
 	return args
 }
-
-// ExeShCmdStdout executes a shell command capturing the standard output
-func ExeShCmdStdout(command string, args ...string) (string, error) {
-	var stdoutBuf, stderrBuf bytes.Buffer
-
-	cmd := exec.Command(command, args...)
-
-	// Capture stdout and stderr using buffers
-	cmd.Stdout = io.MultiWriter(&stdoutBuf, os.Stdout)
-	cmd.Stderr = io.MultiWriter(&stderrBuf, os.Stderr)
-
-	err := cmd.Run()
-	if err != nil {
-		return "", fmt.Errorf("error executing command '%s': %s", cmd.String(), err)
-	}
-
-	return stdoutBuf.String(), nil
-}
-
-// ExtractCmdAndArgs extracts the command and its arguments from the output string
-func ExtractCmdAndArgs(cmdLine string, sudo bool) (string, []string) {
-	lines := strings.Split(cmdLine, "\n")
-	if len(lines) == 0 {
-		return "", nil
-	}
-
-	parts := strings.Fields(lines[0])
-	if len(parts) == 0 {
-		return "", nil
-	}
-
-	if sudo {
-		parts = append([]string{"sudo"}, parts...)
-	}
-
-	cmd := parts[0]
-	args := parts[1:]
-
-	return cmd, args
-}
-
-// RunCmdOutput runs the specified command and returns its standard output as a string
-func RunCmdOutput(command string, args ...string) (string, error) {
-	cmd := exec.Command(command, args...)
-
-	output, err := cmd.Output()
-	if err != nil {
-		return "", fmt.Errorf("error executing command '%s': %s", cmd.String(), err)
-	}
-
-	return string(output), nil
-}
-
-// RunCmdStart starts the specified command and returns the *exec.Cmd for the running process
-func RunCmdStart(command string, args ...string) (*exec.Cmd, error) {
-	cmd := exec.Command(command, args...)
-
-	err := cmd.Start()
-	if err != nil {
-		return nil, fmt.Errorf("error starting command '%s': %s", cmd.String(), err)
-	}
-
-	return cmd, nil
-}

From 51e69d8ab45937e7c867fd48feecac764c36f70a Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Sat, 12 Aug 2023 22:48:53 +0200
Subject: [PATCH 14/25] Replace sh script for ctor of qemu cmd line with go
 code

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 cmd/manager/main.go    |   5 +-
 manager/qemu.go        | 122 ---------------------------
 manager/qemu/config.go | 187 +++++++++++++++++++++++++++++++++++++++++
 manager/qemu/qemu.go   |  27 ++++++
 4 files changed, 217 insertions(+), 124 deletions(-)
 delete mode 100644 manager/qemu.go
 create mode 100644 manager/qemu/config.go
 create mode 100644 manager/qemu/qemu.go

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index 7029dd6..8f27d65 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -30,6 +30,7 @@ import (
 	"github.com/ultravioletrs/manager/manager/api"
 	managergrpc "github.com/ultravioletrs/manager/manager/api/grpc"
 	httpapi "github.com/ultravioletrs/manager/manager/api/http"
+	"github.com/ultravioletrs/manager/manager/qemu"
 	"github.com/ultravioletrs/manager/manager/tracing"
 	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/sync/errgroup"
@@ -105,13 +106,13 @@ func main() {
 	logger.Info("Successfully connected to agent grpc server " + agentGRPCClient.Secure())
 
 	// QEMU
-	qemuConfig := manager.Config{}
+	qemuConfig := qemu.Config{}
 	if err := env.Parse(&qemuConfig, env.Options{Prefix: envPrefixQemu}); err != nil {
 		logger.Fatal(fmt.Sprintf("failed to load %s QEMU configuration : %s", svcName, err))
 	}
 
 	// Run the QEMU virtual machine
-	_, err = manager.RunQemuVM(qemuConfig, logger)
+	_, err = qemu.RunQemuVM(qemuConfig, logger)
 	if err != nil {
 		log.Fatalf("Failed to run QEMU VM: %s", err)
 	}
diff --git a/manager/qemu.go b/manager/qemu.go
deleted file mode 100644
index 5d4aae1..0000000
--- a/manager/qemu.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package manager
-
-import (
-	"os/exec"
-	"strconv"
-
-	"github.com/mainflux/mainflux/logger"
-	"github.com/ultravioletrs/manager/internal"
-)
-
-const script = "cmd/manager/script/launch-qemu.sh"
-
-type Config struct {
-	HDAFile          string `env:"HDA_FILE" envDefault:"cmd/manager/img/focal-server-cloudimg-amd64.qcow2"`
-	GuestSizeInMB    int    `env:"GUEST_SIZE_IN_MB" envDefault:"4096"`
-	SevGuest         bool   `env:"SEV_GUEST" envDefault:"1"`
-	SmpNCPUs         int    `env:"SMP_NCPUS" envDefault:"4"`
-	Console          string `env:"CONSOLE" envDefault:"serial"`
-	VNCPort          string `env:"VNC_PORT"`
-	UseVirtio        bool   `env:"USE_VIRTIO" envDefault:"1"`
-	UEFIBiosCode     string `env:"UEFI_BIOS_CODE" envDefault:"/usr/share/OVMF/OVMF_CODE.fd"`
-	UEFIBiosVarsOrig string `env:"UEFI_BIOS_VARS_ORIG" envDefault:"/usr/share/OVMF/OVMF_VARS.fd"`
-	UEFIBiosVarsCopy string `env:"UEFI_BIOS_VARS_COPY" envDefault:"cmd/manager/img/OVMF_VARS.fd"`
-	CBitPos          int    `env:"CBITPOS" envDefault:"51"`
-	HostHTTPPort     int    `env:"HOST_HTTP_PORT" envDefault:"9301"`
-	GuestHTTPPort    int    `env:"GUEST_HTTP_PORT" envDefault:"9031"`
-	HostGRPCPort     int    `env:"HOST_GRPC_PORT" envDefault:"7020"`
-	GuestGRPCPort    int    `env:"GUEST_GRPC_PORT" envDefault:"7002"`
-	EnableFileLog    bool   `env:"ENABLE_FILE_LOG" envDefault:"0"`
-	ExecQemuCmdLine  bool   `env:"EXEC_QEMU_CMDLINE" envDefault:"0"`
-	Sudo             bool   `env:"SUDO" envDefault:"0"`
-}
-
-// RunQemuVM runs a QEMU virtual machine: constructs the QEMU command line arguments by executing the launch-qemu.sh,
-// extracts the QEMU command and its arguments, and starts the QEMU process
-func RunQemuVM(qemuConfig Config, logger logger.Logger) (*exec.Cmd, error) {
-	args := constructQemuCmd(qemuConfig)
-
-	output, err := internal.ExeShCmdStdout(script, args...)
-	if err != nil {
-		return nil, err
-	}
-
-	command, args := internal.ExtractCmdAndArgs(output, qemuConfig.Sudo)
-	cmd, err := internal.RunCmdStart(command, args...)
-	if err != nil {
-		return nil, err
-	}
-
-	return cmd, nil
-}
-
-// constructQemuCmd constructs the command line arguments for executing the launch-qemu.sh script,
-// which in turn provides the QEMU command to run
-func constructQemuCmd(config Config) []string {
-	args := []string{
-		"-hda", config.HDAFile,
-		"-mem", strconv.Itoa(config.GuestSizeInMB),
-	}
-
-	if !config.SevGuest {
-		args = append(args, "-nosev")
-	}
-
-	if config.VNCPort != "" {
-		args = append(args, "-vnc", config.VNCPort)
-	}
-
-	if config.UseVirtio {
-		args = append(args, "-virtio")
-	}
-
-	if config.EnableFileLog {
-		args = append(args, "-filelog")
-	}
-
-	if config.ExecQemuCmdLine {
-		args = append(args, "-exec")
-	}
-
-	if config.HostHTTPPort != 0 {
-		args = append(args, "-hosthttp", strconv.Itoa(config.HostHTTPPort))
-	}
-
-	if config.GuestHTTPPort != 0 {
-		args = append(args, "-guesthttp", strconv.Itoa(config.GuestHTTPPort))
-	}
-
-	if config.HostGRPCPort != 0 {
-		args = append(args, "-hostgrpc", strconv.Itoa(config.HostGRPCPort))
-	}
-
-	if config.GuestGRPCPort != 0 {
-		args = append(args, "-guestgrpc", strconv.Itoa(config.GuestGRPCPort))
-	}
-
-	if config.UEFIBiosCode != "" {
-		args = append(args, "-bios", config.UEFIBiosCode)
-	}
-
-	if config.UEFIBiosVarsOrig != "" {
-		args = append(args, "-origuefivars", config.UEFIBiosVarsOrig)
-	}
-
-	if config.UEFIBiosVarsCopy != "" {
-		args = append(args, "-copyuefivars", config.UEFIBiosVarsCopy)
-	}
-
-	if config.Console != "" {
-		args = append(args, "-console", config.Console)
-	}
-
-	if config.CBitPos != 0 {
-		args = append(args, "-cbitpos", strconv.Itoa(config.CBitPos))
-	}
-
-	if config.SmpNCPUs != 0 {
-		args = append(args, "-smp", strconv.Itoa(config.SmpNCPUs))
-	}
-
-	return args
-}
diff --git a/manager/qemu/config.go b/manager/qemu/config.go
new file mode 100644
index 0000000..d673654
--- /dev/null
+++ b/manager/qemu/config.go
@@ -0,0 +1,187 @@
+package qemu
+
+import "fmt"
+
+type MemoryConfig struct {
+	Size  string `env:"MEMORY_SIZE" envDefault:"4096M"`
+	Slots int    `env:"MEMORY_SLOTS" envDefault:"5"`
+	Max   string `env:"MAX_MEMORY" envDefault:"30G"`
+}
+
+type OVMFCodeConfig struct {
+	If       string `env:"OVMF_CODE_IF" envDefault:"pflash"`
+	Format   string `env:"OVMF_CODE_FORMAT" envDefault:"raw"`
+	Unit     int    `env:"OVMF_CODE_UNIT" envDefault:"0"`
+	File     string `env:"OVMF_CODE_FILE" envDefault:"/usr/share/OVMF/OVMF_CODE.fd"`
+	ReadOnly string `env:"OVMF_CODE_READONLY" envDefault:"on"`
+}
+
+type OVMFVarsConfig struct {
+	If     string `env:"OVMF_VARS_IF" envDefault:"pflash"`
+	Format string `env:"OVMF_VARS_FORMAT" envDefault:"raw"`
+	Unit   int    `env:"OVMF_VARS_UNIT" envDefault:"1"`
+	File   string `env:"OVMF_VARS_FILE" envDefault:"cmd/manager/img/OVMF_VARS.fd"`
+}
+
+type NetDevConfig struct {
+	Type      string `env:"NETDEV_TYPE" envDefault:"user"`
+	ID        string `env:"NETDEV_ID" envDefault:"vmnic"`
+	HostFwd1  string `env:"HOST_FWD_1" envDefault:"2222"`
+	GuestFwd1 string `env:"GUEST_FWD_1" envDefault:"22"`
+	HostFwd2  string `env:"HOST_FWD_2" envDefault:"9301"`
+	GuestFwd2 string `env:"GUEST_FWD_2" envDefault:"9031"`
+	HostFwd3  string `env:"HOST_FWD_3" envDefault:"7020"`
+	GuestFwd3 string `env:"GUEST_FWD_3" envDefault:"7002"`
+}
+
+type VirtioNetPciConfig struct {
+	Type          string `env:"VIRTIO_NET_PCI_TYPE" envDefault:"virtio-net-pci"`
+	DisableLegacy string `env:"VIRTIO_NET_PCI_DISABLE_LEGACY" envDefault:"on"`
+	IOMMUPlatform bool   `env:"VIRTIO_NET_PCI_IOMMU_PLATFORM" envDefault:"true"`
+	NetDev        string `env:"VIRTIO_NET_PCI_NETDEV" envDefault:"vmnic"`
+	ROMFile       string `env:"VIRTIO_NET_PCI_ROMFILE"`
+}
+
+type DiskDriveConfig struct {
+	File   string `env:"DISK_DRIVE_FILE" envDefault:"cmd/manager/img/focal-server-cloudimg-amd64.qcow2"`
+	If     string `env:"DISK_DRIVE_IF" envDefault:"none"`
+	ID     string `env:"DISK_DRIVE_ID" envDefault:"disk0"`
+	Format string `env:"DISK_DRIVE_FORMAT" envDefault:"qcow2"`
+}
+
+type VirtioScsiPciConfig struct {
+	Type          string `env:"VIRTIO_SCSI_PCI_TYPE" envDefault:"virtio-scsi-pci"`
+	ID            string `env:"VIRTIO_SCSI_PCI_ID" envDefault:"scsi"`
+	DisableLegacy string `env:"VIRTIO_SCSI_PCI_DISABLE_LEGACY" envDefault:"on"`
+	IOMMUPlatform bool   `env:"VIRTIO_SCSI_PCI_IOMMU_PLATFORM" envDefault:"true"`
+}
+
+type ScsiHdConfig struct {
+	Drive string `env:"SCSI_HD_DRIVE" envDefault:"disk0"`
+}
+
+type SevConfig struct {
+	ID              string `env:"SEV_ID" envDefault:"sev0"`
+	CBitPos         int    `env:"SEV_CBITPOS" envDefault:"51"`
+	ReducedPhysBits int    `env:"SEV_REDUCED_PHYS_BITS" envDefault:"1"`
+}
+
+type MemoryEncryptionConfig struct {
+	SEV0 string `env:"MEMORY_ENCRYPTION_SEV0" envDefault:"sev0"`
+}
+
+type Config struct {
+	Machine  string `env:"MACHINE" envDefault:"q35"`
+	CPU      string `env:"CPU" envDefault:"EPYC"`
+	SmpCount int    `env:"SMP_COUNT" envDefault:"4"`
+	MaxCpus  int    `env:"SMP_MAXCPUS" envDefault:"64"`
+
+	Monitor   string `env:"MONITOR" envDefault:"pty"`
+	NoGraphic bool   `env:"NO_GRAPHIC" envDefault:"true"`
+
+	EnableKVM bool `env:"ENABLE_KVM" envDefault:"true"`
+	EnableSEV bool `env:"ENABLE_SEV" envDefault:"true"`
+
+	MemoryConfig
+
+	OVMFCodeConfig
+	OVMFVarsConfig
+
+	NetDevConfig
+	DiskDriveConfig
+	VirtioNetPciConfig
+	VirtioScsiPciConfig
+	ScsiHdConfig
+	SevConfig
+	MemoryEncryptionConfig
+}
+
+func constructQemuCmd(config Config) []string {
+	args := []string{}
+
+	if config.EnableKVM {
+		args = append(args, "-enable-kvm")
+	}
+
+	if config.NoGraphic {
+		args = append(args, "-nographic")
+	}
+
+	args = append(args, "-monitor", config.Monitor)
+
+	if config.CPU != "" {
+		args = append(args, "-cpu", config.CPU)
+	}
+
+	if config.Machine != "" {
+		args = append(args, "-machine", config.Machine)
+	}
+
+	args = append(args, "-smp", fmt.Sprintf("%d,maxcpus=%d", config.SmpCount, config.MaxCpus))
+
+	args = append(args, "-m", fmt.Sprintf("%s,slots=%d,maxmem=%s",
+		config.MemoryConfig.Size,
+		config.MemoryConfig.Slots,
+		config.MemoryConfig.Max))
+
+	args = append(args, "-drive",
+		fmt.Sprintf("if=%s,format=%s,unit=%d,file=%s,readonly=%s",
+			config.OVMFCodeConfig.If,
+			config.OVMFCodeConfig.Format,
+			config.OVMFCodeConfig.Unit,
+			config.OVMFCodeConfig.File,
+			config.OVMFCodeConfig.ReadOnly))
+
+	args = append(args, "-drive",
+		fmt.Sprintf("if=%s,format=%s,unit=%d,file=%s",
+			config.OVMFVarsConfig.If,
+			config.OVMFVarsConfig.Format,
+			config.OVMFVarsConfig.Unit,
+			config.OVMFVarsConfig.File))
+
+	args = append(args, "-netdev",
+		fmt.Sprintf("user,id=%s,hostfwd=tcp::%s-:%s,hostfwd=tcp::%s-:%s,hostfwd=tcp::%s-:%s",
+			config.NetDevConfig.ID,
+			config.NetDevConfig.HostFwd1, config.NetDevConfig.GuestFwd1,
+			config.NetDevConfig.HostFwd2, config.NetDevConfig.GuestFwd2,
+			config.NetDevConfig.HostFwd3, config.NetDevConfig.GuestFwd3))
+
+	args = append(args, "-device",
+		fmt.Sprintf("%s,disable-legacy=%s,iommu_platform=%v,netdev=%s,romfile=%s",
+			config.VirtioNetPciConfig.Type,
+			config.VirtioNetPciConfig.DisableLegacy,
+			config.VirtioNetPciConfig.IOMMUPlatform,
+			config.VirtioNetPciConfig.NetDev,
+			config.VirtioNetPciConfig.ROMFile))
+
+	args = append(args, "-drive",
+		fmt.Sprintf("file=%s,if=%s,id=%s,format=%s",
+			config.DiskDriveConfig.File,
+			config.DiskDriveConfig.If,
+			config.DiskDriveConfig.ID,
+			config.DiskDriveConfig.Format))
+
+	args = append(args, "-device",
+		fmt.Sprintf("%s,id=%s,disable-legacy=%s,iommu_platform=%t",
+			config.VirtioScsiPciConfig.Type,
+			config.VirtioScsiPciConfig.ID,
+			config.VirtioScsiPciConfig.DisableLegacy,
+			config.VirtioScsiPciConfig.IOMMUPlatform))
+
+	args = append(args, "-device",
+		fmt.Sprintf("scsi-hd,drive=%s", config.ScsiHdConfig.Drive))
+
+	if config.EnableSEV {
+		args = append(args, "-object",
+			fmt.Sprintf("sev-guest,id=%s,cbitpos=%d,reduced-phys-bits=%d",
+				config.SevConfig.ID,
+				config.SevConfig.CBitPos,
+				config.SevConfig.ReducedPhysBits))
+
+		args = append(args, "-machine",
+			fmt.Sprintf("memory-encryption=%s", config.MemoryEncryptionConfig.SEV0))
+	}
+
+	return args
+
+}
diff --git a/manager/qemu/qemu.go b/manager/qemu/qemu.go
new file mode 100644
index 0000000..47a1ebc
--- /dev/null
+++ b/manager/qemu/qemu.go
@@ -0,0 +1,27 @@
+package qemu
+
+import (
+	"fmt"
+	"os/exec"
+	"strings"
+
+	"github.com/mainflux/mainflux/logger"
+	"github.com/ultravioletrs/manager/internal"
+)
+
+// RunQemuVM runs a QEMU virtual machine: constructs the QEMU command line arguments by executing the launch-qemu.sh,
+// extracts the QEMU command and its arguments, and starts the QEMU process
+func RunQemuVM(cfg Config, logger logger.Logger) (*exec.Cmd, error) {
+	prg := "/usr/bin/qemu-system-x86_64"
+	args := constructQemuCmd(cfg)
+
+	cmdLine := fmt.Sprintf("%s %s", prg, strings.Join(args, " "))
+	fmt.Println(cmdLine)
+
+	cmd, err := internal.RunCmdStart(prg, args...)
+	if err != nil {
+		return nil, err
+	}
+
+	return cmd, nil
+}

From 475004cc8404277175601bfca658b902683dd85e Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Sat, 12 Aug 2023 23:44:51 +0200
Subject: [PATCH 15/25] Add use sudo option to qemu command ctor

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 manager/qemu/config.go | 105 +++++++++++++++++++++--------------------
 manager/qemu/qemu.go   |   9 +++-
 2 files changed, 62 insertions(+), 52 deletions(-)

diff --git a/manager/qemu/config.go b/manager/qemu/config.go
index d673654..a4f3ff2 100644
--- a/manager/qemu/config.go
+++ b/manager/qemu/config.go
@@ -24,7 +24,6 @@ type OVMFVarsConfig struct {
 }
 
 type NetDevConfig struct {
-	Type      string `env:"NETDEV_TYPE" envDefault:"user"`
 	ID        string `env:"NETDEV_ID" envDefault:"vmnic"`
 	HostFwd1  string `env:"HOST_FWD_1" envDefault:"2222"`
 	GuestFwd1 string `env:"GUEST_FWD_1" envDefault:"22"`
@@ -35,31 +34,24 @@ type NetDevConfig struct {
 }
 
 type VirtioNetPciConfig struct {
-	Type          string `env:"VIRTIO_NET_PCI_TYPE" envDefault:"virtio-net-pci"`
 	DisableLegacy string `env:"VIRTIO_NET_PCI_DISABLE_LEGACY" envDefault:"on"`
 	IOMMUPlatform bool   `env:"VIRTIO_NET_PCI_IOMMU_PLATFORM" envDefault:"true"`
-	NetDev        string `env:"VIRTIO_NET_PCI_NETDEV" envDefault:"vmnic"`
 	ROMFile       string `env:"VIRTIO_NET_PCI_ROMFILE"`
 }
 
-type DiskDriveConfig struct {
-	File   string `env:"DISK_DRIVE_FILE" envDefault:"cmd/manager/img/focal-server-cloudimg-amd64.qcow2"`
-	If     string `env:"DISK_DRIVE_IF" envDefault:"none"`
-	ID     string `env:"DISK_DRIVE_ID" envDefault:"disk0"`
-	Format string `env:"DISK_DRIVE_FORMAT" envDefault:"qcow2"`
+type DiskImgConfig struct {
+	File   string `env:"DISK_IMG_FILE" envDefault:"cmd/manager/img/focal-server-cloudimg-amd64.qcow2"`
+	If     string `env:"DISK_IMG_IF" envDefault:"none"`
+	ID     string `env:"DISK_IMG_ID" envDefault:"disk0"`
+	Format string `env:"DISK_IMG_FORMAT" envDefault:"qcow2"`
 }
 
 type VirtioScsiPciConfig struct {
-	Type          string `env:"VIRTIO_SCSI_PCI_TYPE" envDefault:"virtio-scsi-pci"`
 	ID            string `env:"VIRTIO_SCSI_PCI_ID" envDefault:"scsi"`
 	DisableLegacy string `env:"VIRTIO_SCSI_PCI_DISABLE_LEGACY" envDefault:"on"`
 	IOMMUPlatform bool   `env:"VIRTIO_SCSI_PCI_IOMMU_PLATFORM" envDefault:"true"`
 }
 
-type ScsiHdConfig struct {
-	Drive string `env:"SCSI_HD_DRIVE" envDefault:"disk0"`
-}
-
 type SevConfig struct {
 	ID              string `env:"SEV_ID" envDefault:"sev0"`
 	CBitPos         int    `env:"SEV_CBITPOS" envDefault:"51"`
@@ -71,52 +63,56 @@ type MemoryEncryptionConfig struct {
 }
 
 type Config struct {
+	UseSudo   bool `env:"USE_SUDO" envDevault:"false"`
+	EnableSEV bool `env:"ENABLE_SEV" envDefault:"true"`
+
+	EnableKVM bool `env:"ENABLE_KVM" envDefault:"true"`
+
+	// machine, CPU, RAM
 	Machine  string `env:"MACHINE" envDefault:"q35"`
 	CPU      string `env:"CPU" envDefault:"EPYC"`
 	SmpCount int    `env:"SMP_COUNT" envDefault:"4"`
 	MaxCpus  int    `env:"SMP_MAXCPUS" envDefault:"64"`
-
-	Monitor   string `env:"MONITOR" envDefault:"pty"`
-	NoGraphic bool   `env:"NO_GRAPHIC" envDefault:"true"`
-
-	EnableKVM bool `env:"ENABLE_KVM" envDefault:"true"`
-	EnableSEV bool `env:"ENABLE_SEV" envDefault:"true"`
-
 	MemoryConfig
 
+	// OVMF
 	OVMFCodeConfig
 	OVMFVarsConfig
 
+	// network
 	NetDevConfig
-	DiskDriveConfig
 	VirtioNetPciConfig
+
+	// disk
 	VirtioScsiPciConfig
-	ScsiHdConfig
+	DiskImgConfig
+
+	// SEV
 	SevConfig
 	MemoryEncryptionConfig
+
+	// display
+	NoGraphic bool   `env:"NO_GRAPHIC" envDefault:"true"`
+	Monitor   string `env:"MONITOR" envDefault:"pty"`
 }
 
 func constructQemuCmd(config Config) []string {
 	args := []string{}
 
+	// virtualization
 	if config.EnableKVM {
 		args = append(args, "-enable-kvm")
 	}
 
-	if config.NoGraphic {
-		args = append(args, "-nographic")
+	// machine, CPU, RAM
+	if config.Machine != "" {
+		args = append(args, "-machine", config.Machine)
 	}
 
-	args = append(args, "-monitor", config.Monitor)
-
 	if config.CPU != "" {
 		args = append(args, "-cpu", config.CPU)
 	}
 
-	if config.Machine != "" {
-		args = append(args, "-machine", config.Machine)
-	}
-
 	args = append(args, "-smp", fmt.Sprintf("%d,maxcpus=%d", config.SmpCount, config.MaxCpus))
 
 	args = append(args, "-m", fmt.Sprintf("%s,slots=%d,maxmem=%s",
@@ -124,6 +120,7 @@ func constructQemuCmd(config Config) []string {
 		config.MemoryConfig.Slots,
 		config.MemoryConfig.Max))
 
+	// OVMF
 	args = append(args, "-drive",
 		fmt.Sprintf("if=%s,format=%s,unit=%d,file=%s,readonly=%s",
 			config.OVMFCodeConfig.If,
@@ -139,6 +136,24 @@ func constructQemuCmd(config Config) []string {
 			config.OVMFVarsConfig.Unit,
 			config.OVMFVarsConfig.File))
 
+	// disk
+	args = append(args, "-device",
+		fmt.Sprintf("virtio-scsi-pci,id=%s,disable-legacy=%s,iommu_platform=%t",
+			config.VirtioScsiPciConfig.ID,
+			config.VirtioScsiPciConfig.DisableLegacy,
+			config.VirtioScsiPciConfig.IOMMUPlatform))
+
+	args = append(args, "-drive",
+		fmt.Sprintf("file=%s,if=%s,id=%s,format=%s",
+			config.DiskImgConfig.File,
+			config.DiskImgConfig.If,
+			config.DiskImgConfig.ID,
+			config.DiskImgConfig.Format))
+
+	args = append(args, "-device",
+		fmt.Sprintf("scsi-hd,drive=%s", config.DiskImgConfig.ID))
+
+	// network
 	args = append(args, "-netdev",
 		fmt.Sprintf("user,id=%s,hostfwd=tcp::%s-:%s,hostfwd=tcp::%s-:%s,hostfwd=tcp::%s-:%s",
 			config.NetDevConfig.ID,
@@ -147,30 +162,13 @@ func constructQemuCmd(config Config) []string {
 			config.NetDevConfig.HostFwd3, config.NetDevConfig.GuestFwd3))
 
 	args = append(args, "-device",
-		fmt.Sprintf("%s,disable-legacy=%s,iommu_platform=%v,netdev=%s,romfile=%s",
-			config.VirtioNetPciConfig.Type,
+		fmt.Sprintf("virtio-net-pci,disable-legacy=%s,iommu_platform=%v,netdev=%s,romfile=%s",
 			config.VirtioNetPciConfig.DisableLegacy,
 			config.VirtioNetPciConfig.IOMMUPlatform,
-			config.VirtioNetPciConfig.NetDev,
+			config.NetDevConfig.ID,
 			config.VirtioNetPciConfig.ROMFile))
 
-	args = append(args, "-drive",
-		fmt.Sprintf("file=%s,if=%s,id=%s,format=%s",
-			config.DiskDriveConfig.File,
-			config.DiskDriveConfig.If,
-			config.DiskDriveConfig.ID,
-			config.DiskDriveConfig.Format))
-
-	args = append(args, "-device",
-		fmt.Sprintf("%s,id=%s,disable-legacy=%s,iommu_platform=%t",
-			config.VirtioScsiPciConfig.Type,
-			config.VirtioScsiPciConfig.ID,
-			config.VirtioScsiPciConfig.DisableLegacy,
-			config.VirtioScsiPciConfig.IOMMUPlatform))
-
-	args = append(args, "-device",
-		fmt.Sprintf("scsi-hd,drive=%s", config.ScsiHdConfig.Drive))
-
+	// SEV
 	if config.EnableSEV {
 		args = append(args, "-object",
 			fmt.Sprintf("sev-guest,id=%s,cbitpos=%d,reduced-phys-bits=%d",
@@ -182,6 +180,13 @@ func constructQemuCmd(config Config) []string {
 			fmt.Sprintf("memory-encryption=%s", config.MemoryEncryptionConfig.SEV0))
 	}
 
+	// display
+	if config.NoGraphic {
+		args = append(args, "-nographic")
+	}
+
+	args = append(args, "-monitor", config.Monitor)
+
 	return args
 
 }
diff --git a/manager/qemu/qemu.go b/manager/qemu/qemu.go
index 47a1ebc..9a0223d 100644
--- a/manager/qemu/qemu.go
+++ b/manager/qemu/qemu.go
@@ -15,11 +15,16 @@ func RunQemuVM(cfg Config, logger logger.Logger) (*exec.Cmd, error) {
 	prg := "/usr/bin/qemu-system-x86_64"
 	args := constructQemuCmd(cfg)
 
-	cmdLine := fmt.Sprintf("%s %s", prg, strings.Join(args, " "))
-	fmt.Println(cmdLine)
+	if cfg.UseSudo {
+		args = append([]string{prg}, args...)
+		prg = "sudo"
+	}
+
+	logger.Info(fmt.Sprintf("%s %s", prg, strings.Join(args, " ")))
 
 	cmd, err := internal.RunCmdStart(prg, args...)
 	if err != nil {
+		logger.Error(fmt.Sprintf("failed to run qemu command: %v", err))
 		return nil, err
 	}
 

From ce6131e5fd34a57d3db0a47888db82d8fa2687a9 Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Sun, 13 Aug 2023 01:44:08 +0200
Subject: [PATCH 16/25] Add programmatic qemu bin abs path config

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 manager/qemu/qemu.go | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/manager/qemu/qemu.go b/manager/qemu/qemu.go
index 9a0223d..bcbf3f4 100644
--- a/manager/qemu/qemu.go
+++ b/manager/qemu/qemu.go
@@ -9,20 +9,25 @@ import (
 	"github.com/ultravioletrs/manager/internal"
 )
 
-// RunQemuVM runs a QEMU virtual machine: constructs the QEMU command line arguments by executing the launch-qemu.sh,
-// extracts the QEMU command and its arguments, and starts the QEMU process
+const qemuRelPath = "qemu-system-x86_64"
+
+// RunQemuVM runs a QEMU virtual machine: constructs the QEMU command line and starts the QEMU process
 func RunQemuVM(cfg Config, logger logger.Logger) (*exec.Cmd, error) {
-	prg := "/usr/bin/qemu-system-x86_64"
+	qemuAbsPath, err := exec.LookPath(qemuRelPath)
+	if err != nil {
+		logger.Error(fmt.Sprintf("qemu-system-x86_64 not found: %v", err))
+		return nil, err
+	}
 	args := constructQemuCmd(cfg)
 
 	if cfg.UseSudo {
-		args = append([]string{prg}, args...)
-		prg = "sudo"
+		args = append([]string{qemuAbsPath}, args...)
+		qemuAbsPath = "sudo"
 	}
 
-	logger.Info(fmt.Sprintf("%s %s", prg, strings.Join(args, " ")))
+	logger.Info(fmt.Sprintf("%s %s", qemuAbsPath, strings.Join(args, " ")))
 
-	cmd, err := internal.RunCmdStart(prg, args...)
+	cmd, err := internal.RunCmdStart(qemuAbsPath, args...)
 	if err != nil {
 		logger.Error(fmt.Sprintf("failed to run qemu command: %v", err))
 		return nil, err

From 88e05aea0b46ea5f767039d18cdd498ec7ae1479 Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Mon, 14 Aug 2023 15:58:25 +0200
Subject: [PATCH 17/25] Refactor README to use focal-server-cloudimg-amd64.img

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 README.md              | 89 +++++++++++++++++++++++++-----------------
 manager/qemu/config.go |  4 +-
 2 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index 5ba31ce..e789f83 100644
--- a/README.md
+++ b/README.md
@@ -2,73 +2,92 @@
 
 ## Setup
 
-### Libvirt
-
 ```sh
-sudo apt update
-sudo apt install qemu-kvm libvirt-daemon-system
+git clone https://github.com/ultravioletrs/manager
+cd manager
 ```
 
-After installing `libvirt-daemon-system`, the user that will be used to manage virtual machines needs to be added to the `libvirt` group. This is done automatically for members of the sudo group, otherwise
+NB: all relative paths in this document are relative to `manager` repository directory.
+
+### QEMU-KVM
+
+[QEMU-KVM](https://www.qemu.org/) is a virtualization platform that allows you to run multiple operating systems on the same physical machine. It is a combination of two technologies: QEMU and KVM.
+
+- QEMU is an emulator that can run a variety of operating systems, including Linux, Windows, and macOS.
+- [KVM](https://wiki.qemu.org/Features/KVM) is a Linux kernel module that allows QEMU to run virtual machines.
+
+To install QEMU-KVM on a Debian based machine, run
 
 ```sh
-sudo adduser $USER libvirt
+sudo apt update
+sudo apt install qemu-kvm
 ```
 
-### CD iso & hard drive img for virtual machine (VM)
+Create `img` directory in `cmd/manager`.
+
+### focal-server-cloudimg-amd64.img
 
-Create `img` directory in `cmd/manager`. Create `iso` directory in `cmd/manager`. Save [alpine-virt-3.18.0-x86_64.iso](https://dl-cdn.alpinelinux.org/alpine/v3.18/releases/x86_64/alpine-virt-3.18.0-x86_64.iso) in `cmd/manager/iso` directory:
+First, we will download *focal-server-cloudimg-amd64*. It is a `qcow2` file with Ubuntu server preinstalled, ready to use with the QEMU virtual machine.
 
 ```sh
-cd cmd/manager/iso
-wget https://dl-cdn.alpinelinux.org/alpine/v3.18/releases/x86_64/alpine-virt-3.18.0-x86_64.iso
+cd cmd/manager/img
+wget https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
+# focal-server-cloudimg-amd64 comes without the root password.
+sudo apt-get install libguestfs-tools
+sudo virt-customize -a focal-server-cloudimg-amd64.img --root-password password:coolpass
 ```
 
-## Run
+### OVMF
 
-We need to run `manager` in the directory where `img`, `iso` and `xml` directories are. `cd` to `cmd/manager` and run
+We need [Open Virtual Machine Firmware](https://wiki.ubuntu.com/UEFI/OVMF). OVMF is a port of Intel's tianocore firmware - an open source implementation of the Unified Extensible Firmware Interface (UEFI) - to the qemu virtual machine. We need OVMF in order to run virtual machine with *focal-server-cloudimg-amd64*. When we install QEMU, we get two files that we need to start a VM: `OVMF_VARS.fd` and `OVMF_CODE.fd`. We will make a local copy of `OVMF_VARS.fd` since a VM will modify this file. On the other hand, `OVMF_CODE.fd` is only used as a reference, so we only record its path in an environment variable.
 
 ```sh
-MANAGER_LOG_LEVEL=info MANAGER_AGENT_GRPC_URL=192.168.122.251:7002 go run main.go
-```
+cd cmd/manager/img
 
-This will start an HTTP server on port `9021`, a gRPC server on port `7001` and will establish a connection to [libvirtd](https://libvirt.org/manpages/libvirtd.html).
+sudo find / -name OVMF_CODE.fd
+# => /usr/share/OVMF/OVMF_CODE.fd
+MANAGER_QEMU_OVMF_CODE_FILE=/usr/share/OVMF/OVMF_CODE.fd
 
-## Domain 
+sudo find / -name OVMF_VARS.fd
+# => /usr/share/OVMF/OVMF_VARS.fd
+cp /usr/share/OVMF/OVMF_VARS.fd .
+MANAGER_QEMU_OVMF_VARS_FILE=img/OVMF_VARS.fd
+```
 
-### Domain creation
-To create a `libvirt` domain - basically a QEMU instance or a virtual machine (VM) - run
+## Run
+
+We need to run `manager` in the directory where `img`, `iso` and `xml` directories are. `cd` to `cmd/manager` and run
 
 ```sh
-curl -i -X POST -H "Content-Type: application/json" localhost:9021/domain -d '{"pool":"<path/to/pool.xml>", "volume":"<path/to/vol.xml>", "domain":"<path/to/dom.xml>"}'
+cd cmd/manager
+MANAGER_LOG_LEVEL=info MANAGER_AGENT_GRPC_URL=192.168.122.251:7002 MANAGER_QEMU_USE_SUDO=false MANAGER_QEMU_ENABLE_SEV=false go run main.go
 ```
 
-You can also use configuration `.xml` files in `cmd/manager/xml`. You can either specify a path to the files on your computer, or you can just leave the `pool`, `volume` and `domain` fields of the request body empty, like this
+To enable [AMD SEV](https://www.amd.com/en/developer/sev.html) support, start manager like this 
 
 ```sh
-curl -i -X POST -H "Content-Type: application/json" localhost:9021/domain -d '{"pool":"", "volume":"", "domain":""}'
+cd cmd/manager
+MANAGER_LOG_LEVEL=info MANAGER_AGENT_GRPC_URL=192.168.122.251:7002 MANAGER_QEMU_USE_SUDO=true MANAGER_QEMU_ENABLE_SEV=true MANAGER_QEMU_SEV_CBITPOS=51 go run main.go
 ```
 
-### Domain destruction
+Manager will start an HTTP server on port `9021`, and a gRPC server on port `7001`.
 
-Normally, you don't need to do anything manually. However, if need be, if you have already created a domain, you can remove it with
+To check whether the manager launched the VM successfully, run
 
 ```sh
-virsh undefine QEmu-alpine-standard-x86_64; \
-virsh shutdown QEmu-alpine-standard-x86_64; \
-virsh destroy QEmu-alpine-standard-x86_64; \
-rm -rf ~/go/src/github.com/ultravioletrs/manager/cmd/manager/img/boot.img; \
-virsh pool-destroy --pool virtimages
+ps aux | grep qemu-system-x86_64
 ```
 
-This will destroy the domain together with volumes and a pool where the volume was logically stored. It is not necessary to remove a domain, since the manager will reuse the existing VM.
+You should get something similar to this
+```
+darko     324763 95.3  6.0 6398136 981044 ?      Sl   16:17   0:15 /usr/bin/qemu-system-x86_64 -enable-kvm -machine q35 -cpu EPYC -smp 4,maxcpus=64 -m 4096M,slots=5,maxmem=30G -drive if=pflash,format=raw,unit=0,file=/usr/share/OVMF/OVMF_CODE.fd,readonly=on -drive if=pflash,format=raw,unit=1,file=img/OVMF_VARS.fd -device virtio-scsi-pci,id=scsi,disable-legacy=on,iommu_platform=true -drive file=img/focal-server-cloudimg-amd64.img,if=none,id=disk0,format=qcow2 -device scsi-hd,drive=disk0 -netdev user,id=vmnic,hostfwd=tcp::2222-:22,hostfwd=tcp::9301-:9031,hostfwd=tcp::7020-:7002 -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile= -nographic -monitor pty
+```
 
-### Domain management
+If you run a command as `sudo`, you should get the output similar to this one
 
-```sh
-sudo apt-get install virt-manager
+```
+root       37982  0.0  0.0   9444  4572 pts/0    S+   16:18   0:00 sudo /usr/local/bin/qemu-system-x86_64 -enable-kvm -machine q35 -cpu EPYC -smp 4,maxcpus=64 -m 4096M,slots=5,maxmem=30G -drive if=pflash,format=raw,unit=0,file=/usr/share/OVMF/OVMF_CODE.fd,readonly=on -drive if=pflash,format=raw,unit=1,file=img/OVMF_VARS.fd -device virtio-scsi-pci,id=scsi,disable-legacy=on,iommu_platform=true -drive file=img/focal-server-cloudimg-amd64.img,if=none,id=disk0,format=qcow2 -device scsi-hd,drive=disk0 -netdev user,id=vmnic,hostfwd=tcp::2222-:22,hostfwd=tcp::9301-:9031,hostfwd=tcp::7020-:7002 -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile= -object sev-guest,id=sev0,cbitpos=51,reduced-phys-bits=1 -machine memory-encryption=sev0 -nographic -monitor pty
+root       37989  122 13.1 5345816 4252312 pts/0 Sl+  16:19   0:04 /usr/local/bin/qemu-system-x86_64 -enable-kvm -machine q35 -cpu EPYC -smp 4,maxcpus=64 -m 4096M,slots=5,maxmem=30G -drive if=pflash,format=raw,unit=0,file=/usr/share/OVMF/OVMF_CODE.fd,readonly=on -drive if=pflash,format=raw,unit=1,file=img/OVMF_VARS.fd -device virtio-scsi-pci,id=scsi,disable-legacy=on,iommu_platform=true -drive file=img/focal-server-cloudimg-amd64.img,if=none,id=disk0,format=qcow2 -device scsi-hd,drive=disk0 -netdev user,id=vmnic,hostfwd=tcp::2222-:22,hostfwd=tcp::9301-:9031,hostfwd=tcp::7020-:7002 -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile= -object sev-guest,id=sev0,cbitpos=51,reduced-phys-bits=1 -machine memory-encryption=sev0 -nographic -monitor pty
 ```
 
-Start virtual manager. Open `QEmu-alpine-standard-x86_64` virtual machine. Log in as root, no password needed, and follow instructions to install and set up Alpine Linux on virtual drive. Basically, you need to run `setup-alpine` script. Use `vda` as a virtual disk drive and `sys` to install Alpine Linux on the virtual disk drive.
-
-Once you have installed and set up Alpine Linux, follow the instructions in `Agent` [README.md](https://github.com/ultravioletrs/agent) in order to see how to set up `Cocos.ai` `Agent` in the virtual machine.
\ No newline at end of file
+The two processes are due to the fact that we run the command `/usr/bin/qemu-system-x86_64` as `sudo`, so there is one process for `sudo` command and the other for `/usr/bin/qemu-system-x86_64`.
\ No newline at end of file
diff --git a/manager/qemu/config.go b/manager/qemu/config.go
index a4f3ff2..1efb6e5 100644
--- a/manager/qemu/config.go
+++ b/manager/qemu/config.go
@@ -20,7 +20,7 @@ type OVMFVarsConfig struct {
 	If     string `env:"OVMF_VARS_IF" envDefault:"pflash"`
 	Format string `env:"OVMF_VARS_FORMAT" envDefault:"raw"`
 	Unit   int    `env:"OVMF_VARS_UNIT" envDefault:"1"`
-	File   string `env:"OVMF_VARS_FILE" envDefault:"cmd/manager/img/OVMF_VARS.fd"`
+	File   string `env:"OVMF_VARS_FILE" envDefault:"img/OVMF_VARS.fd"`
 }
 
 type NetDevConfig struct {
@@ -40,7 +40,7 @@ type VirtioNetPciConfig struct {
 }
 
 type DiskImgConfig struct {
-	File   string `env:"DISK_IMG_FILE" envDefault:"cmd/manager/img/focal-server-cloudimg-amd64.qcow2"`
+	File   string `env:"DISK_IMG_FILE" envDefault:"img/focal-server-cloudimg-amd64.img"`
 	If     string `env:"DISK_IMG_IF" envDefault:"none"`
 	ID     string `env:"DISK_IMG_ID" envDefault:"disk0"`
 	Format string `env:"DISK_IMG_FORMAT" envDefault:"qcow2"`

From 08f26af910d27b8dad6e056e40956bb73e1f2bcf Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Mon, 14 Aug 2023 20:39:50 +0200
Subject: [PATCH 18/25] Add VM launch troubleshooting instructions

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 README.md | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e789f83..a7cd0ff 100644
--- a/README.md
+++ b/README.md
@@ -90,4 +90,28 @@ root       37982  0.0  0.0   9444  4572 pts/0    S+   16:18   0:00 sudo /usr/loc
 root       37989  122 13.1 5345816 4252312 pts/0 Sl+  16:19   0:04 /usr/local/bin/qemu-system-x86_64 -enable-kvm -machine q35 -cpu EPYC -smp 4,maxcpus=64 -m 4096M,slots=5,maxmem=30G -drive if=pflash,format=raw,unit=0,file=/usr/share/OVMF/OVMF_CODE.fd,readonly=on -drive if=pflash,format=raw,unit=1,file=img/OVMF_VARS.fd -device virtio-scsi-pci,id=scsi,disable-legacy=on,iommu_platform=true -drive file=img/focal-server-cloudimg-amd64.img,if=none,id=disk0,format=qcow2 -device scsi-hd,drive=disk0 -netdev user,id=vmnic,hostfwd=tcp::2222-:22,hostfwd=tcp::9301-:9031,hostfwd=tcp::7020-:7002 -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile= -object sev-guest,id=sev0,cbitpos=51,reduced-phys-bits=1 -machine memory-encryption=sev0 -nographic -monitor pty
 ```
 
-The two processes are due to the fact that we run the command `/usr/bin/qemu-system-x86_64` as `sudo`, so there is one process for `sudo` command and the other for `/usr/bin/qemu-system-x86_64`.
\ No newline at end of file
+The two processes are due to the fact that we run the command `/usr/bin/qemu-system-x86_64` as `sudo`, so there is one process for `sudo` command and the other for `/usr/bin/qemu-system-x86_64`.
+
+### Troubleshooting
+
+If the `ps aux | grep qemu-system-x86_64` give you something like this
+
+```
+darko      13913  0.0  0.0      0     0 pts/2    Z+   20:17   0:00 [qemu-system-x86] <defunct>
+```
+
+means that the a QEMU virtual machine that is currently defunct, meaning that it is no longer running. More precisely, the defunct process in the output is also known as a ["zombie" process](https://en.wikipedia.org/wiki/Zombie_process).
+
+You can troubleshoot the VM launch procedure by running directly `qemu-system-x86_64` command. When you run `manager` with `MANAGER_LOG_LEVEL=info` env var set, it prints out the entire command used to launch a VM. The relevant part of the log might look like this
+
+```
+{"level":"info","message":"/usr/bin/qemu-system-x86_64 -enable-kvm -machine q35 -cpu EPYC -smp 4,maxcpus=64 -m 4096M,slots=5,maxmem=30G -drive if=pflash,format=raw,unit=0,file=/usr/share/OVMF/OVMF_CODE.fd,readonly=on -drive if=pflash,format=raw,unit=1,file=img/OVMF_VARS.fd -device virtio-scsi-pci,id=scsi,disable-legacy=on,iommu_platform=true -drive file=img/focal-server-cloudimg-amd64.img,if=none,id=disk0,format=qcow2 -device scsi-hd,drive=disk0 -netdev user,id=vmnic,hostfwd=tcp::2222-:22,hostfwd=tcp::9301-:9031,hostfwd=tcp::7020-:7002 -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile= -nographic -monitor pty","ts":"2023-08-14T18:29:19.2653908Z"}
+```
+
+You can run the command - the value of the `"message"` key - directly in the terminal:
+
+```sh
+/usr/bin/qemu-system-x86_64 -enable-kvm -machine q35 -cpu EPYC -smp 4,maxcpus=64 -m 4096M,slots=5,maxmem=30G -drive if=pflash,format=raw,unit=0,file=/usr/share/OVMF/OVMF_CODE.fd,readonly=on -drive if=pflash,format=raw,unit=1,file=img/OVMF_VARS.fd -device virtio-scsi-pci,id=scsi,disable-legacy=on,iommu_platform=true -drive file=img/focal-server-cloudimg-amd64.img,if=none,id=disk0,format=qcow2 -device scsi-hd,drive=disk0 -netdev user,id=vmnic,hostfwd=tcp::2222-:22,hostfwd=tcp::9301-:9031,hostfwd=tcp::7020-:7002 -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile= -nographic -monitor pty
+```
+
+and look for the possible problems. This problems can usually be solved by using the adequate env var assignments. Look in the `manager/qemu/config.go` file to see the recognized env vars. Don't forget to prepend `MANAGER_QEMU_` to the name of the env vars.
\ No newline at end of file

From 5558a4f72b64145094b5bf1b525862c164110a3c Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Mon, 14 Aug 2023 22:32:36 +0200
Subject: [PATCH 19/25] Add ExecutableAndArgs generator func to qemu and
 qemuCmd struct to service

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 cmd/manager/main.go    | 19 +++++++++++++------
 manager/qemu/config.go |  2 +-
 manager/qemu/qemu.go   | 29 +++++++++++++++--------------
 manager/service.go     |  9 ++++++++-
 4 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index 8f27d65..dee333a 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -13,6 +13,7 @@ import (
 	"log"
 	"net"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/digitalocean/go-libvirt"
@@ -106,13 +107,19 @@ func main() {
 	logger.Info("Successfully connected to agent grpc server " + agentGRPCClient.Secure())
 
 	// QEMU
-	qemuConfig := qemu.Config{}
-	if err := env.Parse(&qemuConfig, env.Options{Prefix: envPrefixQemu}); err != nil {
+	qemuCfg := qemu.Config{}
+	if err := env.Parse(&qemuCfg, env.Options{Prefix: envPrefixQemu}); err != nil {
 		logger.Fatal(fmt.Sprintf("failed to load %s QEMU configuration : %s", svcName, err))
 	}
 
+	exe, args, err := qemu.ExecutableAndArgs(qemuCfg)
+	if err != nil {
+		logger.Fatal(fmt.Sprintf("failed to generate executable and arguments: %v", err))
+	}
+	logger.Info(fmt.Sprintf("%s %s", exe, strings.Join(args, " ")))
+
 	// Run the QEMU virtual machine
-	_, err = qemu.RunQemuVM(qemuConfig, logger)
+	_, err = qemu.RunQemuVM(exe, args, logger)
 	if err != nil {
 		log.Fatalf("Failed to run QEMU VM: %s", err)
 	}
@@ -125,7 +132,7 @@ func main() {
 	// }
 
 	//SVC
-	svc := newService(libvirtConn, agentClient, logger, tracer)
+	svc := newService(libvirtConn, agentClient, logger, tracer, exe, args)
 
 	var httpServerConfig = server.Config{Port: defSvcHTTPPort}
 	if err := env.Parse(&httpServerConfig, env.Options{Prefix: envPrefixHTTP}); err != nil {
@@ -160,8 +167,8 @@ func main() {
 	}
 }
 
-func newService(libvirtConn *libvirt.Libvirt, agent agent.AgentServiceClient, logger logger.Logger, tracer trace.Tracer) manager.Service {
-	svc := manager.New(libvirtConn, agent)
+func newService(libvirtConn *libvirt.Libvirt, agent agent.AgentServiceClient, logger logger.Logger, tracer trace.Tracer, exe string, args []string) manager.Service {
+	svc := manager.New(libvirtConn, agent, exe, args)
 
 	svc = api.LoggingMiddleware(svc, logger)
 	counter, latency := internal.MakeMetrics(svcName, "api")
diff --git a/manager/qemu/config.go b/manager/qemu/config.go
index 1efb6e5..66e36eb 100644
--- a/manager/qemu/config.go
+++ b/manager/qemu/config.go
@@ -96,7 +96,7 @@ type Config struct {
 	Monitor   string `env:"MONITOR" envDefault:"pty"`
 }
 
-func constructQemuCmd(config Config) []string {
+func constructQemuArgs(config Config) []string {
 	args := []string{}
 
 	// virtualization
diff --git a/manager/qemu/qemu.go b/manager/qemu/qemu.go
index bcbf3f4..64f5225 100644
--- a/manager/qemu/qemu.go
+++ b/manager/qemu/qemu.go
@@ -3,7 +3,6 @@ package qemu
 import (
 	"fmt"
 	"os/exec"
-	"strings"
 
 	"github.com/mainflux/mainflux/logger"
 	"github.com/ultravioletrs/manager/internal"
@@ -12,26 +11,28 @@ import (
 const qemuRelPath = "qemu-system-x86_64"
 
 // RunQemuVM runs a QEMU virtual machine: constructs the QEMU command line and starts the QEMU process
-func RunQemuVM(cfg Config, logger logger.Logger) (*exec.Cmd, error) {
-	qemuAbsPath, err := exec.LookPath(qemuRelPath)
+func RunQemuVM(exe string, args []string, logger logger.Logger) (*exec.Cmd, error) {
+	cmd, err := internal.RunCmdStart(exe, args...)
 	if err != nil {
-		logger.Error(fmt.Sprintf("qemu-system-x86_64 not found: %v", err))
+		logger.Error(fmt.Sprintf("failed to run qemu command: %v", err))
 		return nil, err
 	}
-	args := constructQemuCmd(cfg)
 
-	if cfg.UseSudo {
-		args = append([]string{qemuAbsPath}, args...)
-		qemuAbsPath = "sudo"
+	return cmd, nil
+}
+
+func ExecutableAndArgs(cfg Config) (string, []string, error) {
+	exe, err := exec.LookPath(qemuRelPath)
+	if err != nil {
+		return "", nil, err
 	}
 
-	logger.Info(fmt.Sprintf("%s %s", qemuAbsPath, strings.Join(args, " ")))
+	args := constructQemuArgs(cfg)
 
-	cmd, err := internal.RunCmdStart(qemuAbsPath, args...)
-	if err != nil {
-		logger.Error(fmt.Sprintf("failed to run qemu command: %v", err))
-		return nil, err
+	if cfg.UseSudo {
+		args = append([]string{exe}, args...)
+		exe = "sudo"
 	}
 
-	return cmd, nil
+	return exe, args, nil
 }
diff --git a/manager/service.go b/manager/service.go
index 1d04ffe..955cf5a 100644
--- a/manager/service.go
+++ b/manager/service.go
@@ -33,18 +33,25 @@ type Service interface {
 	Run(ctx context.Context, computation []byte) (string, error)
 }
 
+type qemuCmd struct {
+	exe  string   // The path to the QEMU executable
+	args []string // List of arguments for the QEMU command
+}
+
 type managerService struct {
 	libvirt *libvirt.Libvirt
 	agent   agent.AgentServiceClient
+	qemuCmd qemuCmd
 }
 
 var _ Service = (*managerService)(nil)
 
 // New instantiates the manager service implementation.
-func New(libvirtConn *libvirt.Libvirt, agent agent.AgentServiceClient) Service {
+func New(libvirtConn *libvirt.Libvirt, agent agent.AgentServiceClient, exe string, args []string) Service {
 	return &managerService{
 		libvirt: libvirtConn,
 		agent:   agent,
+		qemuCmd: qemuCmd{exe: exe, args: args},
 	}
 }
 

From 4137ad35137bd3d8019dde6e87d669ef4d904107 Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Tue, 15 Aug 2023 11:53:55 +0200
Subject: [PATCH 20/25] Amend VM launch troubleshooting instructions with port
 forwaring settings

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 README.md | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a7cd0ff..ce9a973 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ MANAGER_QEMU_OVMF_VARS_FILE=img/OVMF_VARS.fd
 
 ## Run
 
-We need to run `manager` in the directory where `img`, `iso` and `xml` directories are. `cd` to `cmd/manager` and run
+We need to run `manager` in the directory containing `img` directory:
 
 ```sh
 cd cmd/manager
@@ -114,4 +114,23 @@ You can run the command - the value of the `"message"` key - directly in the ter
 /usr/bin/qemu-system-x86_64 -enable-kvm -machine q35 -cpu EPYC -smp 4,maxcpus=64 -m 4096M,slots=5,maxmem=30G -drive if=pflash,format=raw,unit=0,file=/usr/share/OVMF/OVMF_CODE.fd,readonly=on -drive if=pflash,format=raw,unit=1,file=img/OVMF_VARS.fd -device virtio-scsi-pci,id=scsi,disable-legacy=on,iommu_platform=true -drive file=img/focal-server-cloudimg-amd64.img,if=none,id=disk0,format=qcow2 -device scsi-hd,drive=disk0 -netdev user,id=vmnic,hostfwd=tcp::2222-:22,hostfwd=tcp::9301-:9031,hostfwd=tcp::7020-:7002 -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile= -nographic -monitor pty
 ```
 
-and look for the possible problems. This problems can usually be solved by using the adequate env var assignments. Look in the `manager/qemu/config.go` file to see the recognized env vars. Don't forget to prepend `MANAGER_QEMU_` to the name of the env vars.
\ No newline at end of file
+and look for the possible problems. This problems can usually be solved by using the adequate env var assignments. Look in the `manager/qemu/config.go` file to see the recognized env vars. Don't forget to prepend `MANAGER_QEMU_` to the name of the env vars.
+
+#### Ports in use
+
+The [NetDevConfig struct](manager/qemu/config.go) defines the network configuration for a virtual machine. The HostFwd* and GuestFwd* fields specify the host and guest ports that are forwarded between the virtual machine and the host machine. By default, these ports are allocated 2222, 9301, and 7020 for HostFwd1, HostFwd2, and HostFwd3, respectively, and 22, 9031, and 7002 for GuestFwd1, GuestFwd2, and GuestFwd3, respectively. However, if these ports are in use, you can configure your own ports by setting the corresponding environment variables. For example, to set the HostFwd1 port to 8080, you would set the MANAGER_QEMU_HOST_FWD_1 environment variable to 8080. For example,
+
+```sh
+export MANAGER_LOG_LEVEL=info
+export MANAGER_AGENT_GRPC_URL=192.168.122.251:7002
+export MANAGER_QEMU_USE_SUDO=false
+export MANAGER_QEMU_ENABLE_SEV=false
+export MANAGER_QEMU_HOST_FWD_1=8080
+export MANAGER_QEMU_GUEST_FWD_1=22
+export MANAGER_QEMU_HOST_FWD_2=9301
+export MANAGER_QEMU_GUEST_FWD_2=9031
+export MANAGER_QEMU_HOST_FWD_3=7020
+export MANAGER_QEMU_GUEST_FWD_3=7002
+
+go run main.go
+```
\ No newline at end of file

From 6b4a7080e7efc2af5481252a07e8d74d621ada59 Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Tue, 15 Aug 2023 12:12:52 +0200
Subject: [PATCH 21/25] Add CreateQemuVM endoint

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 README.md                     | 113 +++++++++++++++++++++++++++-------
 cmd/manager/main.go           |  33 +---------
 manager/api/grpc/endpoint.go  |   2 +-
 manager/api/http/endpoint.go  |  34 ++++++++--
 manager/api/http/requests.go  |  22 +++++--
 manager/api/http/responses.go |  27 ++++++--
 manager/api/http/transport.go |  29 +++++++--
 manager/api/logging.go        |  18 +++++-
 manager/api/metrics.go        |  14 ++++-
 manager/qemu/config.go        |  84 ++++++++++++-------------
 manager/qemu/qemu.go          |   5 +-
 manager/service.go            |  27 ++++----
 manager/tracing/tracing.go    |  12 +++-
 13 files changed, 285 insertions(+), 135 deletions(-)

diff --git a/README.md b/README.md
index ce9a973..d238533 100644
--- a/README.md
+++ b/README.md
@@ -46,33 +46,94 @@ cd cmd/manager/img
 
 sudo find / -name OVMF_CODE.fd
 # => /usr/share/OVMF/OVMF_CODE.fd
-MANAGER_QEMU_OVMF_CODE_FILE=/usr/share/OVMF/OVMF_CODE.fd
+# note this value
 
 sudo find / -name OVMF_VARS.fd
 # => /usr/share/OVMF/OVMF_VARS.fd
 cp /usr/share/OVMF/OVMF_VARS.fd .
-MANAGER_QEMU_OVMF_VARS_FILE=img/OVMF_VARS.fd
 ```
 
-## Run
+## Run manager
 
 We need to run `manager` in the directory containing `img` directory:
 
 ```sh
 cd cmd/manager
-MANAGER_LOG_LEVEL=info MANAGER_AGENT_GRPC_URL=192.168.122.251:7002 MANAGER_QEMU_USE_SUDO=false MANAGER_QEMU_ENABLE_SEV=false go run main.go
+MANAGER_LOG_LEVEL=info MANAGER_AGENT_GRPC_URL=192.168.122.251:7002 go run main.go
 ```
+Manager will start an HTTP server on port `9021`, and a gRPC server on port `7001`.
+
+## Create QEMU virtual machine (VM)
 
-To enable [AMD SEV](https://www.amd.com/en/developer/sev.html) support, start manager like this 
+### HTTP
 
 ```sh
 cd cmd/manager
-MANAGER_LOG_LEVEL=info MANAGER_AGENT_GRPC_URL=192.168.122.251:7002 MANAGER_QEMU_USE_SUDO=true MANAGER_QEMU_ENABLE_SEV=true MANAGER_QEMU_SEV_CBITPOS=51 go run main.go
 ```
 
-Manager will start an HTTP server on port `9021`, and a gRPC server on port `7001`.
+```sh
+curl -sSi -X POST -H "Content-Type: application/json" http://localhost:9021/qemu -d @- <<EOF
+{
+  "config": {
+    "use_sudo": false,
+    "enable_sev": false,
+    "enable_kvm": true,
+    "machine": "q35",
+    "cpu": "EPYC",
+    "smp_count": 4,
+    "smp_maxcpus": 64,
+    "memory_size": "4096M",
+    "memory_slots": 5,
+    "max_memory": "30G",
+    "ovmf_code_if": "pflash",
+    "ovmf_code_format": "raw",
+    "ovmf_code_unit": 0,
+    "ovmf_code_file": "/usr/share/OVMF/OVMF_CODE.fd",
+    "ovmf_code_readonly": "on",
+    "ovmf_vars_if": "pflash",
+    "ovmf_vars_format": "raw",
+    "ovmf_vars_unit": 1,
+    "ovmf_vars_file": "img/OVMF_VARS.fd",
+    "netdev_id": "vmnic",
+    "host_fwd_1": "2222",
+    "guest_fwd_1": "22",
+    "host_fwd_2": "9301",
+    "guest_fwd_2": "9031",
+    "host_fwd_3": "7020",
+    "guest_fwd_3": "7002",
+    "virtio_net_pci_disable_legacy": "on",
+    "virtio_net_pci_iommu_platform": true,
+    "virtio_net_pci_romfile": "",
+    "disk_img_file": "img/focal-server-cloudimg-amd64.img",
+    "disk_img_if": "none",
+    "disk_img_id": "disk0",
+    "disk_img_format": "qcow2",
+    "virtio_scsi_pci_id": "scsi",
+    "virtio_scsi_pci_disable_legacy": "on",
+    "virtio_scsi_pci_iommu_platform": true,
+    "sev_id": "sev0",
+    "sev_cbitpos": 51,
+    "sev_reduced_phys_bits": 1,
+    "memory_encryption_sev0": "sev0",
+    "no_graphic": true,
+    "monitor": "pty"
+  }
+}
+EOF
+```
+
+To enable [AMD SEV](https://www.amd.com/en/developer/sev.html) feature you need to use appropriate request body keys:
+
+```sh
+    "use_sudo": true,
+    "enable_sev": true,
+```
+
+### Verifying VM launch
 
-To check whether the manager launched the VM successfully, run
+NB: To verify that the manager successfully launched the VM, you need to open two terminals on the same machine. In one terminal, you need to launch `go run main.go` (with the environment variables of choice) and in the other, you can run the verification commands.
+
+To verify that the manager launched the VM successfully, run the following command:
 
 ```sh
 ps aux | grep qemu-system-x86_64
@@ -92,7 +153,7 @@ root       37989  122 13.1 5345816 4252312 pts/0 Sl+  16:19   0:04 /usr/local/bi
 
 The two processes are due to the fact that we run the command `/usr/bin/qemu-system-x86_64` as `sudo`, so there is one process for `sudo` command and the other for `/usr/bin/qemu-system-x86_64`.
 
-### Troubleshooting
+### Troubleshooting VM launch
 
 If the `ps aux | grep qemu-system-x86_64` give you something like this
 
@@ -114,23 +175,29 @@ You can run the command - the value of the `"message"` key - directly in the ter
 /usr/bin/qemu-system-x86_64 -enable-kvm -machine q35 -cpu EPYC -smp 4,maxcpus=64 -m 4096M,slots=5,maxmem=30G -drive if=pflash,format=raw,unit=0,file=/usr/share/OVMF/OVMF_CODE.fd,readonly=on -drive if=pflash,format=raw,unit=1,file=img/OVMF_VARS.fd -device virtio-scsi-pci,id=scsi,disable-legacy=on,iommu_platform=true -drive file=img/focal-server-cloudimg-amd64.img,if=none,id=disk0,format=qcow2 -device scsi-hd,drive=disk0 -netdev user,id=vmnic,hostfwd=tcp::2222-:22,hostfwd=tcp::9301-:9031,hostfwd=tcp::7020-:7002 -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile= -nographic -monitor pty
 ```
 
-and look for the possible problems. This problems can usually be solved by using the adequate env var assignments. Look in the `manager/qemu/config.go` file to see the recognized env vars. Don't forget to prepend `MANAGER_QEMU_` to the name of the env vars.
+and look for the possible problems. This problems can usually be solved by using the adequate request body keys value assignments. Look in the `manager/qemu/config.go` file to see the recognized json keys.
+
+#### Kill `qemu-system-x86_64` processes
+
+To kill any leftover `qemu-system-x86_64` processes, use
+
+```sh
+pkill -f qemu-system-x86_64
+```
+
+The pkill command is used to kill processes by name or by pattern. The -f flag to specify that we want to kill processes that match the pattern `qemu-system-x86_64`. It sends the SIGKILL signal to all processes that are running `qemu-system-x86_64`.
+
+If this does not work, i.e. if `ps aux | grep qemu-system-x86_64` still outputs `qemu-system-x86_64` related process(es), you can kill the unwanted process with `kill -9 <PID>`, which also sends a SIGKILL signal to the process.
 
 #### Ports in use
 
-The [NetDevConfig struct](manager/qemu/config.go) defines the network configuration for a virtual machine. The HostFwd* and GuestFwd* fields specify the host and guest ports that are forwarded between the virtual machine and the host machine. By default, these ports are allocated 2222, 9301, and 7020 for HostFwd1, HostFwd2, and HostFwd3, respectively, and 22, 9031, and 7002 for GuestFwd1, GuestFwd2, and GuestFwd3, respectively. However, if these ports are in use, you can configure your own ports by setting the corresponding environment variables. For example, to set the HostFwd1 port to 8080, you would set the MANAGER_QEMU_HOST_FWD_1 environment variable to 8080. For example,
+The [NetDevConfig struct](manager/qemu/config.go) defines the network configuration for a virtual machine. The HostFwd* and GuestFwd* fields specify the host and guest ports that are forwarded between the virtual machine and the host machine. By default, these ports are allocated 2222, 9301, and 7020 for HostFwd1, HostFwd2, and HostFwd3, respectively, and 22, 9031, and 7002 for GuestFwd1, GuestFwd2, and GuestFwd3, respectively. However, if these ports are in use, you can configure your own ports by setting the corresponding body request keys. For example,
 
 ```sh
-export MANAGER_LOG_LEVEL=info
-export MANAGER_AGENT_GRPC_URL=192.168.122.251:7002
-export MANAGER_QEMU_USE_SUDO=false
-export MANAGER_QEMU_ENABLE_SEV=false
-export MANAGER_QEMU_HOST_FWD_1=8080
-export MANAGER_QEMU_GUEST_FWD_1=22
-export MANAGER_QEMU_HOST_FWD_2=9301
-export MANAGER_QEMU_GUEST_FWD_2=9031
-export MANAGER_QEMU_HOST_FWD_3=7020
-export MANAGER_QEMU_GUEST_FWD_3=7002
-
-go run main.go
+    "host_fwd_1": "2222",
+    "guest_fwd_1": "22",
+    "host_fwd_2": "9301",
+    "guest_fwd_2": "9031",
+    "host_fwd_3": "7020",
+    "guest_fwd_3": "7002",
 ```
\ No newline at end of file
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index dee333a..6db517f 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -13,7 +13,6 @@ import (
 	"log"
 	"net"
 	"os"
-	"strings"
 	"time"
 
 	"github.com/digitalocean/go-libvirt"
@@ -31,7 +30,6 @@ import (
 	"github.com/ultravioletrs/manager/manager/api"
 	managergrpc "github.com/ultravioletrs/manager/manager/api/grpc"
 	httpapi "github.com/ultravioletrs/manager/manager/api/http"
-	"github.com/ultravioletrs/manager/manager/qemu"
 	"github.com/ultravioletrs/manager/manager/tracing"
 	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/sync/errgroup"
@@ -106,33 +104,8 @@ func main() {
 
 	logger.Info("Successfully connected to agent grpc server " + agentGRPCClient.Secure())
 
-	// QEMU
-	qemuCfg := qemu.Config{}
-	if err := env.Parse(&qemuCfg, env.Options{Prefix: envPrefixQemu}); err != nil {
-		logger.Fatal(fmt.Sprintf("failed to load %s QEMU configuration : %s", svcName, err))
-	}
-
-	exe, args, err := qemu.ExecutableAndArgs(qemuCfg)
-	if err != nil {
-		logger.Fatal(fmt.Sprintf("failed to generate executable and arguments: %v", err))
-	}
-	logger.Info(fmt.Sprintf("%s %s", exe, strings.Join(args, " ")))
-
-	// Run the QEMU virtual machine
-	_, err = qemu.RunQemuVM(exe, args, logger)
-	if err != nil {
-		log.Fatalf("Failed to run QEMU VM: %s", err)
-	}
-
-	// TODO: we can't wait here because it's blocking
-	// // Wait for the QEMU process to finish
-	// err = qemuCmd.Wait()
-	// if err != nil {
-	// 	log.Fatalf("QEMU process error: %s", err)
-	// }
-
 	//SVC
-	svc := newService(libvirtConn, agentClient, logger, tracer, exe, args)
+	svc := newService(libvirtConn, agentClient, logger, tracer)
 
 	var httpServerConfig = server.Config{Port: defSvcHTTPPort}
 	if err := env.Parse(&httpServerConfig, env.Options{Prefix: envPrefixHTTP}); err != nil {
@@ -167,8 +140,8 @@ func main() {
 	}
 }
 
-func newService(libvirtConn *libvirt.Libvirt, agent agent.AgentServiceClient, logger logger.Logger, tracer trace.Tracer, exe string, args []string) manager.Service {
-	svc := manager.New(libvirtConn, agent, exe, args)
+func newService(libvirtConn *libvirt.Libvirt, agent agent.AgentServiceClient, logger logger.Logger, tracer trace.Tracer) manager.Service {
+	svc := manager.New(libvirtConn, agent)
 
 	svc = api.LoggingMiddleware(svc, logger)
 	counter, latency := internal.MakeMetrics(svcName, "api")
diff --git a/manager/api/grpc/endpoint.go b/manager/api/grpc/endpoint.go
index 020857b..fa12bd8 100644
--- a/manager/api/grpc/endpoint.go
+++ b/manager/api/grpc/endpoint.go
@@ -15,7 +15,7 @@ func createDomainEndpoint(svc manager.Service) endpoint.Endpoint {
 			return createDomainRes{}, err
 		}
 
-		name, err := svc.CreateDomain(ctx, req.Pool, req.Volume, req.Domain)
+		name, err := svc.CreateLibvirtDomain(ctx, req.Pool, req.Volume, req.Domain)
 		if err != nil {
 			return createDomainRes{}, err
 		}
diff --git a/manager/api/http/endpoint.go b/manager/api/http/endpoint.go
index 7492d67..7d5d033 100644
--- a/manager/api/http/endpoint.go
+++ b/manager/api/http/endpoint.go
@@ -5,25 +5,27 @@ package http
 
 import (
 	"context"
+	"strings"
 
 	"github.com/go-kit/kit/endpoint"
 	"github.com/ultravioletrs/manager/manager"
+	"github.com/ultravioletrs/manager/manager/qemu"
 )
 
-func createDomainEndpoint(svc manager.Service) endpoint.Endpoint {
+func createLibvirtDomainEndpoint(svc manager.Service) endpoint.Endpoint {
 	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(createDomainReq)
+		req := request.(createLibvirtDomainReq)
 
 		if err := req.validate(); err != nil {
 			return nil, err
 		}
 
-		name, err := svc.CreateDomain(ctx, req.Pool, req.Volume, req.Domain)
+		name, err := svc.CreateLibvirtDomain(ctx, req.Pool, req.Volume, req.Domain)
 		if err != nil {
 			return nil, err
 		}
 
-		res := createDomainRes{
+		res := createLibvirtDomainRes{
 			Name: name,
 		}
 
@@ -31,6 +33,30 @@ func createDomainEndpoint(svc manager.Service) endpoint.Endpoint {
 	}
 }
 
+func createQemuVMEndpoint(svc manager.Service) endpoint.Endpoint {
+	return func(ctx context.Context, request interface{}) (interface{}, error) {
+		req := request.(createQemuVMReq)
+
+		if err := req.validate(); err != nil {
+			return createQemuVMReq{}, err
+		}
+
+		exe, args, err := qemu.ExecutableAndArgs(req.Config)
+		if err != nil {
+			return createQemuVMReq{}, err
+		}
+
+		cmd, err := svc.CreateQemuVM(ctx, exe, args)
+		if err != nil {
+			return createQemuVMRes{}, err
+		}
+
+		return createQemuVMRes{
+			Path: cmd.Path,
+			Args: strings.Join(cmd.Args, " "),
+		}, nil
+	}
+}
 func runEndpoint(svc manager.Service) endpoint.Endpoint {
 	return func(ctx context.Context, request interface{}) (interface{}, error) {
 		req := request.(runReq)
diff --git a/manager/api/http/requests.go b/manager/api/http/requests.go
index adbd615..fe78c55 100644
--- a/manager/api/http/requests.go
+++ b/manager/api/http/requests.go
@@ -3,23 +3,27 @@
 
 package http
 
-import "github.com/ultravioletrs/manager/manager"
+import (
+	"github.com/ultravioletrs/manager/manager"
+	"github.com/ultravioletrs/manager/manager/qemu"
+)
 
 var (
 	_ apiReq = (*runReq)(nil)
-	_ apiReq = (*createDomainReq)(nil)
+	_ apiReq = (*createLibvirtDomainReq)(nil)
 )
 
 type apiReq interface {
 	validate() error
 }
-type createDomainReq struct {
+
+type createLibvirtDomainReq struct {
 	Pool   string `json:"pool"`
 	Volume string `json:"volume"`
 	Domain string `json:"domain"`
 }
 
-func (req createDomainReq) validate() error {
+func (req createLibvirtDomainReq) validate() error {
 	// if req.Pool == "" || req.Volume == "" || req.Domain == "" {
 	// 	return manager.ErrMalformedEntity
 	// }
@@ -37,3 +41,13 @@ func (req runReq) validate() error {
 	}
 	return nil
 }
+
+type createQemuVMReq struct {
+	Config qemu.Config `json:"config"`
+}
+
+func (req createQemuVMReq) validate() error {
+	// You can add validation logic here if needed
+	// For example, you might want to ensure that the config is not empty or contains valid values.
+	return nil
+}
diff --git a/manager/api/http/responses.go b/manager/api/http/responses.go
index d37eace..b4f8427 100644
--- a/manager/api/http/responses.go
+++ b/manager/api/http/responses.go
@@ -10,23 +10,40 @@ import (
 )
 
 var (
-	_ mainflux.Response = (*createDomainRes)(nil)
+	_ mainflux.Response = (*createLibvirtDomainRes)(nil)
 	_ mainflux.Response = (*runRes)(nil)
 )
 
-type createDomainRes struct {
+type createLibvirtDomainRes struct {
 	Name string `json:"name"`
 }
 
-func (res createDomainRes) Code() int {
+func (res createLibvirtDomainRes) Code() int {
 	return http.StatusOK
 }
 
-func (res createDomainRes) Headers() map[string]string {
+func (res createLibvirtDomainRes) Headers() map[string]string {
 	return map[string]string{}
 }
 
-func (res createDomainRes) Empty() bool {
+func (res createLibvirtDomainRes) Empty() bool {
+	return false
+}
+
+type createQemuVMRes struct {
+	Path string `json:"path"`
+	Args string `json:"args"`
+}
+
+func (res createQemuVMRes) Code() int {
+	return http.StatusOK
+}
+
+func (res createQemuVMRes) Headers() map[string]string {
+	return map[string]string{}
+}
+
+func (res createQemuVMRes) Empty() bool {
 	return false
 }
 
diff --git a/manager/api/http/transport.go b/manager/api/http/transport.go
index 1202445..31d1207 100644
--- a/manager/api/http/transport.go
+++ b/manager/api/http/transport.go
@@ -35,12 +35,20 @@ func MakeHandler(svc manager.Service, instanceID string) http.Handler {
 	r := bone.New()
 
 	r.Post("/domain", otelhttp.NewHandler(kithttp.NewServer(
-		createDomainEndpoint(svc),
-		decodeCreateDomain,
+		createLibvirtDomainEndpoint(svc),
+		decodeCreateLibvirtDomain,
 		encodeResponse,
 		opts...,
 	), "create_domain"))
 
+	r.Post("/qemu", otelhttp.NewHandler(kithttp.NewServer(
+		createQemuVMEndpoint(svc),
+		decodeCreateQemuVMRequest,
+		encodeResponse,
+		opts...,
+	),
+		"create_qemu_vm"))
+
 	r.Post("/run", otelhttp.NewHandler(kithttp.NewServer(
 		runEndpoint(svc),
 		decodeRun,
@@ -54,12 +62,25 @@ func MakeHandler(svc manager.Service, instanceID string) http.Handler {
 	return r
 }
 
-func decodeCreateDomain(_ context.Context, r *http.Request) (interface{}, error) {
+func decodeCreateLibvirtDomain(_ context.Context, r *http.Request) (interface{}, error) {
+	if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
+		return nil, errUnsupportedContentType
+	}
+
+	req := createLibvirtDomainReq{}
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		return nil, err
+	}
+
+	return req, nil
+}
+
+func decodeCreateQemuVMRequest(_ context.Context, r *http.Request) (interface{}, error) {
 	if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
 		return nil, errUnsupportedContentType
 	}
 
-	req := createDomainReq{}
+	req := createQemuVMReq{}
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
 		return nil, err
 	}
diff --git a/manager/api/logging.go b/manager/api/logging.go
index bf3fec8..42e88ab 100644
--- a/manager/api/logging.go
+++ b/manager/api/logging.go
@@ -9,6 +9,7 @@ package api
 import (
 	"context"
 	"fmt"
+	"os/exec"
 	"time"
 
 	log "github.com/mainflux/mainflux/logger"
@@ -27,7 +28,7 @@ func LoggingMiddleware(svc manager.Service, logger log.Logger) manager.Service {
 	return &loggingMiddleware{logger, svc}
 }
 
-func (lm *loggingMiddleware) CreateDomain(ctx context.Context, pool, volume, domain string) (response string, err error) {
+func (lm *loggingMiddleware) CreateLibvirtDomain(ctx context.Context, pool, volume, domain string) (response string, err error) {
 	defer func(begin time.Time) {
 		message := fmt.Sprintf("Method CreateDomain for pool %s, volume %s, and domain %s took %s to complete",
 			pool, volume, domain, time.Since(begin))
@@ -38,7 +39,20 @@ func (lm *loggingMiddleware) CreateDomain(ctx context.Context, pool, volume, dom
 		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
 	}(time.Now())
 
-	return lm.svc.CreateDomain(ctx, pool, volume, domain)
+	return lm.svc.CreateLibvirtDomain(ctx, pool, volume, domain)
+}
+
+func (lm *loggingMiddleware) CreateQemuVM(ctx context.Context, exe string, args []string) (cmd *exec.Cmd, err error) {
+	defer func(begin time.Time) {
+		message := fmt.Sprintf("Method CreateQemuVM took %s to complete", time.Since(begin))
+		if err != nil {
+			lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
+			return
+		}
+		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
+	}(time.Now())
+
+	return lm.svc.CreateQemuVM(ctx, exe, args)
 }
 
 func (lm *loggingMiddleware) Run(ctx context.Context, computation []byte) (id string, err error) {
diff --git a/manager/api/metrics.go b/manager/api/metrics.go
index afd8272..aa91ce9 100644
--- a/manager/api/metrics.go
+++ b/manager/api/metrics.go
@@ -8,6 +8,7 @@ package api
 
 import (
 	"context"
+	"os/exec"
 	"time"
 
 	"github.com/go-kit/kit/metrics"
@@ -32,13 +33,22 @@ func MetricsMiddleware(svc manager.Service, counter metrics.Counter, latency met
 	}
 }
 
-func (ms *metricsMiddleware) CreateDomain(ctx context.Context, pool, volume, domain string) (response string, err error) {
+func (ms *metricsMiddleware) CreateLibvirtDomain(ctx context.Context, pool, volume, domain string) (response string, err error) {
 	defer func(begin time.Time) {
 		ms.counter.With("method", "CreateDomain").Add(1)
 		ms.latency.With("method", "CreateDomain").Observe(time.Since(begin).Seconds())
 	}(time.Now())
 
-	return ms.svc.CreateDomain(ctx, pool, volume, domain)
+	return ms.svc.CreateLibvirtDomain(ctx, pool, volume, domain)
+}
+
+func (ms *metricsMiddleware) CreateQemuVM(ctx context.Context, exe string, args []string) (*exec.Cmd, error) {
+	defer func(begin time.Time) {
+		ms.counter.With("method", "CreateQemuVM").Add(1)
+		ms.latency.With("method", "CreateQemuVM").Observe(time.Since(begin).Seconds())
+	}(time.Now())
+
+	return ms.svc.CreateQemuVM(ctx, exe, args)
 }
 
 func (ms *metricsMiddleware) Run(ctx context.Context, computation []byte) (string, error) {
diff --git a/manager/qemu/config.go b/manager/qemu/config.go
index 66e36eb..ea9bc0f 100644
--- a/manager/qemu/config.go
+++ b/manager/qemu/config.go
@@ -3,76 +3,76 @@ package qemu
 import "fmt"
 
 type MemoryConfig struct {
-	Size  string `env:"MEMORY_SIZE" envDefault:"4096M"`
-	Slots int    `env:"MEMORY_SLOTS" envDefault:"5"`
-	Max   string `env:"MAX_MEMORY" envDefault:"30G"`
+	Size  string `json:"memory_size,omitempty" env:"MEMORY_SIZE" envDefault:"4096M"`
+	Slots int    `json:"memory_slots,omitempty" env:"MEMORY_SLOTS" envDefault:"5"`
+	Max   string `json:"max_memory,omitempty" env:"MAX_MEMORY" envDefault:"30G"`
 }
 
 type OVMFCodeConfig struct {
-	If       string `env:"OVMF_CODE_IF" envDefault:"pflash"`
-	Format   string `env:"OVMF_CODE_FORMAT" envDefault:"raw"`
-	Unit     int    `env:"OVMF_CODE_UNIT" envDefault:"0"`
-	File     string `env:"OVMF_CODE_FILE" envDefault:"/usr/share/OVMF/OVMF_CODE.fd"`
-	ReadOnly string `env:"OVMF_CODE_READONLY" envDefault:"on"`
+	If       string `json:"ovmf_code_if,omitempty" env:"OVMF_CODE_IF" envDefault:"pflash"`
+	Format   string `json:"ovmf_code_format,omitempty" env:"OVMF_CODE_FORMAT" envDefault:"raw"`
+	Unit     int    `json:"ovmf_code_unit,omitempty" env:"OVMF_CODE_UNIT" envDefault:"0"`
+	File     string `json:"ovmf_code_file,omitempty" env:"OVMF_CODE_FILE" envDefault:"/usr/share/OVMF/OVMF_CODE.fd"`
+	ReadOnly string `json:"ovmf_code_readonly,omitempty" env:"OVMF_CODE_READONLY" envDefault:"on"`
 }
 
 type OVMFVarsConfig struct {
-	If     string `env:"OVMF_VARS_IF" envDefault:"pflash"`
-	Format string `env:"OVMF_VARS_FORMAT" envDefault:"raw"`
-	Unit   int    `env:"OVMF_VARS_UNIT" envDefault:"1"`
-	File   string `env:"OVMF_VARS_FILE" envDefault:"img/OVMF_VARS.fd"`
+	If     string `json:"ovmf_vars_if,omitempty" env:"OVMF_VARS_IF" envDefault:"pflash"`
+	Format string `json:"ovmf_vars_format,omitempty" env:"OVMF_VARS_FORMAT" envDefault:"raw"`
+	Unit   int    `json:"ovmf_vars_unit,omitempty" env:"OVMF_VARS_UNIT" envDefault:"1"`
+	File   string `json:"ovmf_vars_file,omitempty" env:"OVMF_VARS_FILE" envDefault:"img/OVMF_VARS.fd"`
 }
 
 type NetDevConfig struct {
-	ID        string `env:"NETDEV_ID" envDefault:"vmnic"`
-	HostFwd1  string `env:"HOST_FWD_1" envDefault:"2222"`
-	GuestFwd1 string `env:"GUEST_FWD_1" envDefault:"22"`
-	HostFwd2  string `env:"HOST_FWD_2" envDefault:"9301"`
-	GuestFwd2 string `env:"GUEST_FWD_2" envDefault:"9031"`
-	HostFwd3  string `env:"HOST_FWD_3" envDefault:"7020"`
-	GuestFwd3 string `env:"GUEST_FWD_3" envDefault:"7002"`
+	ID        string `json:"netdev_id,omitempty" env:"NETDEV_ID" envDefault:"vmnic"`
+	HostFwd1  string `json:"host_fwd_1,omitempty" env:"HOST_FWD_1" envDefault:"2222"`
+	GuestFwd1 string `json:"guest_fwd_1,omitempty" env:"GUEST_FWD_1" envDefault:"22"`
+	HostFwd2  string `json:"host_fwd_2,omitempty" env:"HOST_FWD_2" envDefault:"9301"`
+	GuestFwd2 string `json:"guest_fwd_2,omitempty" env:"GUEST_FWD_2" envDefault:"9031"`
+	HostFwd3  string `json:"host_fwd_3,omitempty" env:"HOST_FWD_3" envDefault:"7020"`
+	GuestFwd3 string `json:"guest_fwd_3,omitempty" env:"GUEST_FWD_3" envDefault:"7002"`
 }
 
 type VirtioNetPciConfig struct {
-	DisableLegacy string `env:"VIRTIO_NET_PCI_DISABLE_LEGACY" envDefault:"on"`
-	IOMMUPlatform bool   `env:"VIRTIO_NET_PCI_IOMMU_PLATFORM" envDefault:"true"`
-	ROMFile       string `env:"VIRTIO_NET_PCI_ROMFILE"`
+	DisableLegacy string `json:"virtio_net_pci_disable_legacy,omitempty" env:"VIRTIO_NET_PCI_DISABLE_LEGACY" envDefault:"on"`
+	IOMMUPlatform bool   `json:"virtio_net_pci_iommu_platform,omitempty" env:"VIRTIO_NET_PCI_IOMMU_PLATFORM" envDefault:"true"`
+	ROMFile       string `json:"virtio_net_pci_romfile,omitempty" env:"VIRTIO_NET_PCI_ROMFILE"`
 }
 
 type DiskImgConfig struct {
-	File   string `env:"DISK_IMG_FILE" envDefault:"img/focal-server-cloudimg-amd64.img"`
-	If     string `env:"DISK_IMG_IF" envDefault:"none"`
-	ID     string `env:"DISK_IMG_ID" envDefault:"disk0"`
-	Format string `env:"DISK_IMG_FORMAT" envDefault:"qcow2"`
+	File   string `json:"disk_img_file,omitempty" env:"DISK_IMG_FILE" envDefault:"img/focal-server-cloudimg-amd64.img"`
+	If     string `json:"disk_img_if,omitempty" env:"DISK_IMG_IF" envDefault:"none"`
+	ID     string `json:"disk_img_id,omitempty" env:"DISK_IMG_ID" envDefault:"disk0"`
+	Format string `json:"disk_img_format,omitempty" env:"DISK_IMG_FORMAT" envDefault:"qcow2"`
 }
 
 type VirtioScsiPciConfig struct {
-	ID            string `env:"VIRTIO_SCSI_PCI_ID" envDefault:"scsi"`
-	DisableLegacy string `env:"VIRTIO_SCSI_PCI_DISABLE_LEGACY" envDefault:"on"`
-	IOMMUPlatform bool   `env:"VIRTIO_SCSI_PCI_IOMMU_PLATFORM" envDefault:"true"`
+	ID            string `json:"virtio_scsi_pci_id,omitempty" env:"VIRTIO_SCSI_PCI_ID" envDefault:"scsi"`
+	DisableLegacy string `json:"virtio_scsi_pci_disable_legacy,omitempty" env:"VIRTIO_SCSI_PCI_DISABLE_LEGACY" envDefault:"on"`
+	IOMMUPlatform bool   `json:"virtio_scsi_pci_iommu_platform,omitempty" env:"VIRTIO_SCSI_PCI_IOMMU_PLATFORM" envDefault:"true"`
 }
 
 type SevConfig struct {
-	ID              string `env:"SEV_ID" envDefault:"sev0"`
-	CBitPos         int    `env:"SEV_CBITPOS" envDefault:"51"`
-	ReducedPhysBits int    `env:"SEV_REDUCED_PHYS_BITS" envDefault:"1"`
+	ID              string `json:"sev_id,omitempty" env:"SEV_ID" envDefault:"sev0"`
+	CBitPos         int    `json:"sev_cbitpos,omitempty" env:"SEV_CBITPOS" envDefault:"51"`
+	ReducedPhysBits int    `json:"sev_reduced_phys_bits,omitempty" env:"SEV_REDUCED_PHYS_BITS" envDefault:"1"`
 }
 
 type MemoryEncryptionConfig struct {
-	SEV0 string `env:"MEMORY_ENCRYPTION_SEV0" envDefault:"sev0"`
+	SEV0 string `json:"memory_encryption_sev0,omitempty" env:"MEMORY_ENCRYPTION_SEV0" envDefault:"sev0"`
 }
 
 type Config struct {
-	UseSudo   bool `env:"USE_SUDO" envDevault:"false"`
-	EnableSEV bool `env:"ENABLE_SEV" envDefault:"true"`
+	UseSudo   bool `json:"use_sudo,omitempty" env:"USE_SUDO" envDevault:"false"`
+	EnableSEV bool `json:"enable_sev,omitempty" env:"ENABLE_SEV" envDefault:"true"`
 
-	EnableKVM bool `env:"ENABLE_KVM" envDefault:"true"`
+	EnableKVM bool `json:"enable_kvm,omitempty" env:"ENABLE_KVM" envDefault:"true"`
 
 	// machine, CPU, RAM
-	Machine  string `env:"MACHINE" envDefault:"q35"`
-	CPU      string `env:"CPU" envDefault:"EPYC"`
-	SmpCount int    `env:"SMP_COUNT" envDefault:"4"`
-	MaxCpus  int    `env:"SMP_MAXCPUS" envDefault:"64"`
+	Machine  string `json:"machine,omitempty" env:"MACHINE" envDefault:"q35"`
+	CPU      string `json:"cpu,omitempty" env:"CPU" envDefault:"EPYC"`
+	SmpCount int    `json:"smp_count,omitempty" env:"SMP_COUNT" envDefault:"4"`
+	MaxCpus  int    `json:"smp_maxcpus,omitempty" env:"SMP_MAXCPUS" envDefault:"64"`
 	MemoryConfig
 
 	// OVMF
@@ -92,8 +92,8 @@ type Config struct {
 	MemoryEncryptionConfig
 
 	// display
-	NoGraphic bool   `env:"NO_GRAPHIC" envDefault:"true"`
-	Monitor   string `env:"MONITOR" envDefault:"pty"`
+	NoGraphic bool   `json:"no_graphic,omitempty" env:"NO_GRAPHIC" envDefault:"true"`
+	Monitor   string `json:"monitor,omitempty" env:"MONITOR" envDefault:"pty"`
 }
 
 func constructQemuArgs(config Config) []string {
diff --git a/manager/qemu/qemu.go b/manager/qemu/qemu.go
index 64f5225..cd67fc6 100644
--- a/manager/qemu/qemu.go
+++ b/manager/qemu/qemu.go
@@ -1,20 +1,17 @@
 package qemu
 
 import (
-	"fmt"
 	"os/exec"
 
-	"github.com/mainflux/mainflux/logger"
 	"github.com/ultravioletrs/manager/internal"
 )
 
 const qemuRelPath = "qemu-system-x86_64"
 
 // RunQemuVM runs a QEMU virtual machine: constructs the QEMU command line and starts the QEMU process
-func RunQemuVM(exe string, args []string, logger logger.Logger) (*exec.Cmd, error) {
+func RunQemuVM(exe string, args []string) (*exec.Cmd, error) {
 	cmd, err := internal.RunCmdStart(exe, args...)
 	if err != nil {
-		logger.Error(fmt.Sprintf("failed to run qemu command: %v", err))
 		return nil, err
 	}
 
diff --git a/manager/service.go b/manager/service.go
index 955cf5a..1dcbd4b 100644
--- a/manager/service.go
+++ b/manager/service.go
@@ -7,10 +7,12 @@ import (
 	"context"
 	"errors"
 	"os"
+	"os/exec"
 	"strings"
 
 	"github.com/digitalocean/go-libvirt"
 	"github.com/ultravioletrs/agent/agent"
+	"github.com/ultravioletrs/manager/manager/qemu"
 )
 
 var (
@@ -26,36 +28,29 @@ var (
 	ErrNotFound = errors.New("entity not found")
 )
 
-// Service specifies an API that must be fullfiled by the domain service
+// Service specifies an API that must be fulfilled by the domain service
 // implementation, and all of its decorators (e.g. logging & metrics).
 type Service interface {
-	CreateDomain(ctx context.Context, pool, volume, domain string) (string, error)
+	CreateLibvirtDomain(ctx context.Context, pool, volume, domain string) (string, error)
+	CreateQemuVM(ctx context.Context, exe string, args []string) (*exec.Cmd, error)
 	Run(ctx context.Context, computation []byte) (string, error)
 }
-
-type qemuCmd struct {
-	exe  string   // The path to the QEMU executable
-	args []string // List of arguments for the QEMU command
-}
-
 type managerService struct {
 	libvirt *libvirt.Libvirt
 	agent   agent.AgentServiceClient
-	qemuCmd qemuCmd
 }
 
 var _ Service = (*managerService)(nil)
 
 // New instantiates the manager service implementation.
-func New(libvirtConn *libvirt.Libvirt, agent agent.AgentServiceClient, exe string, args []string) Service {
+func New(libvirtConn *libvirt.Libvirt, agent agent.AgentServiceClient) Service {
 	return &managerService{
 		libvirt: libvirtConn,
 		agent:   agent,
-		qemuCmd: qemuCmd{exe: exe, args: args},
 	}
 }
 
-func (ms *managerService) CreateDomain(ctx context.Context, poolXML, volXML, domXML string) (string, error) {
+func (ms *managerService) CreateLibvirtDomain(ctx context.Context, poolXML, volXML, domXML string) (string, error) {
 	wd, err := os.Getwd()
 	if err != nil {
 		return "", err
@@ -87,6 +82,14 @@ func (ms *managerService) CreateDomain(ctx context.Context, poolXML, volXML, dom
 	return dom.Name, nil
 }
 
+func (ms *managerService) CreateQemuVM(ctx context.Context, exe string, args []string) (*exec.Cmd, error) {
+	cmd, err := qemu.RunQemuVM(exe, args)
+	if err != nil {
+		return cmd, err
+	}
+	return cmd, nil
+}
+
 func (ms *managerService) Run(ctx context.Context, computation []byte) (string, error) {
 	res, err := ms.agent.Run(ctx, &agent.RunRequest{Computation: computation})
 	if err != nil {
diff --git a/manager/tracing/tracing.go b/manager/tracing/tracing.go
index db3b4be..887298b 100644
--- a/manager/tracing/tracing.go
+++ b/manager/tracing/tracing.go
@@ -2,6 +2,7 @@ package tracing
 
 import (
 	"context"
+	"os/exec"
 
 	"github.com/ultravioletrs/manager/manager"
 	"go.opentelemetry.io/otel/attribute"
@@ -20,7 +21,7 @@ func New(svc manager.Service, tracer trace.Tracer) manager.Service {
 	return &tracingMiddleware{tracer, svc}
 }
 
-func (tm *tracingMiddleware) CreateDomain(ctx context.Context, pool, volume, domain string) (string, error) {
+func (tm *tracingMiddleware) CreateLibvirtDomain(ctx context.Context, pool, volume, domain string) (string, error) {
 	ctx, span := tm.tracer.Start(ctx, "create", trace.WithAttributes(
 		attribute.String("name", pool),
 		attribute.String("volume", volume),
@@ -28,7 +29,14 @@ func (tm *tracingMiddleware) CreateDomain(ctx context.Context, pool, volume, dom
 	))
 	defer span.End()
 
-	return tm.svc.CreateDomain(ctx, pool, volume, domain)
+	return tm.svc.CreateLibvirtDomain(ctx, pool, volume, domain)
+}
+
+func (tm *tracingMiddleware) CreateQemuVM(ctx context.Context, exe string, args []string) (*exec.Cmd, error) {
+	ctx, span := tm.tracer.Start(ctx, "createQemuVM")
+	defer span.End()
+
+	return tm.svc.CreateQemuVM(ctx, exe, args)
 }
 
 func (tm *tracingMiddleware) Run(ctx context.Context, computation []byte) (string, error) {

From 1536c6cbf5fe765630bc7cdacfbe675f9b35a210 Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Tue, 15 Aug 2023 15:51:01 +0200
Subject: [PATCH 22/25] Revert to env var VM parametrization

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 README.md                     | 97 ++++++++++-------------------------
 cmd/manager/main.go           | 20 ++++++--
 manager/api/http/endpoint.go  |  8 +--
 manager/api/http/requests.go  |  2 -
 manager/api/http/transport.go | 13 +----
 manager/api/logging.go        |  4 +-
 manager/api/metrics.go        |  4 +-
 manager/qemu/config.go        | 84 +++++++++++++++---------------
 manager/service.go            | 16 ++++--
 manager/tracing/tracing.go    |  4 +-
 10 files changed, 106 insertions(+), 146 deletions(-)

diff --git a/README.md b/README.md
index d238533..2870ff4 100644
--- a/README.md
+++ b/README.md
@@ -46,87 +46,36 @@ cd cmd/manager/img
 
 sudo find / -name OVMF_CODE.fd
 # => /usr/share/OVMF/OVMF_CODE.fd
-# note this value
+MANAGER_QEMU_OVMF_CODE_FILE=/usr/share/OVMF/OVMF_CODE.fd
 
 sudo find / -name OVMF_VARS.fd
 # => /usr/share/OVMF/OVMF_VARS.fd
 cp /usr/share/OVMF/OVMF_VARS.fd .
+MANAGER_QEMU_OVMF_VARS_FILE=img/OVMF_VARS.fd
 ```
 
-## Run manager
+## Run
 
 We need to run `manager` in the directory containing `img` directory:
 
 ```sh
 cd cmd/manager
-MANAGER_LOG_LEVEL=info MANAGER_AGENT_GRPC_URL=192.168.122.251:7002 go run main.go
+MANAGER_LOG_LEVEL=info MANAGER_AGENT_GRPC_URL=192.168.122.251:7002 MANAGER_QEMU_USE_SUDO=false MANAGER_QEMU_ENABLE_SEV=false go run main.go
 ```
-Manager will start an HTTP server on port `9021`, and a gRPC server on port `7001`.
-
-## Create QEMU virtual machine (VM)
 
-### HTTP
+To enable [AMD SEV](https://www.amd.com/en/developer/sev.html) support, start manager like this 
 
 ```sh
 cd cmd/manager
+MANAGER_LOG_LEVEL=info MANAGER_AGENT_GRPC_URL=192.168.122.251:7002 MANAGER_QEMU_USE_SUDO=true MANAGER_QEMU_ENABLE_SEV=true MANAGER_QEMU_SEV_CBITPOS=51 go run main.go
 ```
 
-```sh
-curl -sSi -X POST -H "Content-Type: application/json" http://localhost:9021/qemu -d @- <<EOF
-{
-  "config": {
-    "use_sudo": false,
-    "enable_sev": false,
-    "enable_kvm": true,
-    "machine": "q35",
-    "cpu": "EPYC",
-    "smp_count": 4,
-    "smp_maxcpus": 64,
-    "memory_size": "4096M",
-    "memory_slots": 5,
-    "max_memory": "30G",
-    "ovmf_code_if": "pflash",
-    "ovmf_code_format": "raw",
-    "ovmf_code_unit": 0,
-    "ovmf_code_file": "/usr/share/OVMF/OVMF_CODE.fd",
-    "ovmf_code_readonly": "on",
-    "ovmf_vars_if": "pflash",
-    "ovmf_vars_format": "raw",
-    "ovmf_vars_unit": 1,
-    "ovmf_vars_file": "img/OVMF_VARS.fd",
-    "netdev_id": "vmnic",
-    "host_fwd_1": "2222",
-    "guest_fwd_1": "22",
-    "host_fwd_2": "9301",
-    "guest_fwd_2": "9031",
-    "host_fwd_3": "7020",
-    "guest_fwd_3": "7002",
-    "virtio_net_pci_disable_legacy": "on",
-    "virtio_net_pci_iommu_platform": true,
-    "virtio_net_pci_romfile": "",
-    "disk_img_file": "img/focal-server-cloudimg-amd64.img",
-    "disk_img_if": "none",
-    "disk_img_id": "disk0",
-    "disk_img_format": "qcow2",
-    "virtio_scsi_pci_id": "scsi",
-    "virtio_scsi_pci_disable_legacy": "on",
-    "virtio_scsi_pci_iommu_platform": true,
-    "sev_id": "sev0",
-    "sev_cbitpos": 51,
-    "sev_reduced_phys_bits": 1,
-    "memory_encryption_sev0": "sev0",
-    "no_graphic": true,
-    "monitor": "pty"
-  }
-}
-EOF
-```
-
-To enable [AMD SEV](https://www.amd.com/en/developer/sev.html) feature you need to use appropriate request body keys:
+Manager will start an HTTP server on port `9021`, and a gRPC server on port `7001`.
+
+### Create QEMU virtual machine (VM)
 
 ```sh
-    "use_sudo": true,
-    "enable_sev": true,
+curl -sSi -X GET http://localhost:9021/qemu
 ```
 
 ### Verifying VM launch
@@ -153,7 +102,7 @@ root       37989  122 13.1 5345816 4252312 pts/0 Sl+  16:19   0:04 /usr/local/bi
 
 The two processes are due to the fact that we run the command `/usr/bin/qemu-system-x86_64` as `sudo`, so there is one process for `sudo` command and the other for `/usr/bin/qemu-system-x86_64`.
 
-### Troubleshooting VM launch
+### Troubleshooting
 
 If the `ps aux | grep qemu-system-x86_64` give you something like this
 
@@ -175,7 +124,7 @@ You can run the command - the value of the `"message"` key - directly in the ter
 /usr/bin/qemu-system-x86_64 -enable-kvm -machine q35 -cpu EPYC -smp 4,maxcpus=64 -m 4096M,slots=5,maxmem=30G -drive if=pflash,format=raw,unit=0,file=/usr/share/OVMF/OVMF_CODE.fd,readonly=on -drive if=pflash,format=raw,unit=1,file=img/OVMF_VARS.fd -device virtio-scsi-pci,id=scsi,disable-legacy=on,iommu_platform=true -drive file=img/focal-server-cloudimg-amd64.img,if=none,id=disk0,format=qcow2 -device scsi-hd,drive=disk0 -netdev user,id=vmnic,hostfwd=tcp::2222-:22,hostfwd=tcp::9301-:9031,hostfwd=tcp::7020-:7002 -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile= -nographic -monitor pty
 ```
 
-and look for the possible problems. This problems can usually be solved by using the adequate request body keys value assignments. Look in the `manager/qemu/config.go` file to see the recognized json keys.
+and look for the possible problems. This problems can usually be solved by using the adequate env var assignments. Look in the `manager/qemu/config.go` file to see the recognized env vars. Don't forget to prepend `MANAGER_QEMU_` to the name of the env vars.
 
 #### Kill `qemu-system-x86_64` processes
 
@@ -191,13 +140,19 @@ If this does not work, i.e. if `ps aux | grep qemu-system-x86_64` still outputs
 
 #### Ports in use
 
-The [NetDevConfig struct](manager/qemu/config.go) defines the network configuration for a virtual machine. The HostFwd* and GuestFwd* fields specify the host and guest ports that are forwarded between the virtual machine and the host machine. By default, these ports are allocated 2222, 9301, and 7020 for HostFwd1, HostFwd2, and HostFwd3, respectively, and 22, 9031, and 7002 for GuestFwd1, GuestFwd2, and GuestFwd3, respectively. However, if these ports are in use, you can configure your own ports by setting the corresponding body request keys. For example,
+The [NetDevConfig struct](manager/qemu/config.go) defines the network configuration for a virtual machine. The HostFwd* and GuestFwd* fields specify the host and guest ports that are forwarded between the virtual machine and the host machine. By default, these ports are allocated 2222, 9301, and 7020 for HostFwd1, HostFwd2, and HostFwd3, respectively, and 22, 9031, and 7002 for GuestFwd1, GuestFwd2, and GuestFwd3, respectively. However, if these ports are in use, you can configure your own ports by setting the corresponding environment variables. For example, to set the HostFwd1 port to 8080, you would set the MANAGER_QEMU_HOST_FWD_1 environment variable to 8080. For example,
 
 ```sh
-    "host_fwd_1": "2222",
-    "guest_fwd_1": "22",
-    "host_fwd_2": "9301",
-    "guest_fwd_2": "9031",
-    "host_fwd_3": "7020",
-    "guest_fwd_3": "7002",
-```
\ No newline at end of file
+export MANAGER_LOG_LEVEL=info
+export MANAGER_AGENT_GRPC_URL=192.168.122.251:7002
+export MANAGER_QEMU_USE_SUDO=false
+export MANAGER_QEMU_ENABLE_SEV=false
+export MANAGER_QEMU_HOST_FWD_1=8080
+export MANAGER_QEMU_GUEST_FWD_1=22
+export MANAGER_QEMU_HOST_FWD_2=9301
+export MANAGER_QEMU_GUEST_FWD_2=9031
+export MANAGER_QEMU_HOST_FWD_3=7020
+export MANAGER_QEMU_GUEST_FWD_3=7002
+
+go run main.go
+```
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index 6db517f..cdc829c 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -13,6 +13,7 @@ import (
 	"log"
 	"net"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/digitalocean/go-libvirt"
@@ -30,6 +31,7 @@ import (
 	"github.com/ultravioletrs/manager/manager/api"
 	managergrpc "github.com/ultravioletrs/manager/manager/api/grpc"
 	httpapi "github.com/ultravioletrs/manager/manager/api/http"
+	"github.com/ultravioletrs/manager/manager/qemu"
 	"github.com/ultravioletrs/manager/manager/tracing"
 	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/sync/errgroup"
@@ -104,8 +106,20 @@ func main() {
 
 	logger.Info("Successfully connected to agent grpc server " + agentGRPCClient.Secure())
 
+	// QEMU
+	qemuCfg := qemu.Config{}
+	if err := env.Parse(&qemuCfg, env.Options{Prefix: envPrefixQemu}); err != nil {
+		logger.Fatal(fmt.Sprintf("failed to load %s QEMU configuration : %s", svcName, err))
+	}
+
+	exe, args, err := qemu.ExecutableAndArgs(qemuCfg)
+	if err != nil {
+		logger.Fatal(fmt.Sprintf("failed to generate executable and arguments: %v", err))
+	}
+	logger.Info(fmt.Sprintf("%s %s", exe, strings.Join(args, " ")))
+
 	//SVC
-	svc := newService(libvirtConn, agentClient, logger, tracer)
+	svc := newService(libvirtConn, agentClient, logger, tracer, exe, args)
 
 	var httpServerConfig = server.Config{Port: defSvcHTTPPort}
 	if err := env.Parse(&httpServerConfig, env.Options{Prefix: envPrefixHTTP}); err != nil {
@@ -140,8 +154,8 @@ func main() {
 	}
 }
 
-func newService(libvirtConn *libvirt.Libvirt, agent agent.AgentServiceClient, logger logger.Logger, tracer trace.Tracer) manager.Service {
-	svc := manager.New(libvirtConn, agent)
+func newService(libvirtConn *libvirt.Libvirt, agent agent.AgentServiceClient, logger logger.Logger, tracer trace.Tracer, exe string, args []string) manager.Service {
+	svc := manager.New(libvirtConn, agent, exe, args)
 
 	svc = api.LoggingMiddleware(svc, logger)
 	counter, latency := internal.MakeMetrics(svcName, "api")
diff --git a/manager/api/http/endpoint.go b/manager/api/http/endpoint.go
index 7d5d033..e56cd92 100644
--- a/manager/api/http/endpoint.go
+++ b/manager/api/http/endpoint.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/go-kit/kit/endpoint"
 	"github.com/ultravioletrs/manager/manager"
-	"github.com/ultravioletrs/manager/manager/qemu"
 )
 
 func createLibvirtDomainEndpoint(svc manager.Service) endpoint.Endpoint {
@@ -41,12 +40,7 @@ func createQemuVMEndpoint(svc manager.Service) endpoint.Endpoint {
 			return createQemuVMReq{}, err
 		}
 
-		exe, args, err := qemu.ExecutableAndArgs(req.Config)
-		if err != nil {
-			return createQemuVMReq{}, err
-		}
-
-		cmd, err := svc.CreateQemuVM(ctx, exe, args)
+		cmd, err := svc.CreateQemuVM(ctx)
 		if err != nil {
 			return createQemuVMRes{}, err
 		}
diff --git a/manager/api/http/requests.go b/manager/api/http/requests.go
index fe78c55..9216665 100644
--- a/manager/api/http/requests.go
+++ b/manager/api/http/requests.go
@@ -5,7 +5,6 @@ package http
 
 import (
 	"github.com/ultravioletrs/manager/manager"
-	"github.com/ultravioletrs/manager/manager/qemu"
 )
 
 var (
@@ -43,7 +42,6 @@ func (req runReq) validate() error {
 }
 
 type createQemuVMReq struct {
-	Config qemu.Config `json:"config"`
 }
 
 func (req createQemuVMReq) validate() error {
diff --git a/manager/api/http/transport.go b/manager/api/http/transport.go
index 31d1207..2d1b662 100644
--- a/manager/api/http/transport.go
+++ b/manager/api/http/transport.go
@@ -41,7 +41,7 @@ func MakeHandler(svc manager.Service, instanceID string) http.Handler {
 		opts...,
 	), "create_domain"))
 
-	r.Post("/qemu", otelhttp.NewHandler(kithttp.NewServer(
+	r.Get("/qemu", otelhttp.NewHandler(kithttp.NewServer(
 		createQemuVMEndpoint(svc),
 		decodeCreateQemuVMRequest,
 		encodeResponse,
@@ -76,16 +76,7 @@ func decodeCreateLibvirtDomain(_ context.Context, r *http.Request) (interface{},
 }
 
 func decodeCreateQemuVMRequest(_ context.Context, r *http.Request) (interface{}, error) {
-	if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
-		return nil, errUnsupportedContentType
-	}
-
-	req := createQemuVMReq{}
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		return nil, err
-	}
-
-	return req, nil
+	return createQemuVMReq{}, nil
 }
 
 func decodeRun(_ context.Context, r *http.Request) (interface{}, error) {
diff --git a/manager/api/logging.go b/manager/api/logging.go
index 42e88ab..c957e8b 100644
--- a/manager/api/logging.go
+++ b/manager/api/logging.go
@@ -42,7 +42,7 @@ func (lm *loggingMiddleware) CreateLibvirtDomain(ctx context.Context, pool, volu
 	return lm.svc.CreateLibvirtDomain(ctx, pool, volume, domain)
 }
 
-func (lm *loggingMiddleware) CreateQemuVM(ctx context.Context, exe string, args []string) (cmd *exec.Cmd, err error) {
+func (lm *loggingMiddleware) CreateQemuVM(ctx context.Context) (cmd *exec.Cmd, err error) {
 	defer func(begin time.Time) {
 		message := fmt.Sprintf("Method CreateQemuVM took %s to complete", time.Since(begin))
 		if err != nil {
@@ -52,7 +52,7 @@ func (lm *loggingMiddleware) CreateQemuVM(ctx context.Context, exe string, args
 		lm.logger.Info(fmt.Sprintf("%s without errors.", message))
 	}(time.Now())
 
-	return lm.svc.CreateQemuVM(ctx, exe, args)
+	return lm.svc.CreateQemuVM(ctx)
 }
 
 func (lm *loggingMiddleware) Run(ctx context.Context, computation []byte) (id string, err error) {
diff --git a/manager/api/metrics.go b/manager/api/metrics.go
index aa91ce9..76528d2 100644
--- a/manager/api/metrics.go
+++ b/manager/api/metrics.go
@@ -42,13 +42,13 @@ func (ms *metricsMiddleware) CreateLibvirtDomain(ctx context.Context, pool, volu
 	return ms.svc.CreateLibvirtDomain(ctx, pool, volume, domain)
 }
 
-func (ms *metricsMiddleware) CreateQemuVM(ctx context.Context, exe string, args []string) (*exec.Cmd, error) {
+func (ms *metricsMiddleware) CreateQemuVM(ctx context.Context) (*exec.Cmd, error) {
 	defer func(begin time.Time) {
 		ms.counter.With("method", "CreateQemuVM").Add(1)
 		ms.latency.With("method", "CreateQemuVM").Observe(time.Since(begin).Seconds())
 	}(time.Now())
 
-	return ms.svc.CreateQemuVM(ctx, exe, args)
+	return ms.svc.CreateQemuVM(ctx)
 }
 
 func (ms *metricsMiddleware) Run(ctx context.Context, computation []byte) (string, error) {
diff --git a/manager/qemu/config.go b/manager/qemu/config.go
index ea9bc0f..66e36eb 100644
--- a/manager/qemu/config.go
+++ b/manager/qemu/config.go
@@ -3,76 +3,76 @@ package qemu
 import "fmt"
 
 type MemoryConfig struct {
-	Size  string `json:"memory_size,omitempty" env:"MEMORY_SIZE" envDefault:"4096M"`
-	Slots int    `json:"memory_slots,omitempty" env:"MEMORY_SLOTS" envDefault:"5"`
-	Max   string `json:"max_memory,omitempty" env:"MAX_MEMORY" envDefault:"30G"`
+	Size  string `env:"MEMORY_SIZE" envDefault:"4096M"`
+	Slots int    `env:"MEMORY_SLOTS" envDefault:"5"`
+	Max   string `env:"MAX_MEMORY" envDefault:"30G"`
 }
 
 type OVMFCodeConfig struct {
-	If       string `json:"ovmf_code_if,omitempty" env:"OVMF_CODE_IF" envDefault:"pflash"`
-	Format   string `json:"ovmf_code_format,omitempty" env:"OVMF_CODE_FORMAT" envDefault:"raw"`
-	Unit     int    `json:"ovmf_code_unit,omitempty" env:"OVMF_CODE_UNIT" envDefault:"0"`
-	File     string `json:"ovmf_code_file,omitempty" env:"OVMF_CODE_FILE" envDefault:"/usr/share/OVMF/OVMF_CODE.fd"`
-	ReadOnly string `json:"ovmf_code_readonly,omitempty" env:"OVMF_CODE_READONLY" envDefault:"on"`
+	If       string `env:"OVMF_CODE_IF" envDefault:"pflash"`
+	Format   string `env:"OVMF_CODE_FORMAT" envDefault:"raw"`
+	Unit     int    `env:"OVMF_CODE_UNIT" envDefault:"0"`
+	File     string `env:"OVMF_CODE_FILE" envDefault:"/usr/share/OVMF/OVMF_CODE.fd"`
+	ReadOnly string `env:"OVMF_CODE_READONLY" envDefault:"on"`
 }
 
 type OVMFVarsConfig struct {
-	If     string `json:"ovmf_vars_if,omitempty" env:"OVMF_VARS_IF" envDefault:"pflash"`
-	Format string `json:"ovmf_vars_format,omitempty" env:"OVMF_VARS_FORMAT" envDefault:"raw"`
-	Unit   int    `json:"ovmf_vars_unit,omitempty" env:"OVMF_VARS_UNIT" envDefault:"1"`
-	File   string `json:"ovmf_vars_file,omitempty" env:"OVMF_VARS_FILE" envDefault:"img/OVMF_VARS.fd"`
+	If     string `env:"OVMF_VARS_IF" envDefault:"pflash"`
+	Format string `env:"OVMF_VARS_FORMAT" envDefault:"raw"`
+	Unit   int    `env:"OVMF_VARS_UNIT" envDefault:"1"`
+	File   string `env:"OVMF_VARS_FILE" envDefault:"img/OVMF_VARS.fd"`
 }
 
 type NetDevConfig struct {
-	ID        string `json:"netdev_id,omitempty" env:"NETDEV_ID" envDefault:"vmnic"`
-	HostFwd1  string `json:"host_fwd_1,omitempty" env:"HOST_FWD_1" envDefault:"2222"`
-	GuestFwd1 string `json:"guest_fwd_1,omitempty" env:"GUEST_FWD_1" envDefault:"22"`
-	HostFwd2  string `json:"host_fwd_2,omitempty" env:"HOST_FWD_2" envDefault:"9301"`
-	GuestFwd2 string `json:"guest_fwd_2,omitempty" env:"GUEST_FWD_2" envDefault:"9031"`
-	HostFwd3  string `json:"host_fwd_3,omitempty" env:"HOST_FWD_3" envDefault:"7020"`
-	GuestFwd3 string `json:"guest_fwd_3,omitempty" env:"GUEST_FWD_3" envDefault:"7002"`
+	ID        string `env:"NETDEV_ID" envDefault:"vmnic"`
+	HostFwd1  string `env:"HOST_FWD_1" envDefault:"2222"`
+	GuestFwd1 string `env:"GUEST_FWD_1" envDefault:"22"`
+	HostFwd2  string `env:"HOST_FWD_2" envDefault:"9301"`
+	GuestFwd2 string `env:"GUEST_FWD_2" envDefault:"9031"`
+	HostFwd3  string `env:"HOST_FWD_3" envDefault:"7020"`
+	GuestFwd3 string `env:"GUEST_FWD_3" envDefault:"7002"`
 }
 
 type VirtioNetPciConfig struct {
-	DisableLegacy string `json:"virtio_net_pci_disable_legacy,omitempty" env:"VIRTIO_NET_PCI_DISABLE_LEGACY" envDefault:"on"`
-	IOMMUPlatform bool   `json:"virtio_net_pci_iommu_platform,omitempty" env:"VIRTIO_NET_PCI_IOMMU_PLATFORM" envDefault:"true"`
-	ROMFile       string `json:"virtio_net_pci_romfile,omitempty" env:"VIRTIO_NET_PCI_ROMFILE"`
+	DisableLegacy string `env:"VIRTIO_NET_PCI_DISABLE_LEGACY" envDefault:"on"`
+	IOMMUPlatform bool   `env:"VIRTIO_NET_PCI_IOMMU_PLATFORM" envDefault:"true"`
+	ROMFile       string `env:"VIRTIO_NET_PCI_ROMFILE"`
 }
 
 type DiskImgConfig struct {
-	File   string `json:"disk_img_file,omitempty" env:"DISK_IMG_FILE" envDefault:"img/focal-server-cloudimg-amd64.img"`
-	If     string `json:"disk_img_if,omitempty" env:"DISK_IMG_IF" envDefault:"none"`
-	ID     string `json:"disk_img_id,omitempty" env:"DISK_IMG_ID" envDefault:"disk0"`
-	Format string `json:"disk_img_format,omitempty" env:"DISK_IMG_FORMAT" envDefault:"qcow2"`
+	File   string `env:"DISK_IMG_FILE" envDefault:"img/focal-server-cloudimg-amd64.img"`
+	If     string `env:"DISK_IMG_IF" envDefault:"none"`
+	ID     string `env:"DISK_IMG_ID" envDefault:"disk0"`
+	Format string `env:"DISK_IMG_FORMAT" envDefault:"qcow2"`
 }
 
 type VirtioScsiPciConfig struct {
-	ID            string `json:"virtio_scsi_pci_id,omitempty" env:"VIRTIO_SCSI_PCI_ID" envDefault:"scsi"`
-	DisableLegacy string `json:"virtio_scsi_pci_disable_legacy,omitempty" env:"VIRTIO_SCSI_PCI_DISABLE_LEGACY" envDefault:"on"`
-	IOMMUPlatform bool   `json:"virtio_scsi_pci_iommu_platform,omitempty" env:"VIRTIO_SCSI_PCI_IOMMU_PLATFORM" envDefault:"true"`
+	ID            string `env:"VIRTIO_SCSI_PCI_ID" envDefault:"scsi"`
+	DisableLegacy string `env:"VIRTIO_SCSI_PCI_DISABLE_LEGACY" envDefault:"on"`
+	IOMMUPlatform bool   `env:"VIRTIO_SCSI_PCI_IOMMU_PLATFORM" envDefault:"true"`
 }
 
 type SevConfig struct {
-	ID              string `json:"sev_id,omitempty" env:"SEV_ID" envDefault:"sev0"`
-	CBitPos         int    `json:"sev_cbitpos,omitempty" env:"SEV_CBITPOS" envDefault:"51"`
-	ReducedPhysBits int    `json:"sev_reduced_phys_bits,omitempty" env:"SEV_REDUCED_PHYS_BITS" envDefault:"1"`
+	ID              string `env:"SEV_ID" envDefault:"sev0"`
+	CBitPos         int    `env:"SEV_CBITPOS" envDefault:"51"`
+	ReducedPhysBits int    `env:"SEV_REDUCED_PHYS_BITS" envDefault:"1"`
 }
 
 type MemoryEncryptionConfig struct {
-	SEV0 string `json:"memory_encryption_sev0,omitempty" env:"MEMORY_ENCRYPTION_SEV0" envDefault:"sev0"`
+	SEV0 string `env:"MEMORY_ENCRYPTION_SEV0" envDefault:"sev0"`
 }
 
 type Config struct {
-	UseSudo   bool `json:"use_sudo,omitempty" env:"USE_SUDO" envDevault:"false"`
-	EnableSEV bool `json:"enable_sev,omitempty" env:"ENABLE_SEV" envDefault:"true"`
+	UseSudo   bool `env:"USE_SUDO" envDevault:"false"`
+	EnableSEV bool `env:"ENABLE_SEV" envDefault:"true"`
 
-	EnableKVM bool `json:"enable_kvm,omitempty" env:"ENABLE_KVM" envDefault:"true"`
+	EnableKVM bool `env:"ENABLE_KVM" envDefault:"true"`
 
 	// machine, CPU, RAM
-	Machine  string `json:"machine,omitempty" env:"MACHINE" envDefault:"q35"`
-	CPU      string `json:"cpu,omitempty" env:"CPU" envDefault:"EPYC"`
-	SmpCount int    `json:"smp_count,omitempty" env:"SMP_COUNT" envDefault:"4"`
-	MaxCpus  int    `json:"smp_maxcpus,omitempty" env:"SMP_MAXCPUS" envDefault:"64"`
+	Machine  string `env:"MACHINE" envDefault:"q35"`
+	CPU      string `env:"CPU" envDefault:"EPYC"`
+	SmpCount int    `env:"SMP_COUNT" envDefault:"4"`
+	MaxCpus  int    `env:"SMP_MAXCPUS" envDefault:"64"`
 	MemoryConfig
 
 	// OVMF
@@ -92,8 +92,8 @@ type Config struct {
 	MemoryEncryptionConfig
 
 	// display
-	NoGraphic bool   `json:"no_graphic,omitempty" env:"NO_GRAPHIC" envDefault:"true"`
-	Monitor   string `json:"monitor,omitempty" env:"MONITOR" envDefault:"pty"`
+	NoGraphic bool   `env:"NO_GRAPHIC" envDefault:"true"`
+	Monitor   string `env:"MONITOR" envDefault:"pty"`
 }
 
 func constructQemuArgs(config Config) []string {
diff --git a/manager/service.go b/manager/service.go
index 1dcbd4b..61c909a 100644
--- a/manager/service.go
+++ b/manager/service.go
@@ -32,21 +32,29 @@ var (
 // implementation, and all of its decorators (e.g. logging & metrics).
 type Service interface {
 	CreateLibvirtDomain(ctx context.Context, pool, volume, domain string) (string, error)
-	CreateQemuVM(ctx context.Context, exe string, args []string) (*exec.Cmd, error)
+	CreateQemuVM(ctx context.Context) (*exec.Cmd, error)
 	Run(ctx context.Context, computation []byte) (string, error)
 }
+
+type qemuCmd struct {
+	exe  string   // The path to the QEMU executable
+	args []string // List of arguments for the QEMU command
+}
+
 type managerService struct {
 	libvirt *libvirt.Libvirt
 	agent   agent.AgentServiceClient
+	qemuCmd qemuCmd
 }
 
 var _ Service = (*managerService)(nil)
 
 // New instantiates the manager service implementation.
-func New(libvirtConn *libvirt.Libvirt, agent agent.AgentServiceClient) Service {
+func New(libvirtConn *libvirt.Libvirt, agent agent.AgentServiceClient, exe string, args []string) Service {
 	return &managerService{
 		libvirt: libvirtConn,
 		agent:   agent,
+		qemuCmd: qemuCmd{exe: exe, args: args},
 	}
 }
 
@@ -82,8 +90,8 @@ func (ms *managerService) CreateLibvirtDomain(ctx context.Context, poolXML, volX
 	return dom.Name, nil
 }
 
-func (ms *managerService) CreateQemuVM(ctx context.Context, exe string, args []string) (*exec.Cmd, error) {
-	cmd, err := qemu.RunQemuVM(exe, args)
+func (ms *managerService) CreateQemuVM(ctx context.Context) (*exec.Cmd, error) {
+	cmd, err := qemu.RunQemuVM(ms.qemuCmd.exe, ms.qemuCmd.args)
 	if err != nil {
 		return cmd, err
 	}
diff --git a/manager/tracing/tracing.go b/manager/tracing/tracing.go
index 887298b..f85c829 100644
--- a/manager/tracing/tracing.go
+++ b/manager/tracing/tracing.go
@@ -32,11 +32,11 @@ func (tm *tracingMiddleware) CreateLibvirtDomain(ctx context.Context, pool, volu
 	return tm.svc.CreateLibvirtDomain(ctx, pool, volume, domain)
 }
 
-func (tm *tracingMiddleware) CreateQemuVM(ctx context.Context, exe string, args []string) (*exec.Cmd, error) {
+func (tm *tracingMiddleware) CreateQemuVM(ctx context.Context) (*exec.Cmd, error) {
 	ctx, span := tm.tracer.Start(ctx, "createQemuVM")
 	defer span.End()
 
-	return tm.svc.CreateQemuVM(ctx, exe, args)
+	return tm.svc.CreateQemuVM(ctx)
 }
 
 func (tm *tracingMiddleware) Run(ctx context.Context, computation []byte) (string, error) {

From 0b38e947870c74056d86976d3f1f365be835d8ce Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Tue, 15 Aug 2023 20:20:49 +0200
Subject: [PATCH 23/25] Add uuid to VM creation config id fields

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 cmd/manager/main.go    | 17 ++++++++---------
 go.mod                 |  1 +
 go.sum                 |  3 +++
 manager/qemu/config.go |  9 ++-------
 manager/service.go     | 31 ++++++++++++++++++++++---------
 vendor/modules.txt     |  2 ++
 6 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index cdc829c..73048ca 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -13,7 +13,6 @@ import (
 	"log"
 	"net"
 	"os"
-	"strings"
 	"time"
 
 	"github.com/digitalocean/go-libvirt"
@@ -112,14 +111,14 @@ func main() {
 		logger.Fatal(fmt.Sprintf("failed to load %s QEMU configuration : %s", svcName, err))
 	}
 
-	exe, args, err := qemu.ExecutableAndArgs(qemuCfg)
-	if err != nil {
-		logger.Fatal(fmt.Sprintf("failed to generate executable and arguments: %v", err))
-	}
-	logger.Info(fmt.Sprintf("%s %s", exe, strings.Join(args, " ")))
+	// exe, args, err := qemu.ExecutableAndArgs(qemuCfg)
+	// if err != nil {
+	// 	logger.Fatal(fmt.Sprintf("failed to generate executable and arguments: %v", err))
+	// }
+	// logger.Info(fmt.Sprintf("%s %s", exe, strings.Join(args, " ")))
 
 	//SVC
-	svc := newService(libvirtConn, agentClient, logger, tracer, exe, args)
+	svc := newService(libvirtConn, agentClient, logger, tracer, qemuCfg)
 
 	var httpServerConfig = server.Config{Port: defSvcHTTPPort}
 	if err := env.Parse(&httpServerConfig, env.Options{Prefix: envPrefixHTTP}); err != nil {
@@ -154,8 +153,8 @@ func main() {
 	}
 }
 
-func newService(libvirtConn *libvirt.Libvirt, agent agent.AgentServiceClient, logger logger.Logger, tracer trace.Tracer, exe string, args []string) manager.Service {
-	svc := manager.New(libvirtConn, agent, exe, args)
+func newService(libvirtConn *libvirt.Libvirt, agent agent.AgentServiceClient, logger logger.Logger, tracer trace.Tracer, qemuCfg qemu.Config) manager.Service {
+	svc := manager.New(libvirtConn, agent, qemuCfg)
 
 	svc = api.LoggingMiddleware(svc, logger)
 	counter, latency := internal.MakeMetrics(svcName, "api")
diff --git a/go.mod b/go.mod
index 5de5cdf..e5f3ce9 100644
--- a/go.mod
+++ b/go.mod
@@ -7,6 +7,7 @@ require (
 	github.com/digitalocean/go-libvirt v0.0.0-20221205150000-2939327a8519
 	github.com/go-kit/kit v0.12.0
 	github.com/go-zoo/bone v1.3.0
+	github.com/google/uuid v1.3.0
 	github.com/mainflux/mainflux v0.0.0-20230726142711-2b78902e0170
 	github.com/prometheus/client_golang v1.16.0
 	github.com/ultravioletrs/agent v0.0.0-20230727102942-c2240066f943
diff --git a/go.sum b/go.sum
index b53ebbf..d8f160a 100644
--- a/go.sum
+++ b/go.sum
@@ -37,6 +37,8 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/mainflux/mainflux v0.0.0-20230726142711-2b78902e0170 h1:lMvLFbtNJdUufGGYaC/MrNH+B1uEYs4LWstTjphWnbc=
 github.com/mainflux/mainflux v0.0.0-20230726142711-2b78902e0170/go.mod h1:FoeJ13mrfikrsFDW6bOb3C44D5gZ5m9Jt249G1sLKq0=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
@@ -63,6 +65,7 @@ github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8
 github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/ultravioletrs/agent v0.0.0-20230727102942-c2240066f943 h1:t7TZWtdH5PCMZydP8s/6W877fT5QtUF8C8kTayOOHac=
 github.com/ultravioletrs/agent v0.0.0-20230727102942-c2240066f943/go.mod h1:AnzhybLxmQwV3ZfVTgM6W+rvIZLfHeNVmwt7tAvAQhw=
+github.com/ultravioletrs/agent v0.0.0-20230808151319-fd68c9712b82/go.mod h1:AnzhybLxmQwV3ZfVTgM6W+rvIZLfHeNVmwt7tAvAQhw=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 h1:ZOLJc06r4CB42laIXg/7udr0pbZyuAihN10A/XuiQRY=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0/go.mod h1:5z+/ZWJQKXa9YT34fQNx5K8Hd1EoIhvtUygUQPqEOgQ=
diff --git a/manager/qemu/config.go b/manager/qemu/config.go
index 66e36eb..2d37af6 100644
--- a/manager/qemu/config.go
+++ b/manager/qemu/config.go
@@ -3,7 +3,7 @@ package qemu
 import "fmt"
 
 type MemoryConfig struct {
-	Size  string `env:"MEMORY_SIZE" envDefault:"4096M"`
+	Size  string `env:"MEMORY_SIZE" envDefault:"2048M"`
 	Slots int    `env:"MEMORY_SLOTS" envDefault:"5"`
 	Max   string `env:"MAX_MEMORY" envDefault:"30G"`
 }
@@ -58,10 +58,6 @@ type SevConfig struct {
 	ReducedPhysBits int    `env:"SEV_REDUCED_PHYS_BITS" envDefault:"1"`
 }
 
-type MemoryEncryptionConfig struct {
-	SEV0 string `env:"MEMORY_ENCRYPTION_SEV0" envDefault:"sev0"`
-}
-
 type Config struct {
 	UseSudo   bool `env:"USE_SUDO" envDevault:"false"`
 	EnableSEV bool `env:"ENABLE_SEV" envDefault:"true"`
@@ -89,7 +85,6 @@ type Config struct {
 
 	// SEV
 	SevConfig
-	MemoryEncryptionConfig
 
 	// display
 	NoGraphic bool   `env:"NO_GRAPHIC" envDefault:"true"`
@@ -177,7 +172,7 @@ func constructQemuArgs(config Config) []string {
 				config.SevConfig.ReducedPhysBits))
 
 		args = append(args, "-machine",
-			fmt.Sprintf("memory-encryption=%s", config.MemoryEncryptionConfig.SEV0))
+			fmt.Sprintf("memory-encryption=%s", config.SevConfig.ID))
 	}
 
 	// display
diff --git a/manager/service.go b/manager/service.go
index 61c909a..1d1f9e8 100644
--- a/manager/service.go
+++ b/manager/service.go
@@ -6,6 +6,7 @@ package manager
 import (
 	"context"
 	"errors"
+	"fmt"
 	"os"
 	"os/exec"
 	"strings"
@@ -13,6 +14,8 @@ import (
 	"github.com/digitalocean/go-libvirt"
 	"github.com/ultravioletrs/agent/agent"
 	"github.com/ultravioletrs/manager/manager/qemu"
+
+	"github.com/gofrs/uuid"
 )
 
 var (
@@ -36,25 +39,20 @@ type Service interface {
 	Run(ctx context.Context, computation []byte) (string, error)
 }
 
-type qemuCmd struct {
-	exe  string   // The path to the QEMU executable
-	args []string // List of arguments for the QEMU command
-}
-
 type managerService struct {
 	libvirt *libvirt.Libvirt
 	agent   agent.AgentServiceClient
-	qemuCmd qemuCmd
+	qemuCfg qemu.Config
 }
 
 var _ Service = (*managerService)(nil)
 
 // New instantiates the manager service implementation.
-func New(libvirtConn *libvirt.Libvirt, agent agent.AgentServiceClient, exe string, args []string) Service {
+func New(libvirtConn *libvirt.Libvirt, agent agent.AgentServiceClient, qemuCfg qemu.Config) Service {
 	return &managerService{
 		libvirt: libvirtConn,
 		agent:   agent,
-		qemuCmd: qemuCmd{exe: exe, args: args},
+		qemuCfg: qemuCfg,
 	}
 }
 
@@ -91,7 +89,22 @@ func (ms *managerService) CreateLibvirtDomain(ctx context.Context, poolXML, volX
 }
 
 func (ms *managerService) CreateQemuVM(ctx context.Context) (*exec.Cmd, error) {
-	cmd, err := qemu.RunQemuVM(ms.qemuCmd.exe, ms.qemuCmd.args)
+	id, err := uuid.NewV4()
+	if err != nil {
+		return &exec.Cmd{}, err
+	}
+	qemuCfg := ms.qemuCfg
+	qemuCfg.NetDevConfig.ID = fmt.Sprintf("%s-%s", qemuCfg.NetDevConfig.ID, id)
+	qemuCfg.DiskImgConfig.ID = fmt.Sprintf("%s-%s", qemuCfg.DiskImgConfig.ID, id)
+	qemuCfg.VirtioScsiPciConfig.ID = fmt.Sprintf("%s-%s", qemuCfg.VirtioScsiPciConfig.ID, id)
+	qemuCfg.SevConfig.ID = fmt.Sprintf("%s-%s", qemuCfg.SevConfig.ID, id)
+
+	exe, args, err := qemu.ExecutableAndArgs(qemuCfg)
+	if err != nil {
+		return &exec.Cmd{}, err
+	}
+
+	cmd, err := qemu.RunQemuVM(exe, args)
 	if err != nil {
 		return cmd, err
 	}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index ca0e3e6..019739f 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -54,6 +54,8 @@ github.com/golang/protobuf/ptypes
 github.com/golang/protobuf/ptypes/any
 github.com/golang/protobuf/ptypes/duration
 github.com/golang/protobuf/ptypes/timestamp
+# github.com/google/uuid v1.3.0
+## explicit
 # github.com/mainflux/mainflux v0.0.0-20230726142711-2b78902e0170
 ## explicit; go 1.20
 github.com/mainflux/mainflux

From b3ad784ee05c8c6c9e4c339136a72f5b5394c130 Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Tue, 15 Aug 2023 21:42:35 +0200
Subject: [PATCH 24/25] Add file.go and temporary file creation to enable multi
 instance VM launch

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 README.md              |  9 ++++++---
 cmd/manager/main.go    | 11 +++++------
 internal/file.go       | 44 ++++++++++++++++++++++++++++++++++++++++++
 manager/qemu/config.go | 16 +++++++--------
 manager/service.go     | 30 +++++++++++++++++++++++++++-
 5 files changed, 92 insertions(+), 18 deletions(-)
 create mode 100644 internal/file.go

diff --git a/README.md b/README.md
index 2870ff4..203aade 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ sudo apt update
 sudo apt install qemu-kvm
 ```
 
-Create `img` directory in `cmd/manager`.
+Create `img` directory in `cmd/manager`. Create `tmp` directory in `cmd/manager`.
 
 ### focal-server-cloudimg-amd64.img
 
@@ -50,8 +50,7 @@ MANAGER_QEMU_OVMF_CODE_FILE=/usr/share/OVMF/OVMF_CODE.fd
 
 sudo find / -name OVMF_VARS.fd
 # => /usr/share/OVMF/OVMF_VARS.fd
-cp /usr/share/OVMF/OVMF_VARS.fd .
-MANAGER_QEMU_OVMF_VARS_FILE=img/OVMF_VARS.fd
+MANAGER_QEMU_OVMF_VARS_FILE=/usr/share/OVMF/OVMF_VARS.fd
 ```
 
 ## Run
@@ -74,10 +73,14 @@ Manager will start an HTTP server on port `9021`, and a gRPC server on port `700
 
 ### Create QEMU virtual machine (VM)
 
+To create an instance of VM, run
+
 ```sh
 curl -sSi -X GET http://localhost:9021/qemu
 ```
 
+You should be able to create multiple instances by reruning the command. 
+
 ### Verifying VM launch
 
 NB: To verify that the manager successfully launched the VM, you need to open two terminals on the same machine. In one terminal, you need to launch `go run main.go` (with the environment variables of choice) and in the other, you can run the verification commands.
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index 73048ca..197ec52 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -111,12 +111,6 @@ func main() {
 		logger.Fatal(fmt.Sprintf("failed to load %s QEMU configuration : %s", svcName, err))
 	}
 
-	// exe, args, err := qemu.ExecutableAndArgs(qemuCfg)
-	// if err != nil {
-	// 	logger.Fatal(fmt.Sprintf("failed to generate executable and arguments: %v", err))
-	// }
-	// logger.Info(fmt.Sprintf("%s %s", exe, strings.Join(args, " ")))
-
 	//SVC
 	svc := newService(libvirtConn, agentClient, logger, tracer, qemuCfg)
 
@@ -151,6 +145,11 @@ func main() {
 	if err := g.Wait(); err != nil {
 		logger.Error(fmt.Sprintf("%s service terminated: %s", svcName, err))
 	}
+
+	err = internal.DeleteFilesInDir("tmp/")
+	if err != nil {
+		logger.Error(fmt.Sprintf("%s", err))
+	}
 }
 
 func newService(libvirtConn *libvirt.Libvirt, agent agent.AgentServiceClient, logger logger.Logger, tracer trace.Tracer, qemuCfg qemu.Config) manager.Service {
diff --git a/internal/file.go b/internal/file.go
new file mode 100644
index 0000000..ab7b9fa
--- /dev/null
+++ b/internal/file.go
@@ -0,0 +1,44 @@
+package internal
+
+import (
+	"io"
+	"os"
+	"path/filepath"
+)
+
+func CopyFile(srcPath, dstPath string) error {
+	src, err := os.Open(srcPath)
+	if err != nil {
+		return err
+	}
+	defer src.Close()
+
+	dst, err := os.Create(dstPath)
+	if err != nil {
+		return err
+	}
+	defer dst.Close()
+
+	_, err = io.Copy(dst, src)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func DeleteFilesInDir(dirPath string) error {
+	files, err := filepath.Glob(filepath.Join(dirPath, "*"))
+	if err != nil {
+		return err
+	}
+
+	for _, file := range files {
+		err := os.Remove(file)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/manager/qemu/config.go b/manager/qemu/config.go
index 2d37af6..8b00fc4 100644
--- a/manager/qemu/config.go
+++ b/manager/qemu/config.go
@@ -20,17 +20,17 @@ type OVMFVarsConfig struct {
 	If     string `env:"OVMF_VARS_IF" envDefault:"pflash"`
 	Format string `env:"OVMF_VARS_FORMAT" envDefault:"raw"`
 	Unit   int    `env:"OVMF_VARS_UNIT" envDefault:"1"`
-	File   string `env:"OVMF_VARS_FILE" envDefault:"img/OVMF_VARS.fd"`
+	File   string `env:"OVMF_VARS_FILE" envDefault:"/usr/share/OVMF/OVMF_VARS.fd"`
 }
 
 type NetDevConfig struct {
 	ID        string `env:"NETDEV_ID" envDefault:"vmnic"`
-	HostFwd1  string `env:"HOST_FWD_1" envDefault:"2222"`
-	GuestFwd1 string `env:"GUEST_FWD_1" envDefault:"22"`
-	HostFwd2  string `env:"HOST_FWD_2" envDefault:"9301"`
-	GuestFwd2 string `env:"GUEST_FWD_2" envDefault:"9031"`
-	HostFwd3  string `env:"HOST_FWD_3" envDefault:"7020"`
-	GuestFwd3 string `env:"GUEST_FWD_3" envDefault:"7002"`
+	HostFwd1  int    `env:"HOST_FWD_1" envDefault:"2222"`
+	GuestFwd1 int    `env:"GUEST_FWD_1" envDefault:"22"`
+	HostFwd2  int    `env:"HOST_FWD_2" envDefault:"9301"`
+	GuestFwd2 int    `env:"GUEST_FWD_2" envDefault:"9031"`
+	HostFwd3  int    `env:"HOST_FWD_3" envDefault:"7020"`
+	GuestFwd3 int    `env:"GUEST_FWD_3" envDefault:"7002"`
 }
 
 type VirtioNetPciConfig struct {
@@ -150,7 +150,7 @@ func constructQemuArgs(config Config) []string {
 
 	// network
 	args = append(args, "-netdev",
-		fmt.Sprintf("user,id=%s,hostfwd=tcp::%s-:%s,hostfwd=tcp::%s-:%s,hostfwd=tcp::%s-:%s",
+		fmt.Sprintf("user,id=%s,hostfwd=tcp::%d-:%d,hostfwd=tcp::%d-:%d,hostfwd=tcp::%d-:%d",
 			config.NetDevConfig.ID,
 			config.NetDevConfig.HostFwd1, config.NetDevConfig.GuestFwd1,
 			config.NetDevConfig.HostFwd2, config.NetDevConfig.GuestFwd2,
diff --git a/manager/service.go b/manager/service.go
index 1d1f9e8..9faa1ad 100644
--- a/manager/service.go
+++ b/manager/service.go
@@ -13,11 +13,15 @@ import (
 
 	"github.com/digitalocean/go-libvirt"
 	"github.com/ultravioletrs/agent/agent"
+	"github.com/ultravioletrs/manager/internal"
 	"github.com/ultravioletrs/manager/manager/qemu"
 
 	"github.com/gofrs/uuid"
 )
 
+const firmwareVars = "OVMF_VARS"
+const qcow2Img = "focal-server-cloudimg-amd64"
+
 var (
 	// ErrMalformedEntity indicates malformed entity specification (e.g.
 	// invalid username or password).
@@ -89,6 +93,7 @@ func (ms *managerService) CreateLibvirtDomain(ctx context.Context, poolXML, volX
 }
 
 func (ms *managerService) CreateQemuVM(ctx context.Context) (*exec.Cmd, error) {
+	// create unique emu device identifiers
 	id, err := uuid.NewV4()
 	if err != nil {
 		return &exec.Cmd{}, err
@@ -99,15 +104,38 @@ func (ms *managerService) CreateQemuVM(ctx context.Context) (*exec.Cmd, error) {
 	qemuCfg.VirtioScsiPciConfig.ID = fmt.Sprintf("%s-%s", qemuCfg.VirtioScsiPciConfig.ID, id)
 	qemuCfg.SevConfig.ID = fmt.Sprintf("%s-%s", qemuCfg.SevConfig.ID, id)
 
-	exe, args, err := qemu.ExecutableAndArgs(qemuCfg)
+	// copy firmware vars file
+	srcFile := qemuCfg.OVMFVarsConfig.File
+	dstFile := fmt.Sprintf("tmp/%s-%s.fd", firmwareVars, id)
+	err = internal.CopyFile(srcFile, dstFile)
+	if err != nil {
+		return &exec.Cmd{}, err
+	}
+	qemuCfg.OVMFVarsConfig.File = dstFile
+
+	// copy qcow2 img file
+	srcFile = qemuCfg.DiskImgConfig.File
+	dstFile = fmt.Sprintf("tmp/%s-%s.img", qcow2Img, id)
+	err = internal.CopyFile(srcFile, dstFile)
 	if err != nil {
 		return &exec.Cmd{}, err
 	}
+	qemuCfg.DiskImgConfig.File = dstFile
 
+	exe, args, err := qemu.ExecutableAndArgs(qemuCfg)
+	if err != nil {
+		return &exec.Cmd{}, err
+	}
 	cmd, err := qemu.RunQemuVM(exe, args)
 	if err != nil {
 		return cmd, err
 	}
+
+	// different VM guests can't forward ports to the same ports on the same host
+	ms.qemuCfg.NetDevConfig.HostFwd1++
+	ms.qemuCfg.NetDevConfig.HostFwd2++
+	ms.qemuCfg.NetDevConfig.HostFwd3++
+
 	return cmd, nil
 }
 

From 5028946731dfb9dbaca9002732cab714cc91d074 Mon Sep 17 00:00:00 2001
From: Darko Draskovic <darko.draskovic@gmail.com>
Date: Wed, 16 Aug 2023 11:08:38 +0200
Subject: [PATCH 25/25] Replace literal strings by consts and properly format
 godoc comments

Signed-off-by: Darko Draskovic <darko.draskovic@gmail.com>
---
 cmd/manager/main.go           |  6 ++----
 internal/cmd.go               |  8 ++++----
 internal/file.go              |  2 ++
 manager/api/http/requests.go  | 10 +---------
 manager/api/http/transport.go |  3 +--
 manager/qemu/config.go        |  5 +++--
 manager/service.go            |  4 ++--
 7 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index 197ec52..5ee2f8d 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -105,13 +105,11 @@ func main() {
 
 	logger.Info("Successfully connected to agent grpc server " + agentGRPCClient.Secure())
 
-	// QEMU
 	qemuCfg := qemu.Config{}
 	if err := env.Parse(&qemuCfg, env.Options{Prefix: envPrefixQemu}); err != nil {
 		logger.Fatal(fmt.Sprintf("failed to load %s QEMU configuration : %s", svcName, err))
 	}
 
-	//SVC
 	svc := newService(libvirtConn, agentClient, logger, tracer, qemuCfg)
 
 	var httpServerConfig = server.Config{Port: defSvcHTTPPort}
@@ -146,9 +144,9 @@ func main() {
 		logger.Error(fmt.Sprintf("%s service terminated: %s", svcName, err))
 	}
 
-	err = internal.DeleteFilesInDir("tmp/")
+	err = internal.DeleteFilesInDir(qemuCfg.TmpFileLoc)
 	if err != nil {
-		logger.Error(fmt.Sprintf("%s", err))
+		logger.Error(err.Error())
 	}
 }
 
diff --git a/internal/cmd.go b/internal/cmd.go
index 650db67..1f88528 100644
--- a/internal/cmd.go
+++ b/internal/cmd.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 )
 
-// ExeShCmdStdout executes a shell command capturing the standard output
+// ExeShCmdStdout executes a shell command capturing the standard output.
 func ExeShCmdStdout(command string, args ...string) (string, error) {
 	var stdoutBuf, stderrBuf bytes.Buffer
 
@@ -27,7 +27,7 @@ func ExeShCmdStdout(command string, args ...string) (string, error) {
 	return stdoutBuf.String(), nil
 }
 
-// ExtractCmdAndArgs extracts the command and its arguments from the output string
+// ExtractCmdAndArgs extracts the command and its arguments from the output string.
 func ExtractCmdAndArgs(cmdLine string, sudo bool) (string, []string) {
 	lines := strings.Split(cmdLine, "\n")
 	if len(lines) == 0 {
@@ -49,7 +49,7 @@ func ExtractCmdAndArgs(cmdLine string, sudo bool) (string, []string) {
 	return cmd, args
 }
 
-// RunCmdOutput runs the specified command and returns its standard output as a string
+// RunCmdOutput runs the specified command and returns its standard output as a string.
 func RunCmdOutput(command string, args ...string) (string, error) {
 	cmd := exec.Command(command, args...)
 
@@ -61,7 +61,7 @@ func RunCmdOutput(command string, args ...string) (string, error) {
 	return string(output), nil
 }
 
-// RunCmdStart starts the specified command and returns the *exec.Cmd for the running process
+// RunCmdStart starts the specified command and returns the *exec.Cmd for the running process.
 func RunCmdStart(command string, args ...string) (*exec.Cmd, error) {
 	cmd := exec.Command(command, args...)
 
diff --git a/internal/file.go b/internal/file.go
index ab7b9fa..ec70524 100644
--- a/internal/file.go
+++ b/internal/file.go
@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 )
 
+// CopyFile copies a file from srcPath to dstPath.
 func CopyFile(srcPath, dstPath string) error {
 	src, err := os.Open(srcPath)
 	if err != nil {
@@ -27,6 +28,7 @@ func CopyFile(srcPath, dstPath string) error {
 	return nil
 }
 
+// DeleteFilesInDir deletes all files in the directory dirPath.
 func DeleteFilesInDir(dirPath string) error {
 	files, err := filepath.Glob(filepath.Join(dirPath, "*"))
 	if err != nil {
diff --git a/manager/api/http/requests.go b/manager/api/http/requests.go
index 9216665..a4cae21 100644
--- a/manager/api/http/requests.go
+++ b/manager/api/http/requests.go
@@ -3,9 +3,7 @@
 
 package http
 
-import (
-	"github.com/ultravioletrs/manager/manager"
-)
+import "github.com/ultravioletrs/manager/manager"
 
 var (
 	_ apiReq = (*runReq)(nil)
@@ -23,10 +21,6 @@ type createLibvirtDomainReq struct {
 }
 
 func (req createLibvirtDomainReq) validate() error {
-	// if req.Pool == "" || req.Volume == "" || req.Domain == "" {
-	// 	return manager.ErrMalformedEntity
-	// }
-
 	return nil
 }
 
@@ -45,7 +39,5 @@ type createQemuVMReq struct {
 }
 
 func (req createQemuVMReq) validate() error {
-	// You can add validation logic here if needed
-	// For example, you might want to ensure that the config is not empty or contains valid values.
 	return nil
 }
diff --git a/manager/api/http/transport.go b/manager/api/http/transport.go
index 2d1b662..bdfbd1d 100644
--- a/manager/api/http/transport.go
+++ b/manager/api/http/transport.go
@@ -46,8 +46,7 @@ func MakeHandler(svc manager.Service, instanceID string) http.Handler {
 		decodeCreateQemuVMRequest,
 		encodeResponse,
 		opts...,
-	),
-		"create_qemu_vm"))
+	), "create_qemu_vm"))
 
 	r.Post("/run", otelhttp.NewHandler(kithttp.NewServer(
 		runEndpoint(svc),
diff --git a/manager/qemu/config.go b/manager/qemu/config.go
index 8b00fc4..7737969 100644
--- a/manager/qemu/config.go
+++ b/manager/qemu/config.go
@@ -59,8 +59,9 @@ type SevConfig struct {
 }
 
 type Config struct {
-	UseSudo   bool `env:"USE_SUDO" envDevault:"false"`
-	EnableSEV bool `env:"ENABLE_SEV" envDefault:"true"`
+	TmpFileLoc string `env:"TMP_FILE_LOC" envDefault:"tmp"`
+	UseSudo    bool   `env:"USE_SUDO" envDefault:"false"`
+	EnableSEV  bool   `env:"ENABLE_SEV" envDefault:"true"`
 
 	EnableKVM bool `env:"ENABLE_KVM" envDefault:"true"`
 
diff --git a/manager/service.go b/manager/service.go
index 9faa1ad..818156f 100644
--- a/manager/service.go
+++ b/manager/service.go
@@ -106,7 +106,7 @@ func (ms *managerService) CreateQemuVM(ctx context.Context) (*exec.Cmd, error) {
 
 	// copy firmware vars file
 	srcFile := qemuCfg.OVMFVarsConfig.File
-	dstFile := fmt.Sprintf("tmp/%s-%s.fd", firmwareVars, id)
+	dstFile := fmt.Sprintf("%s/%s-%s.fd", ms.qemuCfg.TmpFileLoc, firmwareVars, id)
 	err = internal.CopyFile(srcFile, dstFile)
 	if err != nil {
 		return &exec.Cmd{}, err
@@ -115,7 +115,7 @@ func (ms *managerService) CreateQemuVM(ctx context.Context) (*exec.Cmd, error) {
 
 	// copy qcow2 img file
 	srcFile = qemuCfg.DiskImgConfig.File
-	dstFile = fmt.Sprintf("tmp/%s-%s.img", qcow2Img, id)
+	dstFile = fmt.Sprintf("%s/%s-%s.img", ms.qemuCfg.TmpFileLoc, qcow2Img, id)
 	err = internal.CopyFile(srcFile, dstFile)
 	if err != nil {
 		return &exec.Cmd{}, err