diff --git a/mingw-w64-qemu/PKGBUILD b/mingw-w64-qemu/PKGBUILD
index 6115b671c5..598c2023c9 100644
--- a/mingw-w64-qemu/PKGBUILD
+++ b/mingw-w64-qemu/PKGBUILD
@@ -1,12 +1,17 @@
 _realname=qemu
 pkgbase=mingw-w64-${_realname}
-pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-_base_ver="6.2.0"
+pkgname=(
+  "${MINGW_PACKAGE_PREFIX}-qemu"
+  "${MINGW_PACKAGE_PREFIX}-qemu-common"
+  "${MINGW_PACKAGE_PREFIX}-qemu-guest-agent"
+  "${MINGW_PACKAGE_PREFIX}-qemu-image-util"
+)
+_base_ver="7.0.0"
 # QEMU Versioning of RC-SourcePackage and RC-Version differs
 # e.g. qemu-6.1.0-rc0.tar.xz contains 6.0.90, qemu-6.1.0-rc1.tar.xz contains 6.0.91
 # Unset _rc_no to create Release-Build
 #_rc_no="4"
-_rc_base_ver="6.1.9${_rc_no}"
+_rc_base_ver="6.2.9${_rc_no}"
 _rc_file_ver="rc${_rc_no}"
 _tarname=$( [ -z "${_rc_no}" ] && echo ${_realname}-${_base_ver} || echo ${_realname}-${_base_ver}-${_rc_file_ver} )
 pkgver=$( [ -z "${_rc_no}" ] && echo ${_base_ver} || echo ${_rc_base_ver} )
@@ -24,49 +29,85 @@ makedepends=(
   "${MINGW_PACKAGE_PREFIX}-python-sphinx"
   "${MINGW_PACKAGE_PREFIX}-python-sphinx_rtd_theme"
   "${MINGW_PACKAGE_PREFIX}-autotools"
+  "${MINGW_PACKAGE_PREFIX}-tools-git"
   "${MINGW_PACKAGE_PREFIX}-cc"
   'perl' 'bison' 'bsdtar')
 depends=(
   "${MINGW_PACKAGE_PREFIX}-capstone"
   "${MINGW_PACKAGE_PREFIX}-curl"
   "${MINGW_PACKAGE_PREFIX}-cyrus-sasl"
+  "${MINGW_PACKAGE_PREFIX}-expat"
+  "${MINGW_PACKAGE_PREFIX}-fontconfig"
+  "${MINGW_PACKAGE_PREFIX}-freetype"
+  "${MINGW_PACKAGE_PREFIX}-fribidi"
+  "${MINGW_PACKAGE_PREFIX}-gcc-libs"
+  "${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2"
+  "${MINGW_PACKAGE_PREFIX}-gettext"
   "${MINGW_PACKAGE_PREFIX}-glib2"
+  "${MINGW_PACKAGE_PREFIX}-gmp"
   "${MINGW_PACKAGE_PREFIX}-gnutls"
+  "${MINGW_PACKAGE_PREFIX}-graphite2"
+  "${MINGW_PACKAGE_PREFIX}-gst-plugins-base"
+  "${MINGW_PACKAGE_PREFIX}-gstreamer"
   "${MINGW_PACKAGE_PREFIX}-gtk3"
-  "${MINGW_PACKAGE_PREFIX}-libjpeg"
+  "${MINGW_PACKAGE_PREFIX}-harfbuzz"
+  "${MINGW_PACKAGE_PREFIX}-jbigkit"
+  "${MINGW_PACKAGE_PREFIX}-lerc"
+  "${MINGW_PACKAGE_PREFIX}-libc++"
+  "${MINGW_PACKAGE_PREFIX}-libdatrie"
+  "${MINGW_PACKAGE_PREFIX}-libdeflate"
+  "${MINGW_PACKAGE_PREFIX}-libepoxy"
+  "${MINGW_PACKAGE_PREFIX}-libffi"
+  "${MINGW_PACKAGE_PREFIX}-libiconv"
+  "${MINGW_PACKAGE_PREFIX}-libidn2"
+  "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo"
   "${MINGW_PACKAGE_PREFIX}-libnfs"
   "${MINGW_PACKAGE_PREFIX}-libpng"
+  "${MINGW_PACKAGE_PREFIX}-libpsl"
   "${MINGW_PACKAGE_PREFIX}-libslirp"
   "${MINGW_PACKAGE_PREFIX}-libssh"
+  "${MINGW_PACKAGE_PREFIX}-libssh2"
   "${MINGW_PACKAGE_PREFIX}-libssp"
   "${MINGW_PACKAGE_PREFIX}-libtasn1"
+  "${MINGW_PACKAGE_PREFIX}-libthai"
+  "${MINGW_PACKAGE_PREFIX}-libtiff"
+  "${MINGW_PACKAGE_PREFIX}-libunistring"
+  "${MINGW_PACKAGE_PREFIX}-libunwind"
   "${MINGW_PACKAGE_PREFIX}-libusb"
-  "${MINGW_PACKAGE_PREFIX}-libxml2"
+  "${MINGW_PACKAGE_PREFIX}-libwebp"
+  "${MINGW_PACKAGE_PREFIX}-libwinpthread-git"
+  "${MINGW_PACKAGE_PREFIX}-lz4"
   "${MINGW_PACKAGE_PREFIX}-lzo2"
   "${MINGW_PACKAGE_PREFIX}-nettle"
+  "${MINGW_PACKAGE_PREFIX}-nghttp2"
+  "${MINGW_PACKAGE_PREFIX}-openssl"
+  "${MINGW_PACKAGE_PREFIX}-opus"
+  "${MINGW_PACKAGE_PREFIX}-orc"
+  "${MINGW_PACKAGE_PREFIX}-p11-kit"
+  "${MINGW_PACKAGE_PREFIX}-pango"
+  "${MINGW_PACKAGE_PREFIX}-pcre"
   "${MINGW_PACKAGE_PREFIX}-pixman"
   "${MINGW_PACKAGE_PREFIX}-SDL2"
   "${MINGW_PACKAGE_PREFIX}-SDL2_image"
-  "${MINGW_PACKAGE_PREFIX}-spice"
   "${MINGW_PACKAGE_PREFIX}-snappy"
+  "${MINGW_PACKAGE_PREFIX}-spice"
   "${MINGW_PACKAGE_PREFIX}-usbredir"
+  "${MINGW_PACKAGE_PREFIX}-xz"
+  "${MINGW_PACKAGE_PREFIX}-zlib"
   "${MINGW_PACKAGE_PREFIX}-zstd"
 )
-optdepends=(
-  "${MINGW_PACKAGE_PREFIX}-gtk-vnc: Contains gvncviewer. For connections to Qemu VNC server"
-  "${MINGW_PACKAGE_PREFIX}-spice-gtk: Contains spicy. For connections to Qemu SPICE server"
-  "${MINGW_PACKAGE_PREFIX}-virt-viewer: Contains remote-viewer. For connections to Qemu SPICE or VNC server"
-)
 source=(
   "https://download.qemu.org/${_tarname}.tar.xz"{,.sig}
   msys2.readme.txt
+  msys2.qemu-guest-agent.txt
   msys2.examples.tests.sh
 )
 sha256sums=(
-  '68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45'
+  'f6b375c7951f728402798b0baabb2d86478ca53d44cedbefabbe1c46bf46f839'
   'SKIP'
   '51625fd83c0a63729942d3dfc6d48be3491a700fe0f7cb8e88935b46081c9016'
-  '75723aade171bfe92082262819624df726f30122ccdd3a194584a3b74320f35d'
+  'f2f9eeb31023d002f54637a9941ea0d8fae3c6f0a66c05c033857b305bd1470d'
+  '3adcd2a37c975890c95e89538d6147872ea3d32b034edbedf5fafe8063bb62a1'
 )
 validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584') # Michael Roth <flukshun@gmail.com>
 # tar cannot create links, to keep build running, manual extraction is required
