run_qemu.sh: replace qemu -S + KVM with a long bootloader timeout

qemu -S does not seem compatible with KVM, see
#11
For details.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>

Author: marc-hb

run_qemu.sh

@@ -810,15 +810,25 @@ update_rootfs_boot_kernel()
 	sudo mkdir -p "$builddir/mnt/run-qemu-kernel/$kver"
 	sudo cp "$builddir/mkosi.extra/boot/vmlinuz-$kver" "$builddir/mnt/run-qemu-kernel/$kver/vmlinuz"
 
+	local loader_timeout=4
+	if [[ $_arg_kvm == "on" ]] && [[ $_arg_gdb == "on" ]]; then
+		# KVM is not compatible with qemu -S, see
+		# https://github.com/pmem/run_qemu/issues/11
+		loader_timeout=301
+	fi
+
 	defconf="$builddir/mnt/loader/loader.conf"
 	if [ -f "$defconf" ]; then
-		sudo sed -i -e 's/^#.*timeout.*/timeout 4/' "$defconf"
+		# mkosi->"bootctl install ..." creates a stub loader.conf
+		sudo sed -i -e 's/^#.*timeout.*/timeout '"$loader_timeout/" "$defconf"
 		sudo sed -i -e '/default.*/d' "$defconf"
 	else
-		echo "timeout 4" | sudo tee "$defconf"
+		echo "timeout $loader_timeout" | sudo tee "$defconf"
 	fi
 	echo "default run-qemu-kernel-$kver.conf" | sudo tee -a "$defconf"
 
+	generatedfrom_header 'update_rootfs_boot_kernel()' | sudo tee -a "$defconf" > /dev/null
+
 	# Fedora
 	sudo cp "$ovmf_path"/Shell.efi "$builddir"/mnt/shellx64.efi ||
 		# Arch Linux
@@ -1575,7 +1585,22 @@ prepare_qcmd()
 	fi
 
 	if [ "$_arg_gdb" == "on" ]; then
-		qcmd+=("-gdb" "tcp::10000" "-S")
+		qcmd+=("-gdb" "tcp::10000")
+		# -S seems to rely on a _software_ breakpoint which seems incompatible with KVM,
+		# see https://github.com/pmem/run_qemu/issues/11
+		if [[ "$_arg_kvm" == 'on' ]]; then
+		    {
+			printf '\n\nWARNING: qemu "-S" option seems incompatible with KVM; not used.\n'
+			if [[ "$_arg_direct_kernel" == 'on' ]]; then
+				printf '\tOption --no-direct-kernel is recommended.\n\n'
+			else
+				printf '\tBoot loader will wait a few minutes.\n\n'
+			fi
+		    } >&2
+			sleep 2
+		else
+		       qcmd+=("-S")
+		fi
 	fi
 
 	# cpu + mem nodes (i.e. the --nodes option)