Revert "testing: Use alternative filenames for OVMF_{VARS,CODE}"

This reverts commit b6f874e.

Author: legionus

testing/sh-functions

@@ -120,23 +120,9 @@ prepare_testsuite()
 	esac
 }
 
-get_ovmf_file()
-{
-	local ret="$1"; shift
-	while [ "$#" -gt 0 ]; do
-		if [ -e "$1" ]; then
-			eval "$ret=\"\$1\""
-			return
-		fi
-		shift
-	done
-	fatal "$ret not found"
-}
-
 qemu_setup_cpu()
 {
 	:> "$workdir/qemu-cpu"
-	:> "$workdir/qemu-efi"
 
 	if [ ! -c /dev/kvm ]; then
 		local ncpu
@@ -151,31 +137,23 @@ qemu_setup_cpu()
 		 >> "$workdir/qemu-cpu"
 	fi
 
-	local ovmf_vars="" ovmf_code="" machine="pc"
-
 	case "${BOOT_BIOS:-pc}" in
 		efi)
-			get_ovmf_file ovmf_vars \
-				/usr/share/OVMF/OVMF_VARS_4M.fd \
-				/usr/share/OVMF/OVMF_VARS.fd
-
-			get_ovmf_file ovmf_code \
-				/usr/share/OVMF/OVMF_CODE_4M.fd \
-				/usr/share/OVMF/OVMF_CODE.fd
-
-			cp -vTLf -- "$ovmf_vars" "$top_workdir"/efivars.bin
+			[ -f "$top_workdir"/efivars.bin ] ||
+				cp -vTLf /usr/share/OVMF/OVMF_VARS_4M.fd "$top_workdir"/efivars.bin
 
 			qemu_args \
-			 -drive if=pflash,format=raw,readonly=on,file="$ovmf_code" \
+			 -machine q35 \
+			 -drive if=pflash,format=raw,readonly=on,file=/usr/share/OVMF/OVMF_CODE_4M.fd \
 			 -drive if=pflash,format=raw,file="$top_workdir/efivars.bin" \
-			 >> "$workdir/qemu-efi"
-
-			machine=q35
+			 >> "$workdir/qemu-cpu"
+			;;
+		pc)
+			qemu_args \
+			 -machine pc \
+			 >> "$workdir/qemu-cpu"
 			;;
 	esac
-
-	qemu_args -machine "$machine" \
-	 >> "$workdir/qemu-cpu"
 }
 
 create_qemu_wrapper()
@@ -197,7 +175,6 @@ create_qemu_wrapper()
 	qemu_args+=( -mon chardev=stdio,mode=readline )
 	qemu_args+=( -pidfile "$top_workdir/qemu.pid" )
 	. "$top_workdir/qemu-cpu"
-	. "$top_workdir/qemu-efi"
 	. "$top_workdir/qemu-disks"
 	. "$top_workdir/qemu-sdcards"
 	set -x