@@ -75,17 +116,15 @@ noextract=(${_tarname}.tar.xz)
 prepare() {
   [[ -d "${srcdir}"/${_tarname} ]] && rm -rf "${srcdir}"/${_tarname}
   # tar cannot create links here, therefore hide the failure
-  tar -xf ${srcdir}/${_tarname}.tar.xz -C ${srcdir} || true
-
-  cd "${srcdir}/${_tarname}"
+  tar -xf "${srcdir}"/${_tarname}.tar.xz -C "${srcdir}" || true
 }
 
 build() {
   LDFLAGS+=" -fstack-protector"
   [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -pv "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
 
-  # configure failes to create links, which can be ignored
+  # configure fails to create links, which can be ignored
   # qemu enables all features if possible, so keep it simple
   # For faster testing:
   #TARGETLIST="--target-list=x86_64-softmmu"
@@ -99,6 +138,10 @@ build() {
 
   # Finally build
   make
+  # TODO Remove widl-cmd as soon as qga-vss.tlb is generated by make
+  cd qga/vss-win32
+  widl -I${MINGW_PREFIX}/include -L${MINGW_PREFIX}/include \
+    -t "${srcdir}"/${_tarname}/qga/vss-win32/qga-vss.idl -o qga-vss.tlb
 }
 
 check() {
@@ -108,7 +151,7 @@ check() {
   make test || true
 }
 
-package() {
+makeinstall() {
   cd "${srcdir}"/build-${CARCH}
 
   # Install to ${pkgdir}
@@ -127,12 +170,76 @@ package() {
   mv -v share/qemu/icons share/
   mkdir -pv share/qemu/applications
   mv -v share/qemu/applications share/
+}
+
+makeinstallpkg() {
+  local _pkg=$1
+
+  makeinstall
+
+  echo
+  echo "Split installation into partitions"
+
+  cd "${pkgdir}"
+
+  # Start with all content in qemu partition
+  local _qemu=qemu/${MINGW_PREFIX}
+  mkdir -pv qemu
+  mv -v ./${MINGW_PREFIX} qemu/
+
+  # Move to qemu-guest-agent partition
+  local _qemu_ga=qemu-guest-agent/${MINGW_PREFIX}
+  mkdir -pv ${_qemu_ga}/bin ${_qemu_ga}/share/man/man7 ${_qemu_ga}/share/man/man8
+  mv -v ${_qemu}/bin/qemu-ga.exe  ${_qemu_ga}/bin/
+  mv -v ${_qemu}/share/man/man8/qemu-ga.8 ${_qemu_ga}/share/man/man8/
+  mv -v ${_qemu}/share/man/man7/qemu-ga-ref.7 ${_qemu_ga}/share/man/man7/
+
+  # Move to qemu-image-util partition
+  local _qemu_img=qemu-image-util/${MINGW_PREFIX}
+  mkdir -pv ${_qemu_img}/bin ${_qemu_img}/share/man/man1
+  mv -v ${_qemu}/bin/qemu-img.exe  ${_qemu_img}/bin/
+  mv -v ${_qemu}/share/man/man1/qemu-img.1 ${_qemu_img}/share/man/man1/
+
+  # Move to qemu-common partition
+  local _qemu_com=qemu-common/${MINGW_PREFIX}
+  mkdir -pv ${_qemu_com}/share/doc
+  mv -v ${_qemu}/share/doc/qemu  ${_qemu_com}/share/doc/
+
+  # Select requested partition and remove other partitions
+  echo
+  echo "Select partition ${_pkg} for packaging"
+  mv -v ${_pkg}/${MINGW_PREFIX} ./
+  rm -rf ${_qemu} ${_qemu_ga} ${_qemu_img} ${_qemu_com}
+
+  cd ./${MINGW_PREFIX}
+}
+
+package_qemu() {
+  # Split package depends
+  depends+=(
+    "${MINGW_PACKAGE_PREFIX}-qemu-common"
+    "${MINGW_PACKAGE_PREFIX}-qemu-guest-agent"
+    "${MINGW_PACKAGE_PREFIX}-qemu-image-util"
+  )
+  optdepends=(
+    "${MINGW_PACKAGE_PREFIX}-gtk-vnc: Contains gvncviewer. For connections to Qemu VNC server"
+    "${MINGW_PACKAGE_PREFIX}-spice-gtk: Contains spicy. For connections to Qemu SPICE server"
+    "${MINGW_PACKAGE_PREFIX}-virt-viewer: Contains remote-viewer. For connections to Qemu SPICE or VNC server"
+  )
+
+  makeinstallpkg qemu
 
   # Fix firmware descriptors
   # see https://bugzilla.redhat.com/show_bug.cgi?id=1728652#c7
   mkdir -pv share/qemu/firmware
   find share/qemu/firmware -type f -exec \
     sed -i "s%\(\"filename\"\s*:\s*\"\).*edk2%\1${MINGW_PREFIX}/share/qemu/edk2%" {} \;
+}
+
+package_qemu-common() {
+  depends=()
+
+  makeinstallpkg qemu-common
 
   # Add all licenses found in qemu sources to share/licences/qemu/
   mkdir -pv share/licenses/qemu
@@ -145,7 +252,77 @@ package() {
     ) | tar -C share/licenses/qemu -xv
 
   # Add msys2 docs
-  mkdir -pv share/doc/qemu
-  cp -pv "${srcdir}"/msys2.readme.txt share/doc/qemu/
-  cp -pv "${srcdir}"/msys2.examples.tests.sh share/doc/qemu/
+  install -v -Dm644 -t share/doc/qemu/ "${srcdir}"/msys2.readme.txt
+  install -v -Dm644 -t share/doc/qemu/ "${srcdir}"/msys2.qemu-guest-agent.txt
+  install -v -Dm755 -t share/doc/qemu/ "${srcdir}"/msys2.examples.tests.sh
 }
+
+package_qemu-guest-agent() {
+  depends=(
+    "${MINGW_PACKAGE_PREFIX}-gettext"
+    "${MINGW_PACKAGE_PREFIX}-gcc-libs"
+    "${MINGW_PACKAGE_PREFIX}-glib2"
+    "${MINGW_PACKAGE_PREFIX}-libc++"
+    "${MINGW_PACKAGE_PREFIX}-libiconv"
+    "${MINGW_PACKAGE_PREFIX}-libunwind"
+    "${MINGW_PACKAGE_PREFIX}-libwinpthread"
+    "${MINGW_PACKAGE_PREFIX}-pcre"
+  )
+  # Split package depends
+  depends+=(
+    "${MINGW_PACKAGE_PREFIX}-qemu-common"
+  )
+
+  makeinstallpkg qemu-guest-agent
+
+  # Upstream doesn't install, but creates qga.msi which contains these
+  install -v -Dm644 -t bin/ "${srcdir}"/build-${CARCH}/qga/vss-win32/qga-vss.dll
+  install -v -Dm644 -t bin/ "${srcdir}"/build-${CARCH}/qga/vss-win32/qga-vss.tlb
+}
+
+package_qemu-image-util() {
+  depends=(
+    "${MINGW_PACKAGE_PREFIX}-brotli"
+    "${MINGW_PACKAGE_PREFIX}-bzip2"
+    "${MINGW_PACKAGE_PREFIX}-curl"
+    "${MINGW_PACKAGE_PREFIX}-gcc-libs"
+    "${MINGW_PACKAGE_PREFIX}-gettext"
+    "${MINGW_PACKAGE_PREFIX}-glib2"
+    "${MINGW_PACKAGE_PREFIX}-gmp"
+    "${MINGW_PACKAGE_PREFIX}-gnutls"
+    "${MINGW_PACKAGE_PREFIX}-libiconv"
+    "${MINGW_PACKAGE_PREFIX}-libidn2"
+    "${MINGW_PACKAGE_PREFIX}-libffi"
+    "${MINGW_PACKAGE_PREFIX}-libnfs"
+    "${MINGW_PACKAGE_PREFIX}-libpsl"
+    "${MINGW_PACKAGE_PREFIX}-libssh"
+    "${MINGW_PACKAGE_PREFIX}-libssh2"
+    "${MINGW_PACKAGE_PREFIX}-libunistring"
+    "${MINGW_PACKAGE_PREFIX}-libtasn1"
+    "${MINGW_PACKAGE_PREFIX}-libwinpthread"
+    "${MINGW_PACKAGE_PREFIX}-nettle"
+    "${MINGW_PACKAGE_PREFIX}-nghttp2"
+    "${MINGW_PACKAGE_PREFIX}-openssl"
+    "${MINGW_PACKAGE_PREFIX}-pcre"
+    "${MINGW_PACKAGE_PREFIX}-p11-kit"
+    "${MINGW_PACKAGE_PREFIX}-zlib"
+    "${MINGW_PACKAGE_PREFIX}-zstd"
+  )
+  # Split package depends
+  depends+=(
+    "${MINGW_PACKAGE_PREFIX}-qemu-common"
+  )
+
+  makeinstallpkg qemu-image-util
+}
+
+# template start; name=mingw-w64-splitpkg-wrappers; version=1.0;
+# vim: set ft=bash :
+
+# generate wrappers
+for _name in "${pkgname[@]}"; do
+  _short="package_${_name#${MINGW_PACKAGE_PREFIX}-}"
+  _func="$(declare -f "${_short}")"
+  eval "${_func/#${_short}/package_${_name}}"
+done
+# template end;
diff --git a/mingw-w64-qemu/msys2.examples.tests.sh b/mingw-w64-qemu/msys2.examples.tests.sh
index 5234cc9a45..8127ab69a6 100755
--- a/mingw-w64-qemu/msys2.examples.tests.sh
+++ b/mingw-w64-qemu/msys2.examples.tests.sh
@@ -6,11 +6,11 @@ echo "----------------------"
 echo "Created to test Msys2 Qemu package, known to work for Cygwin and Linux, too."
 echo "Executed Qemu commandlines will be printed to screen."
 echo
-CONFIGFILE=~/.qemu.$(basename $0)
+CONFIGFILE="$(realpath ~/".qemu.$(basename $0)")"
 CONFIGFILENAME="$(basename $CONFIGFILE)"
 if [ ! -f "$CONFIGFILE" ]
 then
-	DOWNLOADDIR=$(realpath .)
+	DOWNLOADDIR="$(realpath .)"
 	echo "Configuring current directory '$DOWNLOADDIR' as download directory."
 	read -p "Continue? (y|[n]) " TEST
 	echo
@@ -19,7 +19,7 @@ then
 	touch "$DOWNLOADDIR/$CONFIGFILENAME" || exit 1
 	echo "$DOWNLOADDIR" > "$CONFIGFILE"
 fi
-DOWNLOADDIR=$(cat "$CONFIGFILE")
+DOWNLOADDIR="$(cat "$CONFIGFILE")"
 echo "Configuration file: '$CONFIGFILE'"
 echo "Download directory: '$DOWNLOADDIR'"
 if ! mkdir -p "$DOWNLOADDIR" || ! touch "$DOWNLOADDIR/$CONFIGFILENAME"
@@ -39,9 +39,10 @@ echo
 read -p "Audio input (microphone) accessible? ([y]|n) " TEST
 [ "n" != "$TEST" ] && MICROPHONE=1
 echo
-echo "Name block of qemu examples to execute."
-echo "Choose year of qemu-advent-calender (2014, 2016, 2018, 2020) or qemu-desktop (DVD)"
-read -p "Your choice? (2014|2016|2018|2020|[DVD]) " BLOCK
+echo "Name block of qemu examples/tests to execute."
+echo "Choose year of qemu-advent-calender (2014, 2016, 2018, 2020) or"
+echo " qemu-desktop (DVD), qemu-image-util (QIMG), qemu-guest-agent (QGA)"
+read -p "Your choice? (2014|2016|2018|2020|QIMG|QGA|[DVD]) " BLOCK
 echo
 if [ -n "$MINGW_PACKAGE_PREFIX" ]
 then
@@ -49,7 +50,7 @@ then
 	if [ "y" == "$REGRESSION" ]
 	then
 		echo "To execute as regression test, provide absolute paths of two"
-	        echo "$MINGW_PACKAGE_PREFIX-qemu-Archives to compare, leave empty otherwise."
+		echo "$MINGW_PACKAGE_PREFIX-qemu-Archives to compare, leave empty otherwise."
 		read -p "First  $MINGW_PACKAGE_PREFIX-qemu archive? " FIRSTQEMU
 		read -p "Second $MINGW_PACKAGE_PREFIX-qemu archive? " SECONDQEMU
 	fi
@@ -75,12 +76,12 @@ function download {
 }
 
 function removeDir {
-	local EXECDIR=$1
+	local EXECDIR="$1"
 	[ -n "$REMOVEEXECDIR" ] && [ -d "$EXECDIR" ] && rm -rfv $EXECDIR
 }
 
 function testImageInDir {
-	local EXECDIR=$1
+	local EXECDIR="$1"
 	[ -d "$EXECDIR" ] || mkdir -p "$EXECDIR"
 	[ -f "$EXECDIR/testimage.qcow2" ] || qemu-img create -f qcow2 "$EXECDIR/testimage.qcow2" 20G &> /dev/null
 }
@@ -97,7 +98,7 @@ function qWhich {
 		else
 			TESTDIR="$PATHHEAD"
 		fi
-		BINARY=$(ls "$TESTDIR/$1" 2> /dev/null | head)
+		BINARY="$(ls "$TESTDIR/$1" 2> /dev/null | head)"
 		if [ -n "$BINARY" ]
 		then
 			echo "$(dirname $BINARY)/$(basename $1)"
@@ -114,6 +115,7 @@ function showMsys2ArgConvEnv {
 
 function toolexec {
 	local LINE PARAM
+	echo "--------------------------------------------------------------------------------"
 	for PARAM in "${@}"
 	do
 		if [ "$PARAM" == "" ] || [[ $PARAM =~ ' ' ]]
@@ -123,6 +125,7 @@ function toolexec {
 		LINE="${LINE}${PARAM} "
 	done
 	echo "$LINE"
+	echo "--------------------------------------------------------------------------------"
 	"${@}"
 	echo
 }
@@ -165,7 +168,7 @@ function ignoreSize {
 }
 
 function isQemuSystem {
-	local ARCH
+	local ARCH=$1
 	which "qemu-system-$ARCH" &> /dev/null
 }
 
@@ -178,11 +181,33 @@ function isWindows {
 	       [ -f "$(qWhich qemu-system-x86_64).exe" ]
 }
 
+function hasElevatedWindowsPrivileges {
+	local TESTFILE="/c/Windows/.hasElevatedWindowsPrivileges"
+	if isWindows
+	then
+		# if not existent, test by creation (force-removal never returns != 0)
+		# if existent, test by removal
+		if ( ( [ ! -f "$TESTFILE" ] && touch "$TESTFILE" && rm -f "$TESTFILE" ) ||
+			( [ -f "$TESTFILE" ] && rm "$TESTFILE" ] ) )
+		then
+			return 0
+		else
+			echo
+			echo "Missing admin privileges, can't proceed."
+			return 1
+		fi
+	else
+		echo
+		echo "Depends on Windows, can't proceed."
+		return 1
+	fi
+}
+
 function killBackgroundQemu {
 	# Qemu stopped, if not exists
-	if [ -f $PIDFILE ]
+	if [ -f "$PIDFILE" ]
 	then
-		local PID=$(cat $PIDFILE)
+		local PID=$(cat "$PIDFILE")
 		if isWindows
 		then
 			PID=$( ps | grep "qemu-system" | grep "\b$PID\b" |
@@ -198,7 +223,7 @@ function killBackgroundQemu {
 			exit 1
 		fi
 	fi
-	rm -f $PIDFILE
+	rm -f "$PIDFILE"
 }
 
 function cygwinXlaunch {
@@ -242,10 +267,12 @@ function executeSpicyForBackgroundQemu {
 
 function checkBinary {
 	local PACKAGE=$1
-	PACKAGE=$(echo $PACKAGE | sed "s/^-//")
+	PACKAGE=$(echo $PACKAGE | sed "s/^${MINGW_PACKAGE_PREFIX}-//")
 	# Binary to test for package, if binary doesn't equal package name
-	declare -A BINARIES
+	local -A BINARIES
 	BINARIES["qemu"]="qemu-system-x86_64"
+	BINARIES["qemu-guest-agent"]="qemu-ga"
+	BINARIES["qemu-image-util"]="qemu-img"
 	BINARIES["gtk-vnc"]="gvncviewer"
 	BINARIES["spice-gtk"]="spicy"
 	BINARIES["p7zip"]="7z"
@@ -256,20 +283,25 @@ function checkBinary {
 
 function require {
 	# Don't require msys2-package even in msys2 shell!
-	if [ -n "$(checkBinary qemu)" ]
-	then
-		echo "Qemu is not in PATH: $PATH"
-		exit 1
-	fi
-
 	local MISSING_PKGS PACKAGE
 	echo "Testing for expected packages..."
 	for PACKAGE in "${@}"
 	do
+		# PACKAGE is prefixed package!
 		if [ -n "$MSYSTEM" ]
 		then
-			pacman -Q -i $PACKAGE &> /dev/null || MISSING_PKGS="$MISSING_PKGS $PACKAGE"
+			# for Msys2 "qemu-*"-packages "qemu"-package fulfills requirement
+			if ([ "$PACKAGE" == "${MINGW_PACKAGE_PREFIX}-qemu-guest-agent" ] ||
+				[ "$PACKAGE" == "${MINGW_PACKAGE_PREFIX}-qemu-image-util" ] ) &&
+				pacman -Q -i "${MINGW_PACKAGE_PREFIX}-qemu" &> /dev/null
+			then
+				echo "${MINGW_PACKAGE_PREFIX}-qemu fulfills $PACKAGE" > /dev/null
+			else
+				pacman -Q -i $PACKAGE &> /dev/null ||
+					MISSING_PKGS="$MISSING_PKGS $PACKAGE"
+			fi
 		else
+			# remove prefix from package
 			PACKAGE="$(checkBinary $PACKAGE)"
 			[ -z "$PACKAGE" ] || MISSING_PKGS="$MISSING_PKGS $PACKAGE"
 		fi
@@ -290,6 +322,35 @@ function require {
 	fi
 }
 
+function isQemuPkgCompatible {
+	local QARC="$1"
+	[ -f "$QARC" ] && [[ $QARC =~ ${MINGW_PACKAGE_PREFIX}-qemu-[0-9] ]]
+}
+
+function regTestReplace {
+	local QARC="$1"
+
+	# Uninstall previous qemu package with qemu deps
+	local Q_ALL_OLD_PKGS=$(pacman -Q -s "${MINGW_PACKAGE_PREFIX}-qemu.*" |
+		grep "^local" | sed "s%local/%%" | sed "s/ .*//")
+	[ -z "$Q_ALL_OLD_PKGS" ] || pacman --noconfirm -R $Q_ALL_OLD_PKGS &> /dev/null
+
+	# Install next qemu package with qemu deps
+	if pacman --noconfirm -U "$QARC" 2>&1 | grep "cannot resolve" | grep qemu &> /dev/null
+	then
+		# Not installed because of missing deps, determine deps and install along
+		local Q_DEPS=$(pacman --noconfirm -U  "$QARC" 2>&1 |
+			grep "cannot resolve" | grep qemu | sed "s/[^\"]*\"//" | sed "s/\".*//") QDEP
+		local -a Q_DEP_ARCS=("$QARC")
+		for DEP in $Q_DEPS
+		do
+			DEP="$(echo $QARC | sed "s/${MINGW_PACKAGE_PREFIX}-qemu/$DEP/")"
+			Q_DEP_ARCS+=("$DEP")
+		done
+		pacman --noconfirm -U "${Q_DEP_ARCS[@]}" &> /dev/null
+	fi
+}
+
 function perform {
 	local FUN=$1
 	if [ -n "$DIR" ]
@@ -305,15 +366,15 @@ function perform {
 	echo 
 	read -p "Execute $FUN? (y|[n]) " TEST
 	[ "y" == "$TEST" ] || return 0
-	if [ -f "$FIRSTQEMU" ] && [ -f "$SECONDQEMU" ]
+	if isQemuPkgCompatible "$FIRSTQEMU" && isQemuPkgCompatible "$SECONDQEMU"
 	then
 		echo
-		pacman --noconfirm -U $FIRSTQEMU &> /dev/null
+		regTestReplace "$FIRSTQEMU"
 		echo "First part of regression test with $(basename $FIRSTQEMU)"
 		echo
 		$FUN
 		echo
-		pacman --noconfirm -U $SECONDQEMU &> /dev/null
+		regTestReplace "$SECONDQEMU"
 		echo "Second part of regression test with $(basename $SECONDQEMU)"
 		$FUN
 	else
@@ -323,13 +384,13 @@ function perform {
 }
 
 function extractReadme {
-	local FILE=$1
+	local FILE="$1"
 	[ -f "$FILE" ] || return 0
 	local TXT=0
 	local LINE
 	local EOF="EOF"
 	# Print the first HERE-Document to screen
-	cat $FILE | while read LINE
+	while read LINE
 	do
 		if [ "$TXT" == "1" ]
 		then
@@ -337,7 +398,7 @@ function extractReadme {
 		else
 			[[ $LINE =~ $EOF ]] && TXT=1
 		fi
-	done
+	done < "$FILE"
 }
 
 function qemuMinVersion {
@@ -365,7 +426,7 @@ function determineAccel {
 	for TESTACCEL in $TESTACCELS
 	do
 		echo "Testing Acceleration $TESTACCEL..."
-		qemu-system-x86_64 -accel $TESTACCEL -display none -pidfile $PIDFILE &> /dev/null &
+		qemu-system-x86_64 -accel $TESTACCEL -display none -pidfile "$PIDFILE" &> /dev/null &
 		sleep 1
 		[ -f "$PIDFILE" ] && ACCEL=$TESTACCEL && killBackgroundQemu &> /dev/null && break
 	done
@@ -382,7 +443,7 @@ function accel {
 function firmware {
 	local FW_NAME="$1"
 
-	local BINDIR="$(dirname $(qWhich qemu-system-x86_64))"
+	local BINDIR="$(dirname "$(qWhich qemu-system-x86_64)")"
 	local COMMON_FW="$BINDIR/../share/qemu"
 	local MSYS_FW_OLD="$BINDIR/../lib/qemu"
 	local DIST="$BINDIR"
@@ -448,1112 +509,1313 @@ function audioq35 {
 
 # UEFI-Pflash-Desktop (LiveImage)
 function qemuLiveDesktopUEFI_Pflash {
-local ACCEL=$( [ "$1" != "noaccel" ] && echo $(accel))
-local TESTDIR="uefi_pflash$( [ "$1" != "noaccel" ] && echo "_accel" )"
-download $LIVE_IMAGE_URL
-testImageInDir $TESTDIR
-# Fails with -accel whpx
-# qemu-system-x86_64.exe: WHPX: Failed to emulate MMIO access with EmulatorReturnStatus: 2
-# qemu-system-x86_64.exe: WHPX: Failed to exec a virtual processor
-echo "Instanciate VARS-Firmware to VM dir for r/w pflash access:"
-firmwareAvailable edk2-i386-vars.fd &&
-(
-echo "cp '$(firmware edk2-i386-vars.fd)' $TESTDIR/"
-echo
-cp "$(firmware edk2-i386-vars.fd)" $TESTDIR/
-firmwareAvailable edk2-x86_64-code.fd &&
-execute qemu-system-x86_64 -M q35 -m 1536 $ACCEL $(audioq35) \
-	-drive "file=$(firmware edk2-x86_64-code.fd),if=pflash,format=raw,readonly=on" \
-	-drive file=$TESTDIR/edk2-i386-vars.fd,if=pflash,format=raw,readonly=off \
-	-cdrom $LIVE_IMAGE_FILE -drive file=$TESTDIR/testimage.qcow2,media=disk
-)
-removeDir $TESTDIR
+	local TESTDIR="uefi_pflash$( [ "$1" != "noaccel" ] && echo "_accel" )"
+	download $LIVE_IMAGE_URL
+	testImageInDir $TESTDIR
+	# Fails with -accel whpx
+	# qemu-system-x86_64.exe: WHPX: Failed to emulate MMIO access with EmulatorReturnStatus: 2
+	# qemu-system-x86_64.exe: WHPX: Failed to exec a virtual processor
+	echo "Instanciate VARS-Firmware to VM dir for r/w pflash access:"
+	firmwareAvailable edk2-i386-vars.fd &&
+	(
+		echo "cp '$(firmware edk2-i386-vars.fd)' $TESTDIR/"
+		echo
+		cp "$(firmware edk2-i386-vars.fd)" $TESTDIR/
+		firmwareAvailable edk2-x86_64-code.fd &&
+		execute qemu-system-x86_64 -M q35 -m 1536 $(audioq35) \
+			$( [ "$1" != "noaccel" ] && echo $(accel)) \
+			-drive "file=$(firmware edk2-x86_64-code.fd),if=pflash,format=raw,readonly=on" \
+			-drive file=$TESTDIR/edk2-i386-vars.fd,if=pflash,format=raw,readonly=off \
+			-cdrom $LIVE_IMAGE_FILE -drive file=$TESTDIR/testimage.qcow2,media=disk
+	)
+	removeDir $TESTDIR
 }
 
-# UEFI-Pflash-Desktop Accelerated (LiveImage)
+# UEFI-Pflash-Desktop NOT Accelerated (LiveImage)
 function qemuLiveDesktopUEFI_Pflash_Noaccel {
 	qemuLiveDesktopUEFI_Pflash noaccel
 }
 
 # UEFI-Bios-Desktop (LiveImage)
 function qemuLiveDesktopUEFI_Bios {
-local ACCEL=$( [ "$1" != "noaccel" ] && echo $(accel))
-local TESTDIR="uefi_bios$( [ "$1" != "noaccel" ] && echo "_accel" )"
-download $LIVE_IMAGE_URL
-testImageInDir $TESTDIR
-echo "Concatenate VARS- and CODE-Firmware in VM dir for usage as bios:"
-firmwareAvailable edk2-i386-vars.fd edk2-x86_64-code.fd &&
-(
-echo "cat '$(firmware edk2-i386-vars.fd)' '$(firmware edk2-x86_64-code.fd)' > $TESTDIR/edk2-x86_64.fd"
-echo
-cat "$(firmware edk2-i386-vars.fd)" "$(firmware edk2-x86_64-code.fd)" > $TESTDIR/edk2-x86_64.fd
-execute qemu-system-x86_64 -M q35 -m 1536 $ACCEL $(audioq35) \
-	-bios $TESTDIR/edk2-x86_64.fd \
-	-cdrom $LIVE_IMAGE_FILE -drive file=$TESTDIR/testimage.qcow2,media=disk
-)
-removeDir $TESTDIR
+	local TESTDIR="uefi_bios$( [ "$1" != "noaccel" ] && echo "_accel" )"
+	download $LIVE_IMAGE_URL
+	testImageInDir $TESTDIR
+	echo "Concatenate VARS- and CODE-Firmware in VM dir for usage as bios:"
+	firmwareAvailable edk2-i386-vars.fd edk2-x86_64-code.fd &&
+	(
+		echo "cat '$(firmware edk2-i386-vars.fd)' '$(firmware edk2-x86_64-code.fd)' > $TESTDIR/edk2-x86_64.fd"
+		echo
+		cat "$(firmware edk2-i386-vars.fd)" "$(firmware edk2-x86_64-code.fd)" > $TESTDIR/edk2-x86_64.fd
+		execute qemu-system-x86_64 -M q35 -m 1536 $(audioq35) \
+			$( [ "$1" != "noaccel" ] && echo $(accel)) \
+			-bios $TESTDIR/edk2-x86_64.fd \
+			-cdrom $LIVE_IMAGE_FILE -drive file=$TESTDIR/testimage.qcow2,media=disk
+	)
+	removeDir $TESTDIR
 }
 
-# UEFI-Bios-Desktop Accelerated (LiveImage)
+# UEFI-Bios-Desktop NOT Accelerated (LiveImage)
 function qemuLiveDesktopUEFI_Bios_Noaccel {
 	qemuLiveDesktopUEFI_Bios noaccel
 }
 
 # SDL-Desktop (LiveImage)
 function qemuLiveDesktopSDL {
-download $LIVE_IMAGE_URL
-testImageInDir sdl
-execute qemu-system-x86_64 -M q35 $(accel) -m 1536 \
-	-display sdl $(audioq35 hda-duplex) \
-	-cdrom $LIVE_IMAGE_FILE -drive file=sdl/testimage.qcow2,media=disk
-removeDir sdl
+	download $LIVE_IMAGE_URL
+	testImageInDir sdl
+	execute qemu-system-x86_64 -M q35 $(accel) -m 1536 \
+		-display sdl $(audioq35 hda-duplex) \
+		-cdrom $LIVE_IMAGE_FILE -drive file=sdl/testimage.qcow2,media=disk
+	removeDir sdl
 }
 
 # GTK-Desktop (LiveImage)
 function qemuLiveDesktopGTK {
-download $LIVE_IMAGE_URL
-testImageInDir gtk
-execute qemu-system-x86_64 -M q35 $(accel) -m 1536 \
-	-display gtk $(audioq35 hda-micro) \
-	-cdrom $LIVE_IMAGE_FILE -drive file=gtk/testimage.qcow2,media=disk
-removeDir gtk
+	download $LIVE_IMAGE_URL
+	testImageInDir gtk
+	execute qemu-system-x86_64 -M q35 $(accel) -m 1536 \
+		-display gtk $(audioq35 hda-micro) \
+		-cdrom $LIVE_IMAGE_FILE -drive file=gtk/testimage.qcow2,media=disk
+	removeDir gtk
 }
 
 # VNC-Desktop (LiveImage)
 function qemuLiveDesktopVNC {
-download $LIVE_IMAGE_URL
-testImageInDir vnc
-cygwinXlaunch
-execute qemu-system-x86_64 -M q35 $(accel) -m 1536 -pidfile $PIDFILE \
-	-display vnc=:05 -k de $(audioq35 hda-duplex) \
-	-cdrom $LIVE_IMAGE_FILE -drive file=vnc/testimage.qcow2,media=disk &
-executeVncForBackgroundQemu
-removeDir vnc
+	download $LIVE_IMAGE_URL
+	testImageInDir vnc
+	cygwinXlaunch
+	execute qemu-system-x86_64 -M q35 $(accel) -m 1536 -pidfile "$PIDFILE" \
+		-display vnc=:05 -k de $(audioq35 hda-duplex) \
+		-cdrom $LIVE_IMAGE_FILE -drive file=vnc/testimage.qcow2,media=disk &
+	executeVncForBackgroundQemu
+	removeDir vnc
 }
 
 # Spice-Desktop (LiveImage)
 function qemuLiveDesktopSPICE {
-download $LIVE_IMAGE_URL
-testImageInDir spice
-cygwinXlaunch
-execute qemu-system-x86_64 -M q35 $(accel) -m 1536 -pidfile $PIDFILE $(audioq35 hda-micro) \
-	-vga qxl -spice port=5905,addr=127.0.0.1,disable-ticketing=on \
-	-device virtio-serial -chardev spicevmc,id=spicechannel0,name=vdagent \
-	-device virtserialport,chardev=spicechannel0,name=com.redhat.spice.0 \
-	-cdrom $LIVE_IMAGE_FILE -drive file=spice/testimage.qcow2,media=disk &
-executeSpicyForBackgroundQemu
-removeDir spice
+	download $LIVE_IMAGE_URL
+	testImageInDir spice
+	cygwinXlaunch
+	execute qemu-system-x86_64 -M q35 $(accel) -m 1536 -pidfile "$PIDFILE" $(audioq35 hda-micro) \
+		-vga qxl -spice port=5905,addr=127.0.0.1,disable-ticketing=on \
+		-device virtio-serial -chardev spicevmc,id=spicechannel0,name=vdagent \
+		-device virtserialport,chardev=spicechannel0,name=com.redhat.spice.0 \
+		-cdrom $LIVE_IMAGE_FILE -drive file=spice/testimage.qcow2,media=disk &
+	executeSpicyForBackgroundQemu
+	removeDir spice
 }
 
-# Desktop (for qemu-img)
+# For qemu-img
 function qemuLiveDesktopQemuImgOperations {
-download $LIVE_IMAGE_URL
-local ACCEL=$(accel)
-local TESTDIR="qemu-img"
-mkdir -p $TESTDIR
-echo
-toolexec qemu-img convert -f raw $LIVE_IMAGE_FILE -O qcow2 $TESTDIR/iso.qcow2
-toolexec qemu-img snapshot -c CONVERTED $TESTDIR/iso.qcow2
-toolexec qemu-img create -f qcow2 $TESTDIR/rebase.qcow2 20G
-toolexec qemu-img rebase -F qcow2 -b rebase.qcow2 -f qcow2 $TESTDIR/iso.qcow2
-toolexec qemu-img snapshot -c REBASED $TESTDIR/iso.qcow2
-toolexec qemu-img commit $TESTDIR/iso.qcow2
-toolexec qemu-img compare -f raw $LIVE_IMAGE_FILE -F qcow2 $TESTDIR/rebase.qcow2
-toolexec qemu-system-x86_64 -M q35 -m 1536 $ACCEL $TESTDIR/rebase.qcow2
-echo ">>> $TESTDIR/rebase.qcow2 was probably modified by qemu-system-x86_64 <<<"
-toolexec qemu-img compare -f raw $LIVE_IMAGE_FILE -F qcow2 $TESTDIR/rebase.qcow2
-toolexec qemu-img check $TESTDIR/rebase.qcow2
-toolexec qemu-img snapshot -l $TESTDIR/iso.qcow2
-toolexec qemu-img rebase -b '' -f qcow2 $TESTDIR/iso.qcow2
-toolexec rm $TESTDIR/rebase.qcow2
-toolexec qemu-img compare -f raw $LIVE_IMAGE_FILE -F qcow2 $TESTDIR/iso.qcow2
-toolexec qemu-img check $TESTDIR/iso.qcow2
-toolexec qemu-img snapshot -a REBASED $TESTDIR/iso.qcow2
-toolexec qemu-img compare -f raw $LIVE_IMAGE_FILE -F qcow2 $TESTDIR/iso.qcow2
-toolexec qemu-img snapshot -d REBASED $TESTDIR/iso.qcow2
-toolexec qemu-img snapshot -l $TESTDIR/iso.qcow2
-removeDir $TESTDIR
+	download $LIVE_IMAGE_URL
+	local TESTDIR="qemu-img-operations"
+	mkdir -p $TESTDIR
+	echo
+	echo "Convert iso file to image file iso.qcow2"
+	execute qemu-img convert -f raw $LIVE_IMAGE_FILE -O qcow2 $TESTDIR/iso.qcow2 
+	echo "In iso.qcow2 create snapshot CONVERTED"
+	toolexec qemu-img snapshot -c CONVERTED $TESTDIR/iso.qcow2 
+	echo "Create image file rebase.qcow2"
+	toolexec qemu-img create -f qcow2 $TESTDIR/rebase.qcow2 20G
+	echo "Rebase iso.qcow2 from standalone to rebase.qcow2"
+	execute qemu-img rebase -F qcow2 -b rebase.qcow2 -f qcow2 $TESTDIR/iso.qcow2
+	echo "In iso.qcow2 create snapshot REBASED"
+	toolexec qemu-img snapshot -c REBASED $TESTDIR/iso.qcow2
+	echo "Commit all content in iso.qcow2 to its base image rebase.qcow2"
+	toolexec qemu-img commit $TESTDIR/iso.qcow2
+	echo "Compare iso file with rebase.qcow2 after commit: Images are identical"
+	execute qemu-img compare -f raw $LIVE_IMAGE_FILE -F qcow2 $TESTDIR/rebase.qcow2
+	echo
+	if isQemuSystem x86_64
+	then
+		echo "Start VM to modify image rebase.qcow2 and thus corrupt iso.qcow2"
+		execute qemu-system-x86_64 -display none -M q35 -m 1536 -pidfile "$PIDFILE" \
+			$(accel) $TESTDIR/rebase.qcow2 &
+		sleep 30
+		killBackgroundQemu
+	else
+		echo "Can't modify image rebase.qcow2 without qemu-system-x86_64 installed!"
+	fi
+	echo
+	echo "Compare iso file with rebase.qcow2 after commit: Content should mismatch now!"
+	execute qemu-img compare -f raw $LIVE_IMAGE_FILE -F qcow2 $TESTDIR/rebase.qcow2
+	echo
+	toolexec qemu-img snapshot -l $TESTDIR/iso.qcow2
+	echo "Rebase iso.qcow2 from its base image rebase.qcow2 to standalone."
+	execute qemu-img rebase -b '' -f qcow2 $TESTDIR/iso.qcow2
+	echo "Remove now obsolete image rebase.qcow2."
+	toolexec rm $TESTDIR/rebase.qcow2
+	echo "Compare iso file with iso.qcow2 after rebase: Content should still mismatch!"
+	execute qemu-img compare -f raw $LIVE_IMAGE_FILE -F qcow2 $TESTDIR/iso.qcow2
+	echo
+	echo "In iso.qcow2 apply its snapshot REBASED: iso.qcow2 contains all necessary data"
+	toolexec qemu-img snapshot -a REBASED $TESTDIR/iso.qcow2
+	echo "Compare iso file with iso.qcow2 after snapshot recovery: Images are identical"
+	execute qemu-img compare -f raw $LIVE_IMAGE_FILE -F qcow2 $TESTDIR/iso.qcow2
+	echo
+	echo "On iso.qcow2 remove its snapshot REBASED"
+	toolexec qemu-img snapshot -d REBASED $TESTDIR/iso.qcow2
+	echo
+	toolexec qemu-img snapshot -l $TESTDIR/iso.qcow2
+	removeDir $TESTDIR
+}
+
+# For qemu-img
+function qemuLiveDesktopQemuImgConversions {
+	# https://www.qemu.org/docs/master/system/images.html
+	# Conversion tests with qcow qcow2 qed raw vdi vhdx vmdk vpc
+	download $LIVE_IMAGE_URL
+	local IMG_SIZE=$(qemu-img info "$LIVE_IMAGE_FILE" |
+		grep bytes | sed "s/.*(//" | sed "s/ bytes.*//")
+
+	local TESTDIR="qemu-img-conversion" FMT
+	mkdir -p $TESTDIR
+
+	FMT=raw
+	local ISO_IMAGE="$LIVE_IMAGE_FILE"
+	local ISO_IMAGE_OPTS="driver=$FMT,file.driver=file,file.filename=$LIVE_IMAGE_FILE"
+
+	FMT=vmdk
+	local VMDK_IMAGE="$TESTDIR/$FMT"
+	local VMDK_IMAGE_OPTS="driver=$FMT,file.driver=file,file.filename=$TESTDIR/$FMT"
+	execute qemu-img convert -p -f raw "$ISO_IMAGE" -O vmdk "$VMDK_IMAGE"
+
+	FMT=qcow2
+	local QCOW2_OPTS_CRYPT="encrypt.format=luks,encrypt.key-secret=${FMT}secret"
+	local QCOW2_IMAGE="$TESTDIR/$FMT"
+	local QCOW2_SECRET="secret,id=${FMT}secret,file=$TESTDIR/.secret$FMT"
+	local QCOW2_IMAGE_OPTS="driver=$FMT,file.driver=file,file.filename=$TESTDIR/$FMT,$QCOW2_OPTS_CRYPT"
+	echo "Valid UTF-8 secret for $FMT" > "$TESTDIR/.secret$FMT"
+	execute qemu-img create --object "$QCOW2_SECRET" -o "$QCOW2_OPTS_CRYPT" -f qcow2 "$QCOW2_IMAGE" "$IMG_SIZE"
+	execute qemu-img convert -p -n --image-opts "$VMDK_IMAGE_OPTS" \
+		--object "$QCOW2_SECRET" --target-image-opts "$QCOW2_IMAGE_OPTS"
+
+	FMT=qcow
+	local QCOW_OPTS_CRYPT="encrypt.format=aes,encrypt.key-secret=${FMT}secret"
+	local QCOW_IMAGE="$TESTDIR/$FMT"
+	local QCOW_SECRET="secret,id=${FMT}secret,file=$TESTDIR/.secret$FMT"
+	local QCOW_IMAGE_OPTS="driver=$FMT,file.driver=file,file.filename=$TESTDIR/$FMT,$QCOW_OPTS_CRYPT"
+	echo "Valid UTF-8 secret for $FMT" > "$TESTDIR/.secret$FMT"
+	execute qemu-img create --object "$QCOW_SECRET" -o "$QCOW_OPTS_CRYPT" -f qcow "$QCOW_IMAGE" "$IMG_SIZE"
+	execute qemu-img convert -p -n --object "$QCOW2_SECRET" --image-opts "$QCOW2_IMAGE_OPTS" \
+		--object "$QCOW_SECRET" --target-image-opts "$QCOW_IMAGE_OPTS"
+
+	FMT=qed
+	local QED_IMAGE="$TESTDIR/$FMT"
+	execute qemu-img create -f qed "$QED_IMAGE" "$IMG_SIZE"
+	execute qemu-img convert -p -n --object "$QCOW_SECRET" --image-opts "$QCOW_IMAGE_OPTS" -O qed "$QED_IMAGE"
+
+	FMT=vdi
+	local VDI_IMAGE="$TESTDIR/$FMT"
+	execute qemu-img create -f vdi "$VDI_IMAGE" "$IMG_SIZE"
+	execute qemu-img convert -p -n -f qed "$QED_IMAGE" -O vdi "$VDI_IMAGE"
+
+	FMT=vhdx
+	local VHDX_IMAGE="$TESTDIR/$FMT"
+	local VHDX_IMAGE_OPTS="driver=$FMT,file.driver=file,file.filename=$TESTDIR/$FMT"
+	local VHDX_OPTS="block_size=1M"
+	execute qemu-img create -o "$VHDX_OPTS" -f vhdx "$VHDX_IMAGE" "$IMG_SIZE"
+	execute qemu-img convert -p -n -f vdi "$VDI_IMAGE" -O vhdx "$VHDX_IMAGE"
+
+	FMT=vpc
+	local VPC_IMAGE="$TESTDIR/$FMT"
+	local VPC_IMAGE_OPTS="driver=$FMT,file.driver=file,file.filename=$TESTDIR/$FMT"
+	local VPC_OPTS="force_size=on"
+	execute qemu-img create -o "$VPC_OPTS" -f vpc "$VPC_IMAGE" "$IMG_SIZE"
+	execute qemu-img convert -p -n -f vhdx "$VHDX_IMAGE" -O vpc "$VPC_IMAGE"
+
+	FMT=raw
+	local RAW_IMAGE="$TESTDIR/$FMT"
+	execute qemu-img create -f raw "$RAW_IMAGE" "$IMG_SIZE"
+	execute qemu-img convert -p -n -f vpc "$VPC_IMAGE" -O raw "$RAW_IMAGE"
+
+	# Correct transition check
+	execute qemu-img compare -p -f raw "$ISO_IMAGE" -F raw "$RAW_IMAGE"
+
+	ls -lS $TESTDIR
+	removeDir $TESTDIR
+}
+
+# For qemu guest support
+function qemuLiveDesktopQemuGuestSupport {
+	download $LIVE_IMAGE_URL
+	cygwinXlaunch
+	execute qemu-system-x86_64 -M q35 $(accel) -m 1536 -pidfile "$PIDFILE" \
+		-vga qxl -spice port=5905,addr=127.0.0.1,disable-ticketing=on \
+		-device virtio-serial -chardev spicevmc,id=spicechannel0,name=vdagent \
+		-device virtserialport,chardev=spicechannel0,name=com.redhat.spice.0 \
+		-chardev socket,id=qga0,port=5906,host=127.0.0.1,server=on,wait=off \
+		-device virtserialport,chardev=qga0,name=org.qemu.guest_agent.0 \
+		-cdrom $LIVE_IMAGE_FILE &
+	sleep 4
+	echo
+	echo '{"execute": "guest-shutdown"}' | socat - tcp-connect:127.0.0.1:5906
+	echo "The shutdown message has been sent to QEMU Guest Agent:"
+	echo "echo '{\"execute\": \"guest-shutdown\"}' | socat - tcp-connect:127.0.0.1:5906"
+	echo
+	sleep 4
+	echo "After startup please install QEMU Guest Agent. Open a terminal and paste:"
+	echo "sudo zypper install -y qemu-guest-agent"
+	sleep 4
+	spicy -h localhost -p 5905 2> /dev/null
+	sleep 1
+	killBackgroundQemu
+	wait
+}
+
+# For qemu-ga - Windows only
+function qemuElevatedInstallWinGuestAgent {
+	if hasElevatedWindowsPrivileges
+	then
+		local QGA="QEMU Guest Agent"
+		local QGA_VSS="QEMU Guest Agent VSS Provider"
+		local QGA_RUN QGA_REG QGA_VSS_RUN QGA_VSS_REG TEST
+		echo
+		echo "Do NOT execute this test!"
+		echo "Finally tested Msys2 QEMU Guest Agent will replace current QEMU Guest Agent."
+		echo "Current service settings should be restored using tested Msys2 QEMU Guest Agent."
+		echo
+		echo "Your QEMU Guest Agent settings may break!"
+		read -p "Go on? (y|[n]) " TEST
+		if [ "y" == "$TEST" ]
+		then
+			echo
+			echo "------------------------"
+			echo "Stop and unregister current QEMU Guest Agent"
+			echo "------------------------"
+			vssadmin list providers | grep -A3 "$QGA_VSS"
+			net stop "$QGA_VSS" && QGA_VSS_RUN="y"
+			# return value for vss-uninstall is not reliable
+			2>&1 qemu-ga -s vss-uninstall | grep -C2 "Removing COM+ Application" && QGA_VSS_REG="y"
+			net stop "$QGA" && QGA_RUN="y"
+			# return value for uninstall is not reliable
+			2>&1 qemu-ga -s uninstall | grep -C2 "Service was deleted successfully" && QGA_REG="y"
+			if [ -n "$QGA_RUN" ] && [ -z "$QGA_REG" ]
+			then
+				echo "$QGA was running, but not registered."
+				read -p "Registration is required for start. Register? (y|[n]) " QGA_REG
+				[ "$QGA_REG" != "y" ] && QGA_REG="" && QGA_RUN=""
+			fi
+			echo
+			echo "------------------------"
+			echo "Register, start and test Msys2 QEMU Guest Agent"
+			echo "------------------------"
+			if qemu-ga -s install
+			then
+				vssadmin list providers | grep -A3 "$QGA_VSS"
+				if net start "$QGA"
+				then
+					echo
+					echo "Send test requests to $QGA now!"
+					read -p "All test requests sent? RETURN " TEST
+					net stop "$QGA"
+				fi
+				# Microsoft tools: diskshadow vshadow
+				net start "$QGA_VSS"
+				net stop "$QGA_VSS"
+				qemu-ga -s vss-uninstall
+				qemu-ga -s vss-install
+			fi
+			echo
+			echo "------------------------"
+			echo "Restore service settings with tested Msys2 QEMU Guest Agent"
+			echo "------------------------"
+			# Assumption: $QGA and $QGA_VSS are currently registered
+			if [ -z "$QGA_REG" ]
+			then
+				qemu-ga -s uninstall
+				[ -n "$QGA_VSS_REG" ] && qemu-ga -s vss-install
+			else
+				[ -z "$QGA_VSS_REG" ] && qemu-ga -s vss-uninstall
+			fi
+			vssadmin list providers | grep -A3 "$QGA_VSS"
+			# Only start services, if services were started before
+			[ -n "$QGA_VSS_RUN" ] && net start "$QGA_VSS"
+			[ -n "$QGA_RUN" ] && net start "$QGA"
+		fi
+	fi
 }
 
 # Extended SDL-Desktop (HDImage)
 function qemuInstalledDesktopSDL {
-local IMAGE='d:\Qemu\test\test-usernet.qcow2'
-[ -f "$IMAGE" ] || return 0
-execute qemu-system-x86_64 -M q35 $(accel) -m 1G \
-	-display sdl $(audioq35 hda-micro) \
-	-netdev user,id=un0,hostfwd=tcp::2222-:22 -device virtio-net,netdev=un0 \
-	-drive file="$IMAGE",media=disk,if=none,id=drive0,discard=unmap,detect-zeroes=unmap \
-	-device virtio-scsi,id=scsi0 -device scsi-hd,bus=scsi0.0,drive=drive0
+	local IMAGE='d:\Qemu\test\test-usernet.qcow2'
+	[ -f "$IMAGE" ] || return 0
+	execute qemu-system-x86_64 -M q35 $(accel) -m 1G \
+		-display sdl $(audioq35 hda-micro) \
+		-netdev user,id=un0,hostfwd=tcp::2222-:22 -device virtio-net,netdev=un0 \
+		-drive file="$IMAGE",media=disk,if=none,id=drive0,discard=unmap,detect-zeroes=unmap \
+		-device virtio-scsi,id=scsi0 -device scsi-hd,bus=scsi0.0,drive=drive0
 }
 
 # Extended GTK-Desktop (HDImage)
 function qemuInstalledDesktopGTK {
-local IMAGE='/d/Qemu/test/test-usernet.qcow2'
-[ -f "$IMAGE" ] || return 0
-execute qemu-system-x86_64 -M q35 $(accel) -m 1G \
-	-display gtk $(audioq35 hda-duplex) \
-	-netdev user,id=un0,hostfwd=tcp::2222-:22 -device virtio-net,netdev=un0 \
-	-drive file="$IMAGE",media=disk,if=none,id=drive0,discard=unmap,detect-zeroes=unmap \
-	-device virtio-scsi,id=scsi0 -device scsi-hd,bus=scsi0.0,drive=drive0
+	local IMAGE='/d/Qemu/test/test-usernet.qcow2'
+	[ -f "$IMAGE" ] || return 0
+	execute qemu-system-x86_64 -M q35 $(accel) -m 1G \
+		-display gtk $(audioq35 hda-duplex) \
+		-netdev user,id=un0,hostfwd=tcp::2222-:22 -device virtio-net,netdev=un0 \
+		-drive file="$IMAGE",media=disk,if=none,id=drive0,discard=unmap,detect-zeroes=unmap \
+		-device virtio-scsi,id=scsi0 -device scsi-hd,bus=scsi0.0,drive=drive0
 }
 
 # Extended VNC-Desktop (HDImage)
 function qemuInstalledDesktopVNC1 {
-local IMAGE='\Qemu\test\test-usernet.qcow2'
-[ -f "$IMAGE" ] || return 0
-cygwinXlaunch
-execute qemu-system-x86_64 -M q35 $(accel) -m 1G -pidfile $PIDFILE \
-	-display vnc=:05 -k de $(audioq35 hda-micro) \
-	-netdev user,id=un0,hostfwd=tcp::2222-:22 -device virtio-net,netdev=un0 \
-	-drive file="$IMAGE",media=disk,if=none,id=drive0,discard=unmap,detect-zeroes=unmap \
-	-device virtio-scsi,id=scsi0 -device scsi-hd,bus=scsi0.0,drive=drive0 &
-executeVncForBackgroundQemu
+	local IMAGE='\Qemu\test\test-usernet.qcow2'
+	[ -f "$IMAGE" ] || return 0
+	cygwinXlaunch
+	execute qemu-system-x86_64 -M q35 $(accel) -m 1G -pidfile "$PIDFILE" \
+		-display vnc=:05 -k de $(audioq35 hda-micro) \
+		-netdev user,id=un0,hostfwd=tcp::2222-:22 -device virtio-net,netdev=un0 \
+		-drive file="$IMAGE",media=disk,if=none,id=drive0,discard=unmap,detect-zeroes=unmap \
+		-device virtio-scsi,id=scsi0 -device scsi-hd,bus=scsi0.0,drive=drive0 &
+	executeVncForBackgroundQemu
 }
 
 # Extended VNC-Desktop (HDImage) with tap-Network and host configuation of tapDevices
 function qemuInstalledDesktopVNC2 {
-local IMAGE='d:\Qemu\test\test.qcow2'
-[ -f "$IMAGE" ] || return 0
-cygwinXlaunch
-execute qemu-system-x86_64 -M q35 $(accel) -m 1G -pidfile $PIDFILE \
-	-display vnc=:05 -k de $(audioq35 hda-micro) \
-	-netdev tap,ifname=qemuTap05,id=tap0 -device virtio-net,netdev=tap0,mac=00:00:00:00:00:05 \
-	-drive file="$IMAGE",media=disk,if=none,id=drive0,discard=unmap,detect-zeroes=unmap \
-	-device virtio-scsi,id=scsi0 -device scsi-hd,bus=scsi0.0,drive=drive0 &
-executeVncForBackgroundQemu
+	local IMAGE='d:\Qemu\test\test.qcow2'
+	[ -f "$IMAGE" ] || return 0
+	cygwinXlaunch
+	execute qemu-system-x86_64 -M q35 $(accel) -m 1G -pidfile "$PIDFILE" \
+		-display vnc=:05 -k de $(audioq35 hda-micro) \
+		-netdev tap,ifname=qemuTap05,id=tap0 -device virtio-net,netdev=tap0,mac=00:00:00:00:00:05 \
+		-drive file="$IMAGE",media=disk,if=none,id=drive0,discard=unmap,detect-zeroes=unmap \
+		-device virtio-scsi,id=scsi0 -device scsi-hd,bus=scsi0.0,drive=drive0 &
+	executeVncForBackgroundQemu
 }
 
 # Extended Spice-Desktop (HDImage)
 function qemuInstalledDesktopSPICE1 {
-local IMAGE='/d/Qemu/test/test-usernet.qcow2'
-[ -f "$IMAGE" ] || return 0
-cygwinXlaunch
-execute qemu-system-x86_64 -M q35 $(accel) -m 1G -pidfile $PIDFILE \
-	-vga qxl -spice port=5905,addr=127.0.0.1,disable-ticketing=on $(audioq35 hda-duplex) \
-	-device virtio-serial -chardev spicevmc,id=spicechannel0,name=vdagent \
-	-device virtserialport,chardev=spicechannel0,name=com.redhat.spice.0 \
-	-usb -device qemu-xhci \
-	-chardev spicevmc,id=usbredirchardev0,name=usbredir \
-	-device usb-redir,chardev=usbredirchardev0,id=usbredirdevice0 \
-	-netdev user,id=un0,hostfwd=tcp::2222-:22 -device virtio-net,netdev=un0 \
-	-drive file="$IMAGE",media=disk,if=none,id=drive0,discard=unmap,detect-zeroes=unmap \
-	-device virtio-scsi,id=scsi0 -device scsi-hd,bus=scsi0.0,drive=drive0 &
-executeSpicyForBackgroundQemu
+	local IMAGE='/d/Qemu/test/test-usernet.qcow2'
+	[ -f "$IMAGE" ] || return 0
+	cygwinXlaunch
+	execute qemu-system-x86_64 -M q35 $(accel) -m 1G -pidfile "$PIDFILE" \
+		-vga qxl -spice port=5905,addr=127.0.0.1,disable-ticketing=on $(audioq35 hda-duplex) \
+		-device virtio-serial -chardev spicevmc,id=spicechannel0,name=vdagent \
+		-device virtserialport,chardev=spicechannel0,name=com.redhat.spice.0 \
+		-usb -device qemu-xhci \
+		-chardev spicevmc,id=usbredirchardev0,name=usbredir \
+		-device usb-redir,chardev=usbredirchardev0,id=usbredirdevice0 \
+		-netdev user,id=un0,hostfwd=tcp::2222-:22 -device virtio-net,netdev=un0 \
+		-drive file="$IMAGE",media=disk,if=none,id=drive0,discard=unmap,detect-zeroes=unmap \
+		-device virtio-scsi,id=scsi0 -device scsi-hd,bus=scsi0.0,drive=drive0 &
+	executeSpicyForBackgroundQemu
 }
 
 # Extended Spice-Desktop (HDImage) with tap-Network and host configuation of tapDevices
 function qemuInstalledDesktopSPICE2 {
-local IMAGE='/d/Qemu/test/test.qcow2'
-[ -f "$IMAGE" ] || return 0
-cygwinXlaunch
-execute qemu-system-x86_64 -M q35 $(accel) -m 1G -pidfile $PIDFILE \
-	-vga qxl -spice port=5905,addr=127.0.0.1,disable-ticketing=on $(audioq35 hda-duplex) \
-	-device virtio-serial -chardev spicevmc,id=spicechannel0,name=vdagent \
-	-device virtserialport,chardev=spicechannel0,name=com.redhat.spice.0 \
-	-usb -device qemu-xhci \
-	-chardev spicevmc,id=usbredirchardev0,name=usbredir \
-	-device usb-redir,chardev=usbredirchardev0,id=usbredirdevice0 \
-	-netdev tap,ifname=qemuTap05,id=tap0 -device virtio-net,netdev=tap0,mac=00:00:00:00:00:05 \
-	-drive file="$IMAGE",media=disk,if=none,id=drive0,discard=unmap,detect-zeroes=unmap \
-	-device virtio-scsi,id=scsi0 -device scsi-hd,bus=scsi0.0,drive=drive0 &
-executeSpicyForBackgroundQemu
+	local IMAGE='/d/Qemu/test/test.qcow2'
+	[ -f "$IMAGE" ] || return 0
+	cygwinXlaunch
+	execute qemu-system-x86_64 -M q35 $(accel) -m 1G -pidfile "$PIDFILE" \
+		-vga qxl -spice port=5905,addr=127.0.0.1,disable-ticketing=on $(audioq35 hda-duplex) \
+		-device virtio-serial -chardev spicevmc,id=spicechannel0,name=vdagent \
+		-device virtserialport,chardev=spicechannel0,name=com.redhat.spice.0 \
+		-usb -device qemu-xhci \
+		-chardev spicevmc,id=usbredirchardev0,name=usbredir \
+		-device usb-redir,chardev=usbredirchardev0,id=usbredirdevice0 \
+		-netdev tap,ifname=qemuTap05,id=tap0 -device virtio-net,netdev=tap0,mac=00:00:00:00:00:05 \
+		-drive file="$IMAGE",media=disk,if=none,id=drive0,discard=unmap,detect-zeroes=unmap \
+		-device virtio-scsi,id=scsi0 -device scsi-hd,bus=scsi0.0,drive=drive0 &
+	executeSpicyForBackgroundQemu
 }
 
 function qemu2020day01 {
-download https://www.qemu-advent-calendar.org/2020/download/day01.tar.gz
-tar -xf day01.tar.gz
-cat day01/adv-cal.txt
-execute qemu-system-i386 -net none -drive file=day01/tweetboot.img,format=raw,if=floppy
-removeDir day01
+	download https://www.qemu-advent-calendar.org/2020/download/day01.tar.gz
+	tar -xf day01.tar.gz
+	cat day01/adv-cal.txt
+	execute qemu-system-i386 -net none -drive file=day01/tweetboot.img,format=raw,if=floppy
+	removeDir day01
 }
 
 function qemu2020day03 {
-download https://www.qemu-advent-calendar.org/2020/download/gw-basic.tar.xz
-tar -xf gw-basic.tar.xz
-cat gw-basic/README
-execute qemu-system-i386 -m 16M -drive if=ide,format=qcow2,file=gw-basic/gwbasic.qcow2
-removeDir gw-basic
+	download https://www.qemu-advent-calendar.org/2020/download/gw-basic.tar.xz
+	tar -xf gw-basic.tar.xz
+	cat gw-basic/README
+	execute qemu-system-i386 -m 16M -drive if=ide,format=qcow2,file=gw-basic/gwbasic.qcow2
+	removeDir gw-basic
 }
 
 function qemu2020day04 {
-download https://www.qemu-advent-calendar.org/2020/download/day04.tar.gz
-tar -xf day04.tar.gz
-cat bootRogue/README
-execute qemu-system-x86_64 -drive format=raw,file=bootRogue/rogue.img
-removeDir bootRogue
+	download https://www.qemu-advent-calendar.org/2020/download/day04.tar.gz
+	tar -xf day04.tar.gz
+	cat bootRogue/README
+	execute qemu-system-x86_64 -drive format=raw,file=bootRogue/rogue.img
+	removeDir bootRogue
 }
 
 function qemu2020day05 {
-download https://www.qemu-advent-calendar.org/2020/download/day05.tar.gz
-tar -xf day05.tar.gz
-cat lights/README
-execute qemu-system-x86_64 -drive format=raw,file=lights/lights.img
-removeDir lights
+	download https://www.qemu-advent-calendar.org/2020/download/day05.tar.gz
+	tar -xf day05.tar.gz
+	cat lights/README
+	execute qemu-system-x86_64 -drive format=raw,file=lights/lights.img
+	removeDir lights
 }
 
 function qemu2020day06 {
-download https://www.qemu-advent-calendar.org/2020/download/day06.tar.gz
-tar -xf day06.tar.gz
-cat day06/adv-cal.txt
-execute qemu-system-i386 -net none -drive file=day06/bootmine.img,format=raw,if=floppy
-removeDir day06
+	download https://www.qemu-advent-calendar.org/2020/download/day06.tar.gz
+	tar -xf day06.tar.gz
+	cat day06/adv-cal.txt
+	execute qemu-system-i386 -net none -drive file=day06/bootmine.img,format=raw,if=floppy
+	removeDir day06
 }
 
 function qemu2020day07 {
-download https://www.qemu-advent-calendar.org/2020/download/day07.tar.gz
-tar -xf day07.tar.gz
-cat day07/README
-execute qemu-system-x86_64 -drive file=day07/visopsys-0.9-usb.img,format=raw -nic model=ne2k_pci
-removeDir day07
+	download https://www.qemu-advent-calendar.org/2020/download/day07.tar.gz
+	tar -xf day07.tar.gz
+	cat day07/README
+	execute qemu-system-x86_64 -drive file=day07/visopsys-0.9-usb.img,format=raw -nic model=ne2k_pci
+	removeDir day07
 }
 
 function qemu2020day08 {
-download https://www.qemu-advent-calendar.org/2020/download/day08.tar.gz
-tar -xf day08.tar.gz
-cat day08/README
-execute qemu-system-x86_64 -drive file=day08/fountain.bin,format=raw
-removeDir day08
+	download https://www.qemu-advent-calendar.org/2020/download/day08.tar.gz
+	tar -xf day08.tar.gz
+	cat day08/README
+	execute qemu-system-x86_64 -drive file=day08/fountain.bin,format=raw
+	removeDir day08
 }
 
 function qemu2020day09 {
-download https://www.qemu-advent-calendar.org/2020/download/day09.tar.xz
-tar -xf day09.tar.xz
-cat RayTracing_QAdvent2020/README
-local BYTES=$( egrep "(^[0-9 ]*$|@0x1fe)" RayTracing_QAdvent2020/run.sh )
-local POS=0 LINE="" BYTE="" BYTEREGEX="^[0-9]+$" IMAGE="RayTracing_QAdvent2020/floppy"
-echo
-echo "Writing boot sector to $IMAGE ..."
-for BYTE in $BYTES ; do
-	if [[ $BYTE =~ $BYTEREGEX ]] ; 	then
-		(( POS%32 == 0 )) && echo "$LINE" && LINE=""
-		BYTE=$(printf '%02x' $BYTE)
-		LINE="$LINE$( (( POS%2 == 0 )) && echo " " )$BYTE"
-		echo -ne \\x$BYTE | dd of=$IMAGE seek=$POS bs=1 count=1 2> /dev/null
-		POS=$(( POS+1 ))
-	else
-		while (( POS < 510 )) ; do
+	download https://www.qemu-advent-calendar.org/2020/download/day09.tar.xz
+	tar -xf day09.tar.xz
+	cat RayTracing_QAdvent2020/README
+	local BYTES=$( egrep "(^[0-9 ]*$|@0x1fe)" RayTracing_QAdvent2020/run.sh )
+	local POS=0 LINE="" BYTE="" BYTEREGEX="^[0-9]+$" IMAGE="RayTracing_QAdvent2020/floppy"
+	echo
+	echo "Writing boot sector to $IMAGE ..."
+	for BYTE in $BYTES ; do
+		if [[ $BYTE =~ $BYTEREGEX ]] ; 	then
 			(( POS%32 == 0 )) && echo "$LINE" && LINE=""
-			LINE="$LINE$( (( POS%2 == 0 )) && echo " " ).."
+			BYTE=$(printf '%02x' $BYTE)
+			LINE="$LINE$( (( POS%2 == 0 )) && echo " " )$BYTE"
+			echo -ne \\x$BYTE | dd of=$IMAGE seek=$POS bs=1 count=1 2> /dev/null
 			POS=$(( POS+1 ))
-		done
-	fi
-done
-echo "$LINE"
-echo
-execute qemu-system-x86_64 -drive file=$IMAGE,format=raw,if=floppy
-removeDir RayTracing_QAdvent2020
+		else
+			while (( POS < 510 )) ; do
+				(( POS%32 == 0 )) && echo "$LINE" && LINE=""
+				LINE="$LINE$( (( POS%2 == 0 )) && echo " " ).."
+				POS=$(( POS+1 ))
+			done
+		fi
+	done
+	echo "$LINE"
+	echo
+	execute qemu-system-x86_64 -drive file=$IMAGE,format=raw,if=floppy
+	removeDir RayTracing_QAdvent2020
 }
 
 function qemu2020day11 {
-download https://www.qemu-advent-calendar.org/2020/download/milky.tar.gz
-download https://milkymist.walle.cc/updates/2012-03-01/flickernoise
-tar -xf milky.tar.gz
-cat milky/readme.txt
-execute qemu-system-lm32 -M milkymist -kernel flickernoise
-removeDir milky
+	download https://www.qemu-advent-calendar.org/2020/download/milky.tar.gz
+	download https://milkymist.walle.cc/updates/2012-03-01/flickernoise
+	tar -xf milky.tar.gz
+	cat milky/readme.txt
+	execute qemu-system-lm32 -M milkymist -kernel flickernoise
+	removeDir milky
 }
 
 function qemu2020day12 {
-download https://www.qemu-advent-calendar.org/2020/download/day12.tar.gz
-tar -xf day12.tar.gz
-cat gameoflife/README.md
-execute qemu-system-x86_64 -drive format=raw,file=gameoflife/gameoflife.bin
-removeDir gameoflife
+	download https://www.qemu-advent-calendar.org/2020/download/day12.tar.gz
+	tar -xf day12.tar.gz
+	cat gameoflife/README.md
+	execute qemu-system-x86_64 -drive format=raw,file=gameoflife/gameoflife.bin
+	removeDir gameoflife
 }
 
 function qemu2020day13 {
-download https://www.qemu-advent-calendar.org/2020/download/day13.tar.xz
-tar -xf day13.tar.xz
-cat Invaders_QEMUAdvent2020/README
-execute qemu-system-x86_64 -m 10M -drive file=Invaders_QEMUAdvent2020/invaders.img,format=raw,if=floppy
-removeDir Invaders_QEMUAdvent2020
+	download https://www.qemu-advent-calendar.org/2020/download/day13.tar.xz
+	tar -xf day13.tar.xz
+	cat Invaders_QEMUAdvent2020/README
+	execute qemu-system-x86_64 -m 10M -drive file=Invaders_QEMUAdvent2020/invaders.img,format=raw,if=floppy
+	removeDir Invaders_QEMUAdvent2020
 }
 
 function qemu2020day14 {
-download https://www.qemu-advent-calendar.org/2020/download/day14.tar.xz
-tar -xf day14.tar.xz
-cat day14/README
-execute qemu-system-x86_64 -drive file=day14/eggos.img,if=virtio \
-	-net user,hostfwd=::19220-:22 -net nic,model=e1000
-removeDir day14
+	download https://www.qemu-advent-calendar.org/2020/download/day14.tar.xz
+	tar -xf day14.tar.xz
+	cat day14/README
+	execute qemu-system-x86_64 -drive file=day14/eggos.img,if=virtio \
+		-net user,hostfwd=::19220-:22 -net nic,model=e1000
+	removeDir day14
 }
 
 function qemu2020day15 {
-download https://www.qemu-advent-calendar.org/2020/download/day15.tar.gz
-tar -xf day15.tar.gz
-cat day15/README
-execute qemu-system-x86_64 -m 256M -machine q35 -monitor none -vga none \
-	-drive if=pflash,format=raw,file=day15/snow.bin,readonly=on -boot a
-removeDir day15
+	download https://www.qemu-advent-calendar.org/2020/download/day15.tar.gz
+	tar -xf day15.tar.gz
+	cat day15/README
+	execute qemu-system-x86_64 -m 256M -machine q35 -monitor none -vga none \
+		-drive if=pflash,format=raw,file=day15/snow.bin,readonly=on -boot a
+	removeDir day15
 }
 
 function qemu2020day16 {
-download https://www.qemu-advent-calendar.org/2020/download/day16.tar.gz
-download https://eldondev.com/openwrt-privoxy-qcow.img
-tar -xf day16.tar.gz
-cat day16/README
-execute qemu-system-x86_64 $(accel) -drive file=openwrt-privoxy-qcow.img,id=d0,if=none \
-	-snapshot -device ide-hd,drive=d0,bus=ide.0 \
-	-netdev user,id=hn0 -device e1000,netdev=hn0,id=nic1 \
-	-netdev user,id=hn1,hostfwd=tcp::18118-:8118 -device e1000,netdev=hn1,id=nic2
-removeDir day16
+	download https://www.qemu-advent-calendar.org/2020/download/day16.tar.gz
+	download https://eldondev.com/openwrt-privoxy-qcow.img
+	tar -xf day16.tar.gz
+	cat day16/README
+	execute qemu-system-x86_64 $(accel) -drive file=openwrt-privoxy-qcow.img,id=d0,if=none \
+		-snapshot -device ide-hd,drive=d0,bus=ide.0 \
+		-netdev user,id=hn0 -device e1000,netdev=hn0,id=nic1 \
+		-netdev user,id=hn1,hostfwd=tcp::18118-:8118 -device e1000,netdev=hn1,id=nic2
+	removeDir day16
 }
 
 function qemu2020day17 {
-download https://www.qemu-advent-calendar.org/2020/download/day17.tar.gz
-tar -xf day17.tar.gz
-cat creek/adv-cal.txt
-execute qemu-system-ppc -monitor none -parallel none -M mpc8544ds -kernel creek/creek.bin
-removeDir creek
+	download https://www.qemu-advent-calendar.org/2020/download/day17.tar.gz
+	tar -xf day17.tar.gz
+	cat creek/adv-cal.txt
+	execute qemu-system-ppc -monitor none -parallel none -M mpc8544ds -kernel creek/creek.bin
+	removeDir creek
 }
 
 function qemu2020day18 {
-download https://www.qemu-advent-calendar.org/2020/download/day18.tar.gz
-tar -xf day18.tar.gz
-cat doom/README
-execute qemu-system-x86_64 -drive file=doom/doom.img,format=raw
-removeDir doom
+	download https://www.qemu-advent-calendar.org/2020/download/day18.tar.gz
+	tar -xf day18.tar.gz
+	cat doom/README
+	execute qemu-system-x86_64 -drive file=doom/doom.img,format=raw
+	removeDir doom
 }
 
 function qemu2020day19 {
-download https://www.qemu-advent-calendar.org/2020/download/day19.tar.gz
-tar -xf day19.tar.gz
-cat aflatoxin/adv-cal.txt
-execute qemu-system-i386 -net none $(pcspk) -drive file=aflatoxin/AFLAtoxin.bin,format=raw,if=floppy
-removeDir aflatoxin
+	download https://www.qemu-advent-calendar.org/2020/download/day19.tar.gz
+	tar -xf day19.tar.gz
+	cat aflatoxin/adv-cal.txt
+	execute qemu-system-i386 -net none $(pcspk) -drive file=aflatoxin/AFLAtoxin.bin,format=raw,if=floppy
+	removeDir aflatoxin
 }
 
 function qemu2020day20 {
-download https://www.qemu-advent-calendar.org/2020/download/day20.tar.gz
-tar -xf day20.tar.gz
-cat kpara8/adv-cal.txt
-execute qemu-system-i386 -net none -drive file=kpara8/kpara8.bin,format=raw,if=floppy
-removeDir kpara8
+	download https://www.qemu-advent-calendar.org/2020/download/day20.tar.gz
+	tar -xf day20.tar.gz
+	cat kpara8/adv-cal.txt
+	execute qemu-system-i386 -net none -drive file=kpara8/kpara8.bin,format=raw,if=floppy
+	removeDir kpara8
 }
 
 function qemu2020day21 {
-download https://www.qemu-advent-calendar.org/2020/download/day21.tar.gz
-tar -xf day21.tar.gz
-cat day21/README
-execute qemu-system-x86_64 -kernel day21/vmlinuz -initrd day21/initramfs.linux_amd64.cpio \
-	-append ip=dhcp -nic user,hostfwd=tcp::10222-:22
-removeDir day21
+	download https://www.qemu-advent-calendar.org/2020/download/day21.tar.gz
+	tar -xf day21.tar.gz
+	cat day21/README
+	execute qemu-system-x86_64 -kernel day21/vmlinuz -initrd day21/initramfs.linux_amd64.cpio \
+		-append ip=dhcp -nic user,hostfwd=tcp::10222-:22
+	removeDir day21
 }
 
 function qemu2020day22 {
-download https://www.qemu-advent-calendar.org/2020/download/day22.tar.xz
-tar -xf day22.tar.xz
-cat day22/README
-execute qemu-system-x86_64 $(accel) -m 1G -drive if=virtio,file=day22/ventoy.qcow2
-removeDir day22
+	download https://www.qemu-advent-calendar.org/2020/download/day22.tar.xz
+	tar -xf day22.tar.xz
+	cat day22/README
+	execute qemu-system-x86_64 $(accel) -m 1G -drive if=virtio,file=day22/ventoy.qcow2
+	removeDir day22
 }
 
 function qemu2020day23 {
-download https://www.qemu-advent-calendar.org/2020/download/day23.tar.gz
-tar -xf day23.tar.gz
-cat day23/README
-execute qemu-system-x86_64 -L day23/bios -nodefaults -name ELKS -machine isapc -cpu 486,tsc \
-	-m 1M -vga std -rtc base=utc \
-	-netdev user,id=mynet,hostfwd=tcp::8080-:80,hostfwd=tcp::2323-:23 \
-	-device ne2k_isa,irq=12,netdev=mynet -drive if=ide,format=raw,file=day23/hd32mbr-fat.bin \
-	-drive if=ide,format=qcow2,file=day23/scratch.qcow2
-removeDir day23
+	download https://www.qemu-advent-calendar.org/2020/download/day23.tar.gz
+	tar -xf day23.tar.gz
+	cat day23/README
+	execute qemu-system-x86_64 -L day23/bios -nodefaults -name ELKS -machine isapc -cpu 486,tsc \
+		-m 1M -vga std -rtc base=utc \
+		-netdev user,id=mynet,hostfwd=tcp::8080-:80,hostfwd=tcp::2323-:23 \
+		-device ne2k_isa,irq=12,netdev=mynet -drive if=ide,format=raw,file=day23/hd32mbr-fat.bin \
+		-drive if=ide,format=qcow2,file=day23/scratch.qcow2
+	removeDir day23
 }
 
 function qemu2020day24 {
-download https://www.qemu-advent-calendar.org/2020/download/hippo.tar.gz
-tar -xf hippo.tar.gz
-cat hippo/adv-cal.txt
-execute qemu-system-ppc64 -monitor none -parallel none -M virtex-ml507 -m 512 \
-	-dtb hippo/virtex440-ml507.dtb -kernel hippo/hippo.linux
-removeDir hippo
+	download https://www.qemu-advent-calendar.org/2020/download/hippo.tar.gz
+	tar -xf hippo.tar.gz
+	cat hippo/adv-cal.txt
+	execute qemu-system-ppc64 -monitor none -parallel none -M virtex-ml507 -m 512 \
+		-dtb hippo/virtex440-ml507.dtb -kernel hippo/hippo.linux
+	removeDir hippo
 }
 
 function qemu2018day01 {
-download https://www.qemu-advent-calendar.org/2018/download/day01.tar.xz
-tar -xf day01.tar.xz
-cat day01/adv-cal.txt
-execute qemu-system-i386 -net none $(pcspk) -drive file=day01/fbird.img,format=raw,if=floppy
-removeDir day01
+	download https://www.qemu-advent-calendar.org/2018/download/day01.tar.xz
+	tar -xf day01.tar.xz
+	cat day01/adv-cal.txt
+	execute qemu-system-i386 -net none $(pcspk) -drive file=day01/fbird.img,format=raw,if=floppy
+	removeDir day01
 }
 
 function qemu2018day02 {
-download https://www.qemu-advent-calendar.org/2018/download/day02.tar.xz
-tar -xf day02.tar.xz
-cat day02/adv-cal.txt
-execute qemu-system-xtensa -net none -monitor none -parallel none -M lx60 -cpu dc233c \
-	-kernel day02/santas-sleigh-ride.elf
-removeDir day02
+	download https://www.qemu-advent-calendar.org/2018/download/day02.tar.xz
+	tar -xf day02.tar.xz
+	cat day02/adv-cal.txt
+	execute qemu-system-xtensa -net none -monitor none -parallel none -M lx60 -cpu dc233c \
+		-kernel day02/santas-sleigh-ride.elf
+	removeDir day02
 }
 
 function qemu2018day03 {
-download https://www.qemu-advent-calendar.org/2018/download/day03.tar.xz
-tar -xf day03.tar.xz
-cat day03/readme.txt
-execute qemu-system-x86_64 -m 1G $(accel) -netdev user,id=net0,bootfile=http://boot.netboot.xyz \
-	-device virtio-net-pci,netdev=net0 -boot n
-removeDir day03
+	download https://www.qemu-advent-calendar.org/2018/download/day03.tar.xz
+	tar -xf day03.tar.xz
+	cat day03/readme.txt
+	execute qemu-system-x86_64 -m 1G $(accel) -netdev user,id=net0,bootfile=http://boot.netboot.xyz \
+		-device virtio-net-pci,netdev=net0 -boot n
+	removeDir day03
 }
 
 function qemu2018day04 {
-download https://www.qemu-advent-calendar.org/2018/download/day04.tar.xz
-tar -xf day04.tar.xz
-cat day04/readme.txt
-execute qemu-system-ppc64 --net none --boot order=d,strict=on -g 800x600x8 --cdrom day04/snake.iso
-removeDir day04
+	download https://www.qemu-advent-calendar.org/2018/download/day04.tar.xz
+	tar -xf day04.tar.xz
+	cat day04/readme.txt
+	execute qemu-system-ppc64 --net none --boot order=d,strict=on -g 800x600x8 --cdrom day04/snake.iso
+	removeDir day04
 }
 
 function qemu2018day05 {
-download https://www.qemu-advent-calendar.org/2018/download/day05.tar.xz
-tar -xf day05.tar.xz
-cat day05/readme.txt
-execute qemu-system-i386 -drive file=day05/pc-mos.img,format=raw,if=floppy \
-	$(pcspk) -rtc base=1994-12-05T09:00:00
-removeDir day05
+	download https://www.qemu-advent-calendar.org/2018/download/day05.tar.xz
+	tar -xf day05.tar.xz
+	cat day05/readme.txt
+	execute qemu-system-i386 -drive file=day05/pc-mos.img,format=raw,if=floppy \
+		$(pcspk) -rtc base=1994-12-05T09:00:00
+	removeDir day05
 }
 
 function qemu2018day06 {
-download https://www.qemu-advent-calendar.org/2018/download/day06.tar.xz
-tar -xf day06.tar.xz
-cat day06/adv-cal.txt
-execute qemu-system-arm -net none -parallel none -M versatilepb -kernel day06/120_below.zImage \
-	-dtb day06/versatile-pb.dtb
-removeDir day06
+	download https://www.qemu-advent-calendar.org/2018/download/day06.tar.xz
+	tar -xf day06.tar.xz
+	cat day06/adv-cal.txt
+	execute qemu-system-arm -net none -parallel none -M versatilepb -kernel day06/120_below.zImage \
+		-dtb day06/versatile-pb.dtb
+	removeDir day06
 }
 
 function qemu2018day07 {
-download https://www.qemu-advent-calendar.org/2018/download/day07.tar.xz
-tar -xf day07.tar.xz
-cat day07/adv-cal.txt
-execute qemu-system-m68k -monitor none -parallel none -M mcf5208evb -kernel day07/sanity-clause.elf
-removeDir day07
+	download https://www.qemu-advent-calendar.org/2018/download/day07.tar.xz
+	tar -xf day07.tar.xz
+	cat day07/adv-cal.txt
+	execute qemu-system-m68k -monitor none -parallel none -M mcf5208evb -kernel day07/sanity-clause.elf
+	removeDir day07
 }
 
 function qemu2018day08 {
-download https://www.qemu-advent-calendar.org/2018/download/day08.tar.xz
-tar -xf day08.tar.xz
-cat day08/readme.txt
-execute qemu-system-i386 -m 32 -M isapc $(accel) -cpu pentium -no-acpi $(pcspk) \
-	-net nic,model=ne2k_isa -net user -drive if=ide,file=day08/hd.qcow2
-removeDir day08
+	download https://www.qemu-advent-calendar.org/2018/download/day08.tar.xz
+	tar -xf day08.tar.xz
+	cat day08/readme.txt
+	execute qemu-system-i386 -m 32 -M isapc $(accel) -cpu pentium -no-acpi $(pcspk) \
+		-net nic,model=ne2k_isa -net user -drive if=ide,file=day08/hd.qcow2
+	removeDir day08
 }
 
 function qemu2018day09 {
-download https://www.qemu-advent-calendar.org/2018/download/day09.tar.xz
-tar -xf day09.tar.xz
-cat day09/adv-cal.txt
-execute qemu-system-sh4 -monitor none -parallel none -net none -M r2d \
-	-kernel day09/zImage -append loglevel=3
-removeDir day09
+	download https://www.qemu-advent-calendar.org/2018/download/day09.tar.xz
+	tar -xf day09.tar.xz
+	cat day09/adv-cal.txt
+	execute qemu-system-sh4 -monitor none -parallel none -net none -M r2d \
+		-kernel day09/zImage -append loglevel=3
+	removeDir day09
 }
 
 function qemu2018day10 {
-download https://www.qemu-advent-calendar.org/2018/download/day10.tar.xz
-tar -xf day10.tar.xz
-cat day10/readme.txt
-execute qemu-system-i386 -net none -M q35 $(accel) -cdrom day10/gamebro.iso
-removeDir day10
+	download https://www.qemu-advent-calendar.org/2018/download/day10.tar.xz
+	tar -xf day10.tar.xz
+	cat day10/readme.txt
+	execute qemu-system-i386 -net none -M q35 $(accel) -cdrom day10/gamebro.iso
+	removeDir day10
 }
 
 function qemu2018day11 {
-download https://www.qemu-advent-calendar.org/2018/download/day11.tar.xz
-tar -xf day11.tar.xz
-cat day11/adv-cal.txt
-execute qemu-system-sparc -monitor none -parallel none -net none -M SS-20 -m 256 -kernel day11/zImage.elf
-removeDir day11
+	download https://www.qemu-advent-calendar.org/2018/download/day11.tar.xz
+	tar -xf day11.tar.xz
+	cat day11/adv-cal.txt
+	execute qemu-system-sparc -monitor none -parallel none -net none -M SS-20 -m 256 -kernel day11/zImage.elf
+	removeDir day11
 }
 
 function qemu2018day13 {
-download https://www.qemu-advent-calendar.org/2018/download/day13.tar.xz
-tar -xf day13.tar.xz
-cat day13/adv-cal.txt
-execute qemu-system-mips -net none -parallel none -M malta -kernel day13/vmlinux \
-	-device usb-kbd -device usb-mouse -vga cirrus $(audio ES1370)
-removeDir day13
+	download https://www.qemu-advent-calendar.org/2018/download/day13.tar.xz
+	tar -xf day13.tar.xz
+	cat day13/adv-cal.txt
+	execute qemu-system-mips -net none -parallel none -M malta -kernel day13/vmlinux \
+		-device usb-kbd -device usb-mouse -vga cirrus $(audio ES1370)
+	removeDir day13
 }
 
 function qemu2018day14 {
-download https://www.qemu-advent-calendar.org/2018/download/day14.tar.xz
-tar -xf day14.tar.xz
-cat day14/adv-cal.txt
-execute qemu-system-nios2 -monitor none -parallel none -net none -kernel day14/vmlinux.elf
-removeDir day14
+	download https://www.qemu-advent-calendar.org/2018/download/day14.tar.xz
+	tar -xf day14.tar.xz
+	cat day14/adv-cal.txt
+	execute qemu-system-nios2 -monitor none -parallel none -net none -kernel day14/vmlinux.elf
+	removeDir day14
 }
 
 function qemu2018day15 {
-download https://www.qemu-advent-calendar.org/2018/download/day15.tar.xz
-tar -xf day15.tar.xz
-cat day15/adv-cal.txt
-execute qemu-system-ppc -net none -parallel none -monitor none -M g3beige -kernel day15/invaders.elf
-removeDir day15
+	download https://www.qemu-advent-calendar.org/2018/download/day15.tar.xz
+	tar -xf day15.tar.xz
+	cat day15/adv-cal.txt
+	execute qemu-system-ppc -net none -parallel none -monitor none -M g3beige -kernel day15/invaders.elf
+	removeDir day15
 }
 
 function qemu2018day16 {
-download https://www.qemu-advent-calendar.org/2018/download/day16.tar.xz
-tar -xf day16.tar.xz
-cat day16/adv-cal.txt
-execute qemu-system-aarch64 -net none -parallel none -monitor none -M vexpress-a9 \
-	-kernel day16/winter.zImage -dtb day16/vexpress-v2p-ca9.dtb
-removeDir day16
+	download https://www.qemu-advent-calendar.org/2018/download/day16.tar.xz
+	tar -xf day16.tar.xz
+	cat day16/adv-cal.txt
+	execute qemu-system-aarch64 -net none -parallel none -monitor none -M vexpress-a9 \
+		-kernel day16/winter.zImage -dtb day16/vexpress-v2p-ca9.dtb
+	removeDir day16
 }
 
 function qemu2018day17 {
-download https://www.qemu-advent-calendar.org/2018/download/day17.tar.xz
-tar -xf day17.tar.xz
-cat day17/adv-cal.txt
-execute qemu-system-microblaze -monitor none -parallel none -kernel day17/ballerina.bin
-removeDir day17
+	download https://www.qemu-advent-calendar.org/2018/download/day17.tar.xz
+	tar -xf day17.tar.xz
+	cat day17/adv-cal.txt
+	execute qemu-system-microblaze -monitor none -parallel none -kernel day17/ballerina.bin
+	removeDir day17
 }
 
 function qemu2018day18 {
-download https://www.qemu-advent-calendar.org/2018/download/day18.tar.xz
-tar -xf day18.tar.xz
-cat day18/adv-cal.txt
-execute qemu-system-arm -M canon-a1100 -net none -monitor none \
-	-bios day18/barebox.canon-a1100.bin
-removeDir day18
+	download https://www.qemu-advent-calendar.org/2018/download/day18.tar.xz
+	tar -xf day18.tar.xz
+	cat day18/adv-cal.txt
+	execute qemu-system-arm -M canon-a1100 -net none -monitor none \
+		-bios day18/barebox.canon-a1100.bin
+	removeDir day18
 }
 
 function qemu2018day19 {
-download https://www.qemu-advent-calendar.org/2018/download/day19.tar.xz
-tar -xf day19.tar.xz
-cat day19/adv-cal.txt
-execute qemu-system-ppc64 -device VGA -monitor none -M ppce500 -cpu e5500 -net none \
-	-device pci-ohci -device usb-kbd -kernel day19/uImage
-removeDir day19
+	download https://www.qemu-advent-calendar.org/2018/download/day19.tar.xz
+	tar -xf day19.tar.xz
+	cat day19/adv-cal.txt
+	execute qemu-system-ppc64 -device VGA -monitor none -M ppce500 -cpu e5500 -net none \
+		-device pci-ohci -device usb-kbd -kernel day19/uImage
+	removeDir day19
 }
 
 function qemu2018day20 {
-download https://www.qemu-advent-calendar.org/2018/download/day20.tar.xz
-tar -xf day20.tar.xz
-cat day20/adv-cal.txt
-execute qemu-system-or1k -net none -monitor none -parallel none -kernel day20/vmlinux
-removeDir day20
+	download https://www.qemu-advent-calendar.org/2018/download/day20.tar.xz
+	tar -xf day20.tar.xz
+	cat day20/adv-cal.txt
+	execute qemu-system-or1k -net none -monitor none -parallel none -kernel day20/vmlinux
+	removeDir day20
 }
 
 function qemu2018day21 {
-download https://www.qemu-advent-calendar.org/2018/download/day21.tar.xz
-tar -xf day21.tar.xz
-cat day21/README.txt
-execute qemu-system-aarch64 -kernel day21/bootstrap.elf -monitor none -cpu cortex-a57 -m 1024 \
-	-net none -M virt,virtualization=true
-removeDir day21
+	download https://www.qemu-advent-calendar.org/2018/download/day21.tar.xz
+	tar -xf day21.tar.xz
+	cat day21/README.txt
+	execute qemu-system-aarch64 -kernel day21/bootstrap.elf -monitor none -cpu cortex-a57 -m 1024 \
+		-net none -M virt,virtualization=true
+	removeDir day21
 }
 
 function qemu2018day22 {
-download https://www.qemu-advent-calendar.org/2018/download/day22.tar.xz
-tar -xf day22.tar.xz
-cat day22/adv-cal.txt
-export MSYS2_ARG_CONV_EXCL='*'
-execute qemu-system-mips64 -net none -parallel none -M malta $(audio ES1370) \
-        -device usb-kbd -device usb-mouse -device cirrus-vga,vgamem_mb=16 \
-        -hda day22/ri-li.qcow2 -kernel day22/vmlinux -append root=/dev/hda
-unset MSYS2_ARG_CONV_EXCL
-removeDir day22
+	download https://www.qemu-advent-calendar.org/2018/download/day22.tar.xz
+	tar -xf day22.tar.xz
+	cat day22/adv-cal.txt
+	export MSYS2_ARG_CONV_EXCL='*'
+	execute qemu-system-mips64 -net none -parallel none -M malta $(audio ES1370) \
+		-device usb-kbd -device usb-mouse -device cirrus-vga,vgamem_mb=16 \
+		-hda day22/ri-li.qcow2 -kernel day22/vmlinux -append root=/dev/hda
+	unset MSYS2_ARG_CONV_EXCL
+	removeDir day22
 }
 
 function qemu2018day23 {
-download https://www.qemu-advent-calendar.org/2018/download/day23.tar.xz
-tar -xf day23.tar.xz
-cat day23/adv-cal.txt
-execute qemu-system-sparc64 -net none -parallel none -kernel day23/vmlinux
-removeDir day23
+	download https://www.qemu-advent-calendar.org/2018/download/day23.tar.xz
+	tar -xf day23.tar.xz
+	cat day23/adv-cal.txt
+	execute qemu-system-sparc64 -net none -parallel none -kernel day23/vmlinux
+	removeDir day23
 }
 
 function qemu2018day24 {
-download https://www.qemu-advent-calendar.org/2018/download/day24.tar.xz
-tar -xf day24.tar.xz
-cat day24/adv-cal.txt
-execute qemu-system-riscv64 -M virt -device virtio-gpu-device,xres=1600,yres=900 \
-	-device virtio-keyboard-device -device virtio-tablet-device -serial stdio \
-	-kernel day24/risk-v.elf
-removeDir day24
+	download https://www.qemu-advent-calendar.org/2018/download/day24.tar.xz
+	tar -xf day24.tar.xz
+	cat day24/adv-cal.txt
+	execute qemu-system-riscv64 -M virt -device virtio-gpu-device,xres=1600,yres=900 \
+		-device virtio-keyboard-device -device virtio-tablet-device -serial stdio \
+		-kernel day24/risk-v.elf
+	removeDir day24
 }
 
 function qemu2016day01 {
-download https://www.qemu-advent-calendar.org/2016/download/day01.tar.xz
-tar -xf day01.tar.xz
-cat mikeos/readme.txt
-execute qemu-system-i386 -drive file=mikeos/mikeos.flp,format=raw,if=floppy $(pcspk)
-removeDir mikeos
+	download https://www.qemu-advent-calendar.org/2016/download/day01.tar.xz
+	tar -xf day01.tar.xz
+	cat mikeos/readme.txt
+	execute qemu-system-i386 -drive file=mikeos/mikeos.flp,format=raw,if=floppy $(pcspk)
+	removeDir mikeos
 }
 
 function qemu2016day02 {
-download https://www.qemu-advent-calendar.org/2016/download/day02.tar.xz
-download https://prdownloads.sourceforge.net/syllable/SyllableDesktop-0.6.6.i586.VM.7z?download \
-	SyllableDesktop-0.6.6.i586.VM.7z
-tar -xf day02.tar.xz
-cat syllable/readme.txt
-(
-cd syllable
-7z x -y ../SyllableDesktop-0.6.6.i586.VM.7z > /dev/null
-execute qemu-system-i386 -m 512 -vga std $(audio ES1370) -hda "Syllable 0.6.6/Syllable.vmdk"
-)
-removeDir syllable
+	download https://www.qemu-advent-calendar.org/2016/download/day02.tar.xz
+	download https://prdownloads.sourceforge.net/syllable/SyllableDesktop-0.6.6.i586.VM.7z?download \
+		SyllableDesktop-0.6.6.i586.VM.7z
+	tar -xf day02.tar.xz
+	cat syllable/readme.txt
+	(
+		cd syllable
+		7z x -y ../SyllableDesktop-0.6.6.i586.VM.7z > /dev/null
+		execute qemu-system-i386 -m 512 -vga std $(audio ES1370) -hda "Syllable 0.6.6/Syllable.vmdk"
+	)
+	removeDir syllable
 }
 
 function qemu2016day03 {
-download https://www.qemu-advent-calendar.org/2016/download/day03.tar.xz
-tar -xf day03.tar.xz
-cat freegem/readme.txt
-execute qemu-system-i386 $(accel) -m 32 -hda freegem/freegem.qcow2 $(pcspk)
-removeDir freegem
+	download https://www.qemu-advent-calendar.org/2016/download/day03.tar.xz
+	tar -xf day03.tar.xz
+	cat freegem/readme.txt
+	execute qemu-system-i386 $(accel) -m 32 -hda freegem/freegem.qcow2 $(pcspk)
+	removeDir freegem
 }
 
 function qemu2016day04 {
-download https://www.qemu-advent-calendar.org/2016/download/day04.tar.xz
-#download https://sourceforge.net/projects/reactos/files/ReactOS/0.4.3/ReactOS-0.4.3-live.zip/download \
-#       ReactOS-0.4.3-live.zip
-download https://iso.reactos.org/livecd/reactos-livecd-0.4.15-dev-2574-g18e95f5-x86-gcc-lin-dbg.7z
-tar -xf day04.tar.xz
-cat reactos/readme.txt
-echo "Version 0.4.15-dev-2574-g18e95f5 replaces QEMU Advent Calender Version 0.4.3!"
-echo "see https://jira.reactos.org/browse/CORE-16695"
-echo "see https://reactos.org/wiki/QEMU"
-echo
-(
-cd reactos
-7z x -y ../reactos-livecd-0.4.15-dev-2574-g18e95f5-x86-gcc-lin-dbg.7z > /dev/null
-execute qemu-system-i386 $(accel) -m 512 -net nic,model=rtl8139 -net user -vga std $(audio AC97) \
-	-usb -device usb-tablet -serial file:reactos.log \
-	-cdrom reactos-livecd-0.4.15-dev-2574-g18e95f5-x86-gcc-lin-dbg.iso
-)
-removeDir reactos
+	download https://www.qemu-advent-calendar.org/2016/download/day04.tar.xz
+	#download https://sourceforge.net/projects/reactos/files/ReactOS/0.4.3/ReactOS-0.4.3-live.zip/download \
+	#       ReactOS-0.4.3-live.zip
+	download https://iso.reactos.org/livecd/reactos-livecd-0.4.15-dev-2574-g18e95f5-x86-gcc-lin-dbg.7z
+	tar -xf day04.tar.xz
+	cat reactos/readme.txt
+	echo "Version 0.4.15-dev-2574-g18e95f5 replaces QEMU Advent Calender Version 0.4.3!"
+	echo "see https://jira.reactos.org/browse/CORE-16695"
+	echo "see https://reactos.org/wiki/QEMU"
+	echo
+	(
+		cd reactos
+		7z x -y ../reactos-livecd-0.4.15-dev-2574-g18e95f5-x86-gcc-lin-dbg.7z > /dev/null
+		execute qemu-system-i386 $(accel) -m 512 -net nic,model=rtl8139 -net user -vga std $(audio AC97) \
+			-usb -device usb-tablet -serial file:reactos.log \
+			-cdrom reactos-livecd-0.4.15-dev-2574-g18e95f5-x86-gcc-lin-dbg.iso
+	)
+	removeDir reactos
 }
 
 function qemu2016day05 {
-download https://www.qemu-advent-calendar.org/2016/download/day05.tar.xz
-tar -xf day05.tar.xz
-cat hanoi/readme.txt
-execute qemu-system-ppc64 --boot order=d,strict=on -g 800x600x8 --cdrom hanoi/hanoi.iso
-removeDir hanoi
+	download https://www.qemu-advent-calendar.org/2016/download/day05.tar.xz
+	tar -xf day05.tar.xz
+	cat hanoi/readme.txt
+	execute qemu-system-ppc64 --boot order=d,strict=on -g 800x600x8 --cdrom hanoi/hanoi.iso
+	removeDir hanoi
 }
 
 function qemu2016day06 {
-download https://www.qemu-advent-calendar.org/2016/download/day06.tar.xz
-download https://prdownloads.sourceforge.net/menuet/M32-086.ZIP?download \
-	M32-086.ZIP
-tar -xf day06.tar.xz
-cat menuet32/readme.txt
-(
-cd menuet32
-unzip -o -q ../M32-086.ZIP
-execute qemu-system-i386 $(accel) $(audio AC97) -m 512 -drive file=M32-086.IMG,format=raw,if=floppy
-)
-removeDir menuet32
+	download https://www.qemu-advent-calendar.org/2016/download/day06.tar.xz
+	download https://prdownloads.sourceforge.net/menuet/M32-086.ZIP?download \
+		M32-086.ZIP
+	tar -xf day06.tar.xz
+	cat menuet32/readme.txt
+	(
+		cd menuet32
+		unzip -o -q ../M32-086.ZIP
+		execute qemu-system-i386 $(accel) $(audio AC97) -m 512 -drive file=M32-086.IMG,format=raw,if=floppy
+	)
+	removeDir menuet32
 }
 
 function qemu2016day07 {
-download https://www.qemu-advent-calendar.org/2016/download/day07.tar.xz
-tar -xf day07.tar.xz
-cat sorry-ass/readme.txt
-execute qemu-system-i386 -drive file=sorry-ass/sorryass.bin,format=raw,if=floppy $(pcspk)
-removeDir sorry-ass
+	download https://www.qemu-advent-calendar.org/2016/download/day07.tar.xz
+	tar -xf day07.tar.xz
+	cat sorry-ass/readme.txt
+	execute qemu-system-i386 -drive file=sorry-ass/sorryass.bin,format=raw,if=floppy $(pcspk)
+	removeDir sorry-ass
 }
 
 function qemu2016day08 {
-download https://www.qemu-advent-calendar.org/2016/download/day08.tar.xz
-# to demo resume of pminvaders, don't overwrite existing
-local EXISTS=""
-[ -d pminvaders ] && EXISTS=1
-[ -z "$EXISTS" ] && tar -xf day08.tar.xz
-cat pminvaders/description
-export MSYS2_ARG_CONV_EXCL='*'
-local DISK_IMG="pminvaders/main.raw"
-local DISK_SIZE=$(stat -c "%s" "$DISK_IMG")
-local NVDIMM_IMG="pminvaders/nvdimm.img"
-[ -z "$EXISTS" ] && dd if=/dev/zero of=$NVDIMM_IMG bs=1G count=1 > /dev/null 2>&1
-[ -z "$EXISTS" ] && /usr/sbin/mke2fs -q -t ext4 $NVDIMM_IMG
-local NVDIMM_SIZE=$(stat -c "%s" "$NVDIMM_IMG")
-execute qemu-system-x86_64 $(accel) -machine pc,nvdimm=on -smp 4 -cpu kvm64 -m 2G,slots=4,maxmem=4G \
-    -object memory-backend-file,id=mem1,share=off,mem-path=$DISK_IMG,size=$DISK_SIZE \
-    -device nvdimm,id=nv1,memdev=mem1 \
-    -object memory-backend-file,id=mem2,share=on,mem-path=$NVDIMM_IMG,size=$NVDIMM_SIZE \
-    -device nvdimm,id=nv2,memdev=mem2 \
-    -kernel pminvaders/vmlinuz-4.8.7 -append "root=/dev/pmem0p1 ro console=ttyS0,115200"
-unset MSYS2_ARG_CONV_EXCL
-removeDir pminvaders
+	download https://www.qemu-advent-calendar.org/2016/download/day08.tar.xz
+	# to demo resume of pminvaders, don't overwrite existing
+	local EXISTS=""
+	[ -d pminvaders ] && EXISTS=1
+	[ -z "$EXISTS" ] && tar -xf day08.tar.xz
+	cat pminvaders/description
+	export MSYS2_ARG_CONV_EXCL='*'
+	local DISK_IMG="pminvaders/main.raw"
+	local DISK_SIZE=$(stat -c "%s" "$DISK_IMG")
+	local NVDIMM_IMG="pminvaders/nvdimm.img"
+	[ -z "$EXISTS" ] && dd if=/dev/zero of=$NVDIMM_IMG bs=1G count=1 > /dev/null 2>&1
+	[ -z "$EXISTS" ] && /usr/sbin/mke2fs -q -t ext4 $NVDIMM_IMG
+	local NVDIMM_SIZE=$(stat -c "%s" "$NVDIMM_IMG")
+	execute qemu-system-x86_64 $(accel) -machine pc,nvdimm=on -smp 4 -cpu kvm64 -m 2G,slots=4,maxmem=4G \
+		-object memory-backend-file,id=mem1,share=off,mem-path=$DISK_IMG,size=$DISK_SIZE \
+		-device nvdimm,id=nv1,memdev=mem1 \
+		-object memory-backend-file,id=mem2,share=on,mem-path=$NVDIMM_IMG,size=$NVDIMM_SIZE \
+		-device nvdimm,id=nv2,memdev=mem2 \
+		-kernel pminvaders/vmlinuz-4.8.7 -append "root=/dev/pmem0p1 ro console=ttyS0,115200"
+	unset MSYS2_ARG_CONV_EXCL
+	removeDir pminvaders
 }
 
 function qemu2016day09 {
-download https://www.qemu-advent-calendar.org/2016/download/day09-v2.tar.xz
-tar -xf day09-v2.tar.xz
-cat kolibrios/readme.txt
-execute qemu-system-i386 $(accel) -device e1000,netdev=u0 -netdev user,id=u0 -usb $(audio hda-duplex) \
-        -boot d -cdrom kolibrios/kolibri-v2.iso
-removeDir kolibrios
+	download https://www.qemu-advent-calendar.org/2016/download/day09-v2.tar.xz
+	tar -xf day09-v2.tar.xz
+	cat kolibrios/readme.txt
+	execute qemu-system-i386 $(accel) -device e1000,netdev=u0 -netdev user,id=u0 -usb $(audio hda-duplex) \
+		-boot d -cdrom kolibrios/kolibri-v2.iso
+	removeDir kolibrios
 }
 
 function qemu2016day10 {
-download https://www.qemu-advent-calendar.org/2016/download/day10.tar.xz
-tar -xf day10.tar.xz
-cat epic-pinball/readme.txt
-execute qemu-system-x86_64 epic-pinball/freedos2016.qcow2 $(audio sb16) \
-	-vga std,retrace=precise -display sdl
-removeDir epic-pinball
+	download https://www.qemu-advent-calendar.org/2016/download/day10.tar.xz
+	tar -xf day10.tar.xz
+	cat epic-pinball/readme.txt
+	execute qemu-system-x86_64 epic-pinball/freedos2016.qcow2 $(audio sb16) \
+		-vga std,retrace=precise -display sdl
+	removeDir epic-pinball
 }
 
 function qemu2016day11 {
-download https://www.qemu-advent-calendar.org/2016/download/day11.tar.xz
-tar -xf day11.tar.xz
-cat genode/README
-execute qemu-system-i386 -serial stdio -cdrom genode/Genode_on_seL4.iso -m 1G -vga cirrus $(accel)
-removeDir genode
+	download https://www.qemu-advent-calendar.org/2016/download/day11.tar.xz
+	tar -xf day11.tar.xz
+	cat genode/README
+	execute qemu-system-i386 -serial stdio -cdrom genode/Genode_on_seL4.iso -m 1G -vga cirrus $(accel)
+	removeDir genode
 }
 
 function qemu2016day12 {
-download https://www.qemu-advent-calendar.org/2016/download/day12.tar.xz
-tar -xf day12.tar.xz
-cat tetros/readme.txt
-execute qemu-system-i386 $(accel) -m 32 -drive if=ide,file=tetros/tetros.img,format=raw
-removeDir tetros
+	download https://www.qemu-advent-calendar.org/2016/download/day12.tar.xz
+	tar -xf day12.tar.xz
+	cat tetros/readme.txt
+	execute qemu-system-i386 $(accel) -m 32 -drive if=ide,file=tetros/tetros.img,format=raw
+	removeDir tetros
 }
 
 function qemu2016day13 {
-download https://www.qemu-advent-calendar.org/2016/download/day13.tar.xz
-tar -xf day13.tar.xz
-cat supernested/readme.txt
-removeDir supernested
+	download https://www.qemu-advent-calendar.org/2016/download/day13.tar.xz
+	tar -xf day13.tar.xz
+	cat supernested/readme.txt
+	removeDir supernested
 }
 
 function qemu2016day14 {
-download https://www.qemu-advent-calendar.org/2016/download/day14.tar.xz
-tar -xf day14.tar.xz
-cat acorn/readme.txt
-execute qemu-system-x86_64 $(accel) -net nic,model=virtio -net user,hostfwd=tcp::8080-:80 \
-	 -smp 4 -serial stdio -m 128 -drive file=acorn/acorn.img,format=raw,if=ide -k en-us
-removeDir acorn
+	download https://www.qemu-advent-calendar.org/2016/download/day14.tar.xz
+	tar -xf day14.tar.xz
+	cat acorn/readme.txt
+	execute qemu-system-x86_64 $(accel) -net nic,model=virtio -net user,hostfwd=tcp::8080-:80 \
+		 -smp 4 -serial stdio -m 128 -drive file=acorn/acorn.img,format=raw,if=ide -k en-us
+	removeDir acorn
 }
 
 function qemu2016day15 {
-download https://www.qemu-advent-calendar.org/2016/download/day15.tar.xz
-tar -xf day15.tar.xz
-cat ofpong/readme.txt
-execute qemu-system-ppc64 -M pseries-2.1 -boot order=d,strict=on -cdrom ofpong/ofpong.iso
-removeDir ofpong
+	download https://www.qemu-advent-calendar.org/2016/download/day15.tar.xz
+	tar -xf day15.tar.xz
+	cat ofpong/readme.txt
+	execute qemu-system-ppc64 -M pseries-2.1 -boot order=d,strict=on -cdrom ofpong/ofpong.iso
+	removeDir ofpong
 }
 
 function qemu2016day16 {
-download https://www.qemu-advent-calendar.org/2016/download/day16.tar.xz
-tar -xf day16.tar.xz
-cat tccboot/readme.txt
-execute qemu-system-x86_64 $(accel) -m 512 -net nic,model=rtl8139 -net user -vga std \
-	$(audio AC97) -cdrom tccboot/tccboot.iso
-removeDir tccboot
+	download https://www.qemu-advent-calendar.org/2016/download/day16.tar.xz
+	tar -xf day16.tar.xz
+	cat tccboot/readme.txt
+	execute qemu-system-x86_64 $(accel) -m 512 -net nic,model=rtl8139 -net user -vga std \
+		$(audio AC97) -cdrom tccboot/tccboot.iso
+	removeDir tccboot
 }
 
 function qemu2016day17 {
-download https://www.qemu-advent-calendar.org/2016/download/day17.tar.xz
-tar -xf day17.tar.xz
-cat minoca-os/readme.txt
-execute qemu-system-x86_64 minoca-os/minoca-os.qcow2
-removeDir minoca-os
+	download https://www.qemu-advent-calendar.org/2016/download/day17.tar.xz
+	tar -xf day17.tar.xz
+	cat minoca-os/readme.txt
+	execute qemu-system-x86_64 minoca-os/minoca-os.qcow2
+	removeDir minoca-os
 }
 
 function qemu2016day18 {
-download https://www.qemu-advent-calendar.org/2016/download/day18.tar.xz
-download https://github.com/redox-os/redox/releases/download/0.0.5/harddrive.bin.gz
-tar -xf day18.tar.xz
-cat redox/readme.txt
-(
-cd redox
-zcat ../harddrive.bin.gz > harddrive.bin
-execute qemu-system-i386 -M q35 $(accel) -vga std $(audio AC97) -smp 4 -m 1024 \
-     -net nic,model=e1000 -net user -drive file=harddrive.bin,format=raw
-)
-removeDir redox
+	download https://www.qemu-advent-calendar.org/2016/download/day18.tar.xz
+	download https://github.com/redox-os/redox/releases/download/0.0.5/harddrive.bin.gz
+	tar -xf day18.tar.xz
+	cat redox/readme.txt
+	(
+		cd redox
+		zcat ../harddrive.bin.gz > harddrive.bin
+		execute qemu-system-i386 -M q35 $(accel) -vga std $(audio AC97) -smp 4 -m 1024 \
+		     -net nic,model=e1000 -net user -drive file=harddrive.bin,format=raw
+	)
+	removeDir redox
 }
 
 function qemu2016day19 {
-download https://www.qemu-advent-calendar.org/2016/download/day19.tar.xz
-tar -xf day19.tar.xz
-cat bootchess/readme.txt
-execute qemu-system-i386 -drive file=bootchess/BootChess.bin,format=raw,if=floppy
-removeDir bootchess
+	download https://www.qemu-advent-calendar.org/2016/download/day19.tar.xz
+	tar -xf day19.tar.xz
+	cat bootchess/readme.txt
+	execute qemu-system-i386 -drive file=bootchess/BootChess.bin,format=raw,if=floppy
+	removeDir bootchess
 }
 
 function qemu2016day20 {
-download https://www.qemu-advent-calendar.org/2016/download/day20.tar.xz
-download https://prdownloads.sourceforge.net/open-beos/haiku-r1alpha4.1-vmdk.tar.xz?download \
-	haiku-r1alpha4.1-vmdk.tar.xz
-tar -xf day20.tar.xz
-cat haiku/readme.txt
-(
-cd haiku
-tar -xf ../haiku-r1alpha4.1-vmdk.tar.xz
-qemu-img convert -f vmdk haiku-r1alpha4.vmdk -O qcow2 haiku-r1alpha4.qcow2
-execute qemu-system-i386 $(accel) $(audio hda-duplex) -m 512 \
-	-hda haiku-r1alpha4.qcow2 -hdb blank-bfs-2048mb.vmdk
-)
-removeDir haiku
+	download https://www.qemu-advent-calendar.org/2016/download/day20.tar.xz
+	download https://prdownloads.sourceforge.net/open-beos/haiku-r1alpha4.1-vmdk.tar.xz?download \
+		haiku-r1alpha4.1-vmdk.tar.xz
+	tar -xf day20.tar.xz
+	cat haiku/readme.txt
+	(
+		cd haiku
+		tar -xf ../haiku-r1alpha4.1-vmdk.tar.xz
+		qemu-img convert -f vmdk haiku-r1alpha4.vmdk -O qcow2 haiku-r1alpha4.qcow2
+		execute qemu-system-i386 $(accel) $(audio hda-duplex) -m 512 \
+			-hda haiku-r1alpha4.qcow2 -hdb blank-bfs-2048mb.vmdk
+	)
+	removeDir haiku
 }
 
 function qemu2016day21 {
-download https://www.qemu-advent-calendar.org/2016/download/day21.tar.xz
-tar -xf day21.tar.xz
-cat wireguard/readme.txt
-execute qemu-system-i386 -nodefaults -machine q35 $(accel) -smp 2 -m 96M -monitor none \
-        -kernel wireguard/wireguard-test-4f257956-d81f-43f3-8fd8-1475360f58b8.kernel -append console=hvc0
-removeDir wireguard
+	download https://www.qemu-advent-calendar.org/2016/download/day21.tar.xz
+	tar -xf day21.tar.xz
+	cat wireguard/readme.txt
+	execute qemu-system-i386 -nodefaults -machine q35 $(accel) -smp 2 -m 96M -monitor none \
+		-kernel wireguard/wireguard-test-4f257956-d81f-43f3-8fd8-1475360f58b8.kernel -append console=hvc0
+	removeDir wireguard
 }
 		
 function qemu2016day22 {
-download https://www.qemu-advent-calendar.org/2016/download/day22.tar.xz
-tar -xf day22.tar.xz
-cat trianglix/readme.txt
-execute qemu-system-x86_64 $(accel) -m 1024 -vga std -drive file=trianglix/trianglix.qcow2,format=qcow2
-removeDir trianglix
+	download https://www.qemu-advent-calendar.org/2016/download/day22.tar.xz
+	tar -xf day22.tar.xz
+	cat trianglix/readme.txt
+	execute qemu-system-x86_64 $(accel) -m 1024 -vga std -drive file=trianglix/trianglix.qcow2,format=qcow2
+	removeDir trianglix
 }
 
 function qemu2016day23 {
-download https://www.qemu-advent-calendar.org/2016/download/day23.tar.xz
-tar -xf day23.tar.xz
-cat zx-spectrum/readme.txt
-execute qemu-system-x86_64 $(accel) $(audio ES1370) -drive if=ide,file=zx-spectrum/zxspectrum.qcow2
-removeDir zx-spectrum
+	download https://www.qemu-advent-calendar.org/2016/download/day23.tar.xz
+	tar -xf day23.tar.xz
+	cat zx-spectrum/readme.txt
+	execute qemu-system-x86_64 $(accel) $(audio ES1370) -drive if=ide,file=zx-spectrum/zxspectrum.qcow2
+	removeDir zx-spectrum
 }
 
 function qemu2016day24 {
-download https://www.qemu-advent-calendar.org/2016/download/day24.tar.xz
-tar -xf day24.tar.xz
-cat day24/readme.txt
-(
-	cd day24
-	execute qemu-system-i386 $(accel) $(audio AC97) -device VGA,addr=07.0 \
+	download https://www.qemu-advent-calendar.org/2016/download/day24.tar.xz
+	tar -xf day24.tar.xz
+	cat day24/readme.txt
+	(
+		cd day24
+		execute qemu-system-i386 $(accel) $(audio AC97) -device VGA,addr=07.0 \
 		-kernel kernel -initrd null,null,null,music.ogg
-)
-removeDir day24
+	)
+	removeDir day24
 }
 
 function qemu2014day24 {
-download https://www.qemu-advent-calendar.org/2014/download/day24.tar.xz
-tar -xf day24.tar.xz
-extractReadme day24/run
-(
-	cd day24
-	execute qemu-system-i386 $(accel) -kernel kernel \
-		-initrd null,null,null,music.ogg,win.ogg,loss.ogg $(audio AC97) -vga std
-)
-removeDir day24
+	download https://www.qemu-advent-calendar.org/2014/download/day24.tar.xz
+	tar -xf day24.tar.xz
+	extractReadme day24/run
+	(
+		cd day24
+		execute qemu-system-i386 $(accel) -kernel kernel \
+			-initrd null,null,null,music.ogg,win.ogg,loss.ogg $(audio AC97) -vga std
+	)
+	removeDir day24
 }
 
 function qemu2014day23 {
-download https://www.qemu-advent-calendar.org/2014/download/pebble-qemu-preview.tar.xz
-tar -xf pebble-qemu-preview.tar.xz
-extractReadme pebble-qemu-preview/run
-cat pebble-qemu-preview/README
-execute qemu-system-x86_64 $(accel) -rtc base=localtime -vga std -m 256 -usb \
-	-hda pebble-qemu-preview/pebble_qemu_preview.vdi
-removeDir pebble-qemu-preview
+	download https://www.qemu-advent-calendar.org/2014/download/pebble-qemu-preview.tar.xz
+	tar -xf pebble-qemu-preview.tar.xz
+	extractReadme pebble-qemu-preview/run
+	cat pebble-qemu-preview/README
+	execute qemu-system-x86_64 $(accel) -rtc base=localtime -vga std -m 256 -usb \
+		-hda pebble-qemu-preview/pebble_qemu_preview.vdi
+	removeDir pebble-qemu-preview
 }
 
 function qemu2014day22 {
-download https://www.qemu-advent-calendar.org/2014/download/s390-moon-buggy.tar.xz
-tar -xf s390-moon-buggy.tar.xz
-extractReadme s390-moon-buggy/run
-execute qemu-system-s390x -M s390-ccw-virtio -monitor none -kernel s390-moon-buggy/s390-bb.kernel \
-	-initrd s390-moon-buggy/s390-moon-buggy.initrd
-removeDir s390-moon-buggy
+	download https://www.qemu-advent-calendar.org/2014/download/s390-moon-buggy.tar.xz
+	tar -xf s390-moon-buggy.tar.xz
+	extractReadme s390-moon-buggy/run
+	execute qemu-system-s390x -M s390-ccw-virtio -monitor none -kernel s390-moon-buggy/s390-bb.kernel \
+		-initrd s390-moon-buggy/s390-moon-buggy.initrd
+	removeDir s390-moon-buggy
 }
 
 function qemu2014day21 {
-download https://www.qemu-advent-calendar.org/2014/download/boundvariable.tar.xz
-tar -xf boundvariable.tar.xz
-extractReadme boundvariable/run
-execute qemu-system-i386 $(accel) -m 1024 \
-	-drive if=virtio,file=boundvariable/boundvariable.qcow2,format=qcow2
-removeDir boundvariable
+	download https://www.qemu-advent-calendar.org/2014/download/boundvariable.tar.xz
+	tar -xf boundvariable.tar.xz
+	extractReadme boundvariable/run
+	execute qemu-system-i386 $(accel) -m 1024 \
+		-drive if=virtio,file=boundvariable/boundvariable.qcow2,format=qcow2
+	removeDir boundvariable
 }
 
 function qemu2014day20 {
-download https://www.qemu-advent-calendar.org/2014/download/helenos.tar.xz
-tar -xf helenos.tar.xz
-extractReadme helenos/run
-execute qemu-system-x86_64 $(accel) -net nic,model=e1000 \
-	-net user,hostfwd=::2223-:2223,hostfwd=::8080-:8080 \
-	-usb $(audio hda-duplex) -boot d -cdrom helenos/HelenOS-0.6.0-rc3-amd64.iso
-removeDir helenos
+	download https://www.qemu-advent-calendar.org/2014/download/helenos.tar.xz
+	tar -xf helenos.tar.xz
+	extractReadme helenos/run
+	execute qemu-system-x86_64 $(accel) -net nic,model=e1000 \
+		-net user,hostfwd=::2223-:2223,hostfwd=::8080-:8080 \
+		-usb $(audio hda-duplex) -boot d -cdrom helenos/HelenOS-0.6.0-rc3-amd64.iso
+	removeDir helenos
 }
 
 function qemu2014day19 {
-download https://www.qemu-advent-calendar.org/2014/download/mandelbrot.tar.xz
-tar -xf mandelbrot.tar.xz
-extractReadme mandelbrot/run
-execute qemu-system-ppc64 -M mac99 -drive file=mandelbrot/mandelbrot.raw,format=raw
-removeDir mandelbrot
+	download https://www.qemu-advent-calendar.org/2014/download/mandelbrot.tar.xz
+	tar -xf mandelbrot.tar.xz
+	extractReadme mandelbrot/run
+	execute qemu-system-ppc64 -M mac99 -drive file=mandelbrot/mandelbrot.raw,format=raw
+	removeDir mandelbrot
 }
 
 function qemu2014day18 {
-download https://www.qemu-advent-calendar.org/2014/download/ceph.tar.xz
-tar -xf ceph.tar.xz
-extractReadme ceph/run
-execute qemu-system-x86_64 $(accel) -m 1024M -drive file=ceph/ceph.qcow2,format=qcow2 \
-	-netdev user,id=net0,hostfwd=tcp::10022-:22 -device virtio-net-pci,netdev=net0
-removeDir ceph
+	download https://www.qemu-advent-calendar.org/2014/download/ceph.tar.xz
+	tar -xf ceph.tar.xz
+	extractReadme ceph/run
+	execute qemu-system-x86_64 $(accel) -m 1024M -drive file=ceph/ceph.qcow2,format=qcow2 \
+		-netdev user,id=net0,hostfwd=tcp::10022-:22 -device virtio-net-pci,netdev=net0
+	removeDir ceph
 }
 
 function qemu2014day17 {
-download https://www.qemu-advent-calendar.org/2014/download/bb_debian.tar.xz
-tar -xf bb_debian.tar.xz
-extractReadme bb_debian/run
-execute qemu-system-i386 $(accel) -m 512 -vga std $(audio hda-duplex) bb_debian/bb_debian.qcow2
-removeDir bb_debian
+	download https://www.qemu-advent-calendar.org/2014/download/bb_debian.tar.xz
+	tar -xf bb_debian.tar.xz
+	extractReadme bb_debian/run
+	execute qemu-system-i386 $(accel) -m 512 -vga std $(audio hda-duplex) bb_debian/bb_debian.qcow2
+	removeDir bb_debian
 }
 
 function qemu2014day16 {
-download https://www.qemu-advent-calendar.org/2014/download/tempest-showroom.tar.xz
-tar -xf tempest-showroom.tar.xz
-extractReadme tempest-showroom/run
-execute qemu-system-i386 $(accel) -cdrom tempest-showroom/tempest-showroom_v0.9.7.iso
-removeDir tempest-showroom
+	download https://www.qemu-advent-calendar.org/2014/download/tempest-showroom.tar.xz
+	tar -xf tempest-showroom.tar.xz
+	extractReadme tempest-showroom/run
+	execute qemu-system-i386 $(accel) -cdrom tempest-showroom/tempest-showroom_v0.9.7.iso
+	removeDir tempest-showroom
 }
 
 function qemu2014day15 {
-download https://www.qemu-advent-calendar.org/2014/download/plan9.tar.xz
-tar -xf plan9.tar.xz
-extractReadme plan9/run
-execute qemu-system-i386 $(accel) -m 1024 plan9/plan9.qcow2
-removeDir plan9
+	download https://www.qemu-advent-calendar.org/2014/download/plan9.tar.xz
+	tar -xf plan9.tar.xz
+	extractReadme plan9/run
+	execute qemu-system-i386 $(accel) -m 1024 plan9/plan9.qcow2
+	removeDir plan9
 }
 
 function qemu2014day14 {
-download https://www.qemu-advent-calendar.org/2014/download/invaders.tar.xz
-tar -xf invaders.tar.xz
-extractReadme invaders/run
-execute qemu-system-x86_64 $(accel) -kernel invaders/invaders.exec
-removeDir invaders
+	download https://www.qemu-advent-calendar.org/2014/download/invaders.tar.xz
+	tar -xf invaders.tar.xz
+	extractReadme invaders/run
+	execute qemu-system-x86_64 $(accel) -kernel invaders/invaders.exec
+	removeDir invaders
 }
 
 function qemu2014day13 {
-download https://www.qemu-advent-calendar.org/2014/download/2nd-reality.tar.xz
-tar -xf 2nd-reality.tar.xz
-extractReadme 2nd-reality/run
-execute qemu-system-i386 -vga std,retrace=precise $(audio gus) 2nd-reality/2nd-reality.qcow2
-removeDir 2nd-reality
+	download https://www.qemu-advent-calendar.org/2014/download/2nd-reality.tar.xz
+	tar -xf 2nd-reality.tar.xz
+	extractReadme 2nd-reality/run
+	execute qemu-system-i386 -vga std,retrace=precise $(audio gus) 2nd-reality/2nd-reality.qcow2
+	removeDir 2nd-reality
 }
 
 function qemu2014day12 {
-download https://www.qemu-advent-calendar.org/2014/download/oberon.tar.xz
-tar -xf oberon.tar.xz
-extractReadme oberon/run
-execute qemu-system-i386 $(accel) oberon/oberon.qcow2
-removeDir oberon
+	download https://www.qemu-advent-calendar.org/2014/download/oberon.tar.xz
+	tar -xf oberon.tar.xz
+	extractReadme oberon/run
+	execute qemu-system-i386 $(accel) oberon/oberon.qcow2
+	removeDir oberon
 }
 
 function qemu2014day11 {
-download https://www.qemu-advent-calendar.org/2014/download/osv-redis.tar.xz
-tar -xf osv-redis.tar.xz
-extractReadme osv-redis/run
-execute qemu-system-x86_64 $(accel) -m 256 \
-	-netdev user,id=user0,hostfwd=tcp::18000-:8000,hostfwd=tcp::16379-:6379 \
-	-device virtio-net-pci,netdev=user0 osv-redis/osv-redis-memonly-v0.16.qemu.qcow2
-removeDir osv-redis
+	download https://www.qemu-advent-calendar.org/2014/download/osv-redis.tar.xz
+	tar -xf osv-redis.tar.xz
+	extractReadme osv-redis/run
+	execute qemu-system-x86_64 $(accel) -m 256 \
+		-netdev user,id=user0,hostfwd=tcp::18000-:8000,hostfwd=tcp::16379-:6379 \
+		-device virtio-net-pci,netdev=user0 osv-redis/osv-redis-memonly-v0.16.qemu.qcow2
+	removeDir osv-redis
 }
 
 function qemu2014day10 {
-download https://www.qemu-advent-calendar.org/2014/download/512.tar.xz
-tar -xf 512.tar.xz
-extractReadme 512/run
-execute qemu-system-x86_64 -cpu Nehalem $(accel) -vga std $(pcspk) \
-	-drive file=512/512.img,if=floppy,format=raw
-removeDir 512
+	download https://www.qemu-advent-calendar.org/2014/download/512.tar.xz
+	tar -xf 512.tar.xz
+	extractReadme 512/run
+	execute qemu-system-x86_64 -cpu Nehalem $(accel) -vga std $(pcspk) \
+		-drive file=512/512.img,if=floppy,format=raw
+	removeDir 512
 }
 
 function qemu2014day09 {
-download https://www.qemu-advent-calendar.org/2014/download/ubuntu-core-alpha.tar.xz
-tar -xf ubuntu-core-alpha.tar.xz
-extractReadme ubuntu-core-alpha/run
-execute qemu-system-x86_64 $(accel) -m 1024 \
-	-drive if=virtio,file=ubuntu-core-alpha/ubuntu-core-alpha-01.img,format=qcow2 \
-	-netdev user,id=user0,hostfwd=tcp::18000-:80,hostfwd=tcp::12222-:22 \
-	-device virtio-net-pci,netdev=user0
-removeDir ubuntu-core-alpha
+	download https://www.qemu-advent-calendar.org/2014/download/ubuntu-core-alpha.tar.xz
+	tar -xf ubuntu-core-alpha.tar.xz
+	extractReadme ubuntu-core-alpha/run
+	execute qemu-system-x86_64 $(accel) -m 1024 \
+		-drive if=virtio,file=ubuntu-core-alpha/ubuntu-core-alpha-01.img,format=qcow2 \
+		-netdev user,id=user0,hostfwd=tcp::18000-:80,hostfwd=tcp::12222-:22 \
+		-device virtio-net-pci,netdev=user0
+	removeDir ubuntu-core-alpha
 }
 
 function qemu2014day08 {
-download https://www.qemu-advent-calendar.org/2014/download/qemu-xmas-uefi-zork.tar.xz
-[ -f "zork1.zip" ] ||
-	wget --no-check-certificate --user-agent='User-Agent: Mozilla/5.0' \
-	--referer=https://www.infocom-if.org/downloads/downloads.html \
-	https://www.infocom-if.org/downloads/zork1.zip
-tar -xf qemu-xmas-uefi-zork.tar.xz
-cat qemu-xmas-uefi-zork/README
-(
-cd qemu-xmas-uefi-zork
-unzip -o -q ../zork1.zip
-mkdir -p zork.img/EFI/BOOT
-mv BOOTX64.EFI zork.img/EFI/BOOT/
-mv -f startup.nsh Frotz.efi DATA/ZORK1.DAT zork.img/
-execute qemu-system-x86_64 $(accel) -name "uefi zork" -bios OVMF-pure-efi.fd -usb \
-	-device usb-storage,drive=zork -drive file=fat:rw:zork.img,id=zork,if=none,format=raw
-)
-removeDir qemu-xmas-uefi-zork
+	download https://www.qemu-advent-calendar.org/2014/download/qemu-xmas-uefi-zork.tar.xz
+	[ -f "zork1.zip" ] ||
+		wget --no-check-certificate --user-agent='User-Agent: Mozilla/5.0' \
+			--referer=https://www.infocom-if.org/downloads/downloads.html \
+			https://www.infocom-if.org/downloads/zork1.zip
+	tar -xf qemu-xmas-uefi-zork.tar.xz
+	cat qemu-xmas-uefi-zork/README
+	(
+		cd qemu-xmas-uefi-zork
+		unzip -o -q ../zork1.zip
+		mkdir -p zork.img/EFI/BOOT
+		mv BOOTX64.EFI zork.img/EFI/BOOT/
+		mv -f startup.nsh Frotz.efi DATA/ZORK1.DAT zork.img/
+		execute qemu-system-x86_64 $(accel) -name "uefi zork" -bios OVMF-pure-efi.fd -usb \
+			-device usb-storage,drive=zork -drive file=fat:rw:zork.img,id=zork,if=none,format=raw
+	)
+	removeDir qemu-xmas-uefi-zork
 }
 
 function qemu2014day07 {
-download https://www.qemu-advent-calendar.org/2014/download/qemu-xmas-minix3.tar.xz
-tar -xf qemu-xmas-minix3.tar.xz
-extractReadme qemu-xmas-minix3/run.sh
-execute qemu-system-x86_64 qemu-xmas-minix3/minix3.qcow2
-removeDir qemu-xmas-minix3
+	download https://www.qemu-advent-calendar.org/2014/download/qemu-xmas-minix3.tar.xz
+	tar -xf qemu-xmas-minix3.tar.xz
+	extractReadme qemu-xmas-minix3/run.sh
+	execute qemu-system-x86_64 qemu-xmas-minix3/minix3.qcow2
+	removeDir qemu-xmas-minix3
 }
 
 function qemu2014day06 {
-download https://www.qemu-advent-calendar.org/2014/download/fractal-mbr.tar.xz
-tar -xf fractal-mbr.tar.xz
-extractReadme fractal-mbr/run
-execute qemu-system-i386 -drive file=fractal-mbr/phosphene.mbr,format=raw $(accel)
-removeDir fractal-mbr
+	download https://www.qemu-advent-calendar.org/2014/download/fractal-mbr.tar.xz
+	tar -xf fractal-mbr.tar.xz
+	extractReadme fractal-mbr/run
+	execute qemu-system-i386 -drive file=fractal-mbr/phosphene.mbr,format=raw $(accel)
+	removeDir fractal-mbr
 }
 
 function qemu2014day05 {
-download https://www.qemu-advent-calendar.org/2014/download/arm64.tar.xz
-tar -xf arm64.tar.xz
-extractReadme arm64/run
-cat arm64/README
-export MSYS2_ARG_CONV_EXCL='*'
-execute qemu-system-aarch64 -m 1024 -cpu cortex-a57 -machine virt -monitor none -kernel arm64/Image \
-	-append 'root=/dev/vda2 rw rootwait mem=1024M console=ttyAMA0,38400n8' \
-	-drive if=none,id=image,file=arm64/armv8.qcow2 -netdev user,id=user0,hostfwd=tcp::5555-:22 \
-	-device virtio-net-device,netdev=user0 -device virtio-blk-device,drive=image
-unset MSYS2_ARG_CONV_EXCL
-removeDir arm64
+	download https://www.qemu-advent-calendar.org/2014/download/arm64.tar.xz
+	tar -xf arm64.tar.xz
+	extractReadme arm64/run
+	cat arm64/README
+	export MSYS2_ARG_CONV_EXCL='*'
+	execute qemu-system-aarch64 -m 1024 -cpu cortex-a57 -machine virt -monitor none -kernel arm64/Image \
+		-append 'root=/dev/vda2 rw rootwait mem=1024M console=ttyAMA0,38400n8' \
+		-drive if=none,id=image,file=arm64/armv8.qcow2 -netdev user,id=user0,hostfwd=tcp::5555-:22 \
+		-device virtio-net-device,netdev=user0 -device virtio-blk-device,drive=image
+	unset MSYS2_ARG_CONV_EXCL
+	removeDir arm64
 }
 
 function qemu2014day04 {
-download https://www.qemu-advent-calendar.org/2014/download/stxmas.tar.xz
-tar -xf stxmas.tar.xz
-extractReadme stxmas/run
-execute qemu-system-i386 -drive file=stxmas/stxmas.img,format=raw $(audio ES1370)
-removeDir stxmas
+	download https://www.qemu-advent-calendar.org/2014/download/stxmas.tar.xz
+	tar -xf stxmas.tar.xz
+	extractReadme stxmas/run
+	execute qemu-system-i386 -drive file=stxmas/stxmas.img,format=raw $(audio ES1370)
+	removeDir stxmas
 }
 
 function qemu2014day03 {
-download https://www.qemu-advent-calendar.org/2014/download/pi.tar.xz
-tar -xf pi.tar.xz
-extractReadme pi/run
-execute qemu-system-i386 -drive file=pi/pi.vfd,format=raw
-removeDir pi
+	download https://www.qemu-advent-calendar.org/2014/download/pi.tar.xz
+	tar -xf pi.tar.xz
+	extractReadme pi/run
+	execute qemu-system-i386 -drive file=pi/pi.vfd,format=raw
+	removeDir pi
 }
 
 function qemu2014day02 {
-download https://www.qemu-advent-calendar.org/2014/download/freedos.tar.xz
-tar -xf freedos.tar.xz
-extractReadme freedos/run
-execute qemu-system-i386 freedos/freedos.qcow2
-removeDir freedos
+	download https://www.qemu-advent-calendar.org/2014/download/freedos.tar.xz
+	tar -xf freedos.tar.xz
+	extractReadme freedos/run
+	execute qemu-system-i386 freedos/freedos.qcow2
+	removeDir freedos
 }
 
 function qemu2014day01 {
-download https://www.qemu-advent-calendar.org/2014/download/qemu-xmas-slackware.tar.xz
-tar -xf qemu-xmas-slackware.tar.xz
-xzcat qemu-xmas-slackware/slackware.qcow2.xz > qemu-xmas-slackware/slackware.qcow2
-extractReadme qemu-xmas-slackware/run
-cat qemu-xmas-slackware/README
-execute qemu-system-x86_64 $(accel) -m 16M \
-	-drive if=ide,format=qcow2,file=qemu-xmas-slackware/slackware.qcow2 \
-	-netdev user,id=slirp -device ne2k_isa,netdev=slirp
-removeDir qemu-xmas-slackware
+	download https://www.qemu-advent-calendar.org/2014/download/qemu-xmas-slackware.tar.xz
+	tar -xf qemu-xmas-slackware.tar.xz
+	xzcat qemu-xmas-slackware/slackware.qcow2.xz > qemu-xmas-slackware/slackware.qcow2
+	extractReadme qemu-xmas-slackware/run
+	cat qemu-xmas-slackware/README
+	execute qemu-system-x86_64 $(accel) -m 16M \
+		-drive if=ide,format=qcow2,file=qemu-xmas-slackware/slackware.qcow2 \
+		-netdev user,id=slirp -device ne2k_isa,netdev=slirp
+	removeDir qemu-xmas-slackware
 }
 
 export PIDFILE=".qemupid.$(date +%s)"
@@ -1561,7 +1823,7 @@ determineAccel
 case $BLOCK in
 	2020)
 		DIR="$DOWNLOADDIR/qemu-advent-calendar/2020"
-		require wget
+		require ${MINGW_PACKAGE_PREFIX}-qemu wget
 		perform qemu2020day01
 		# SKIP qemu2020day02 - contains qemu-5.2.0-rc4.tar.xz
 		perform qemu2020day03
@@ -1589,7 +1851,7 @@ case $BLOCK in
 		;;
 	2018)
 		DIR="$DOWNLOADDIR/qemu-advent-calendar/2018"
-		require wget
+		require ${MINGW_PACKAGE_PREFIX}-qemu wget
 		perform qemu2018day01
 		perform qemu2018day02
 		perform qemu2018day03
@@ -1619,7 +1881,7 @@ case $BLOCK in
 		;;
 	2016)
 		DIR="$DOWNLOADDIR/qemu-advent-calendar/2016"
-		require wget unzip p7zip
+		require ${MINGW_PACKAGE_PREFIX}-qemu wget unzip p7zip
 		perform qemu2016day01
 		ignoreSize && perform qemu2016day02
 		perform qemu2016day03
@@ -1649,7 +1911,7 @@ case $BLOCK in
 		;;
 	2014)
 		DIR="$DOWNLOADDIR/qemu-advent-calendar/2014"
-		require wget unzip
+		require ${MINGW_PACKAGE_PREFIX}-qemu wget unzip
 		perform qemu2014day01
 		perform qemu2014day02
 		perform qemu2014day03
@@ -1677,7 +1939,7 @@ case $BLOCK in
 		;;
 	HD)
 		DIR="$DOWNLOADDIR/qemu-desktop"
-		require wget ${MINGW_PACKAGE_PREFIX}-spice-gtk ${MINGW_PACKAGE_PREFIX}-gtk-vnc
+		require ${MINGW_PACKAGE_PREFIX}-qemu wget ${MINGW_PACKAGE_PREFIX}-spice-gtk ${MINGW_PACKAGE_PREFIX}-gtk-vnc
 		perform qemuInstalledDesktopSDL
 		perform qemuInstalledDesktopGTK
 		perform qemuInstalledDesktopVNC1
@@ -1685,10 +1947,21 @@ case $BLOCK in
 		perform qemuInstalledDesktopSPICE1
 		perform qemuInstalledDesktopSPICE2
 		;;
+	QIMG)
+		DIR="$DOWNLOADDIR/qemu-desktop"
+		require ${MINGW_PACKAGE_PREFIX}-qemu-image-util wget
+		perform qemuLiveDesktopQemuImgOperations
+		perform qemuLiveDesktopQemuImgConversions
+		;;
+	QGA)
+		DIR="$DOWNLOADDIR/qemu-desktop"
+		require ${MINGW_PACKAGE_PREFIX}-qemu-guest-agent
+		isWindows && perform qemuElevatedInstallWinGuestAgent
+		;;
 	*)
 		BLOCK=DVD
 		DIR="$DOWNLOADDIR/qemu-desktop"
-		require wget ${MINGW_PACKAGE_PREFIX}-spice-gtk ${MINGW_PACKAGE_PREFIX}-gtk-vnc
+		require ${MINGW_PACKAGE_PREFIX}-qemu wget ${MINGW_PACKAGE_PREFIX}-spice-gtk ${MINGW_PACKAGE_PREFIX}-gtk-vnc socat
 		perform qemuLiveDesktopSPICE
 		perform qemuLiveDesktopSDL
 		perform qemuLiveDesktopGTK
@@ -1697,7 +1970,7 @@ case $BLOCK in
 		perform qemuLiveDesktopUEFI_Pflash
 		perform qemuLiveDesktopUEFI_Bios_Noaccel
 		perform qemuLiveDesktopUEFI_Pflash_Noaccel
-		perform qemuLiveDesktopQemuImgOperations
+		perform qemuLiveDesktopQemuGuestSupport
 		;;
 esac
 
diff --git a/mingw-w64-qemu/msys2.qemu-guest-agent.txt b/mingw-w64-qemu/msys2.qemu-guest-agent.txt
new file mode 100644
index 0000000000..8456b62623
--- /dev/null
+++ b/mingw-w64-qemu/msys2.qemu-guest-agent.txt
@@ -0,0 +1,90 @@
+----------
+Versioning
+----------
+There are concurrent versioning schemes depending on the distribution source.
+This qemu-ga binary shows the version based on QEMU source code.
+
+----------------------------------------------
+Start the guest with QEMU Guest Agent support:
+----------------------------------------------
+Before installing qemu-ga in the Windows guest, start the QEMU process for the Windows guest with guest support.
+
+On Linux host add the following parameters to the qemu command line for guest support
+	-device virtio-serial-pci \
+	-chardev socket,id=qga0,path=qga.sock,server=on,wait=off \
+	-device virtserialport,chardev=qga0,name=org.qemu.guest_agent.0
+
+On Windows host add the following parameters to the qemu command line
+	-device virtio-serial-pci \
+	-chardev socket,id=qga0,port=5906,host=127.0.0.1,server=on,wait=off \
+	-device virtserialport,chardev=qga0,name=org.qemu.guest_agent.0
+
+Further information:
+https://wiki.qemu.org/Features/GuestAgent
+
+------------------------------------------
+Install QEMU Guest Agent in Windows guest:
+------------------------------------------
+Install software as usual for your architecture:
+pacman -S mingw-w64-<ARCH>-qemu-guest-agent
+ARCH=x86_64: pacman -S mingw-w64-x86_64-qemu-guest-agent
+
+As administrator start an installation shell depending on your architecture.
+ARCH=x86_64: Start "MSYS2 MinGW 64-bit" shell as administrator
+
+Check and stop an already registered qemu-ga with
+net stop "QEMU Guest Agent"
+net stop "QEMU Guest Agent VSS Provider"
+
+Verify that the msys2 provided qemu-ga works with
+qemu-ga -v
+
+If the process logs messages and keeps running, qemu-ga is ready to react upon requests.
+Stop this foreground qemu-ga with CTRL-C to go on.
+
+If existing, uninstall the old qemu-ga using its appropriate routine now.
+
+Register the msys2 provided qemu-ga with
+qemu-ga -s install
+
+Start freshly registered qemu-ga service with
+net start "QEMU Guest Agent"
+
+qemu-ga service is configured to start automatically on restart.
+
+Furher information:
+man qemu-ga
+https://bugzilla.redhat.com/show_bug.cgi?id=962669
+
+----------------------
+Using QEMU Guest Agent
+----------------------
+Reacts in guest OS to your requests sent from host OS.
+
+Open a shell on the host to connect to the guest's socket while qemu-ga is active now.
+
+On Linux host (after installing socat)
+socat - unix-connect:qga.sock
+
+On Windows host (after pacman -S socat)
+socat - tcp-connect:127.0.0.1:5906
+
+Now you are ready to send a json request to the agent. For example sending
+{"execute": "guest-info"}
+
+will be answered with
+{"return": {"version": "6.2.93", "supported_commands": ...
+
+Stop the connection with CTRL-C
+
+Further information:
+man qemu-ga-ref
+
+-----------------------------
+QEMU Guest Agent VSS Provider
+-----------------------------
+VSS defines a process to create consistent backups initiated from Windows guest.
+
+Further information:
+https://docs.microsoft.com/en-us/windows-server/storage/file-server/volume-shadow-copy-service
+https://bugzilla.redhat.com/show_bug.cgi?id=1286672