start-qemu-vm.sh: fix for ARM and x86

.local/scripts/other-common-scripts/start-qemu-vm.sh

@@ -34,17 +34,17 @@ HDA="$2"
 CDR="$3"
 
 [ -d "${HOME}/.vms" ] || mkdir "${HOME}/.vms"
-if [ ! -f "${HOME}/.vms/result/u-boot.bin" ]; then
+OVMF_DIR="${HOME}/.vms/result-fd/FV"
+if [ ! -d "${OVMF_DIR}" ]; then
     if [ "$(uname -m)" == 'aarch64' ]; then
-        NIX_UBOOT_ARCH='Aarch64'
         QEMU_MACHINE='virt'
+        BIOS="${OVMF_DIR}/QEMU_EFI.fd"
     elif [ "$(uname -m)" == 'x86_64' ]; then
-        NIX_UBOOT_ARCH='X86'
         QEMU_MACHINE='pc'
+        BIOS="${OVMF_DIR}/OVMF.fd"
     fi
-    NIX_UBOOT_PKG="nixpkgs#ubootQemu${NIX_UBOOT_ARCH}"
     pushd "${HOME}/.vms"
-    nix build "${NIX_UBOOT_PKG}"
+    nix build 'nixpkgs#OVMF.fd'
     popd
 fi
 
@@ -56,7 +56,7 @@ QEMU_COMMON="--all-tasks --cpu-list 4-7 \
         -accel kvm \
         -m 8192 \
         -nographic \
-        -bios ${HOME}/.vms/result/u-boot.bin \
+        -bios ${BIOS} \
         -sandbox on \
         -netdev user,id=mynet0,hostfwd=tcp::${HOST_PORT}-:22 \
         -device virtio-net-pci,netdev=mynet0"