Kernel KVM virtualization development
 help / color / mirror / Atom feed
From: Andrew Jones <andrew.jones@linux.dev>
To: kvm@vger.kernel.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	Thomas Huth <thuth@redhat.com>,
	Nikos Nikoleris <nikos.nikoleris@arm.com>
Subject: [kvm-unit-tests PATCH 1/3] arch-run: Extend timeout when booting with UEFI
Date: Wed,  7 Jun 2023 20:59:03 +0200	[thread overview]
Message-ID: <20230607185905.32810-2-andrew.jones@linux.dev> (raw)
In-Reply-To: <20230607185905.32810-1-andrew.jones@linux.dev>

Booting UEFI can take a long time. Give the timeout some extra time
to compensate for it.

Signed-off-by: Andrew Jones <andrew.jones@linux.dev>
---
 scripts/arch-run.bash | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/arch-run.bash b/scripts/arch-run.bash
index 51e4b97b27d1..72ce718b1170 100644
--- a/scripts/arch-run.bash
+++ b/scripts/arch-run.bash
@@ -94,7 +94,17 @@ run_qemu_status ()
 
 timeout_cmd ()
 {
+	local s
+
 	if [ "$TIMEOUT" ] && [ "$TIMEOUT" != "0" ]; then
+		if [ "$CONFIG_EFI" = 'y' ]; then
+			s=${TIMEOUT: -1}
+			if [ "$s" = 's' ]; then
+				TIMEOUT=${TIMEOUT:0:-1}
+				((TIMEOUT += 10)) # Add 10 seconds for booting UEFI
+				TIMEOUT="${TIMEOUT}s"
+			fi
+		fi
 		echo "timeout -k 1s --foreground $TIMEOUT"
 	fi
 }
-- 
2.40.1


  reply	other threads:[~2023-06-07 18:59 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-07 18:59 [kvm-unit-tests PATCH 0/3] EFI runtime fixes Andrew Jones
2023-06-07 18:59 ` Andrew Jones [this message]
2023-06-15 14:46   ` [kvm-unit-tests PATCH 1/3] arch-run: Extend timeout when booting with UEFI Nikos Nikoleris
2023-06-07 18:59 ` [kvm-unit-tests PATCH 2/3] arm/efi/run: Add Fedora's path to QEMU_EFI Andrew Jones
2023-06-15 14:47   ` Nikos Nikoleris
2023-06-07 18:59 ` [kvm-unit-tests PATCH 3/3] configure: efi: Link correct run script Andrew Jones
2023-06-15 14:48   ` Nikos Nikoleris
2023-06-23 15:37 ` [kvm-unit-tests PATCH 0/3] EFI runtime fixes Andrew Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230607185905.32810-2-andrew.jones@linux.dev \
    --to=andrew.jones@linux.dev \
    --cc=kvm@vger.kernel.org \
    --cc=nikos.nikoleris@arm.com \
    --cc=pbonzini@redhat.com \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox