From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, Markus Armbruster <armbru@redhat.com>,
Michael Tokarev <mjt@tls.msk.ru>,
Laurent Vivier <laurent@vivier.eu>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Han Han <hhan@redhat.com>
Subject: [PULL 6/7] Revert "qemu-options.hx: Update for reboot-timeout parameter"
Date: Wed, 18 Dec 2019 14:01:04 +0100 [thread overview]
Message-ID: <20191218130105.125981-7-laurent@vivier.eu> (raw)
In-Reply-To: <20191218130105.125981-1-laurent@vivier.eu>
From: Han Han <hhan@redhat.com>
This reverts commit bbd9e6985ff342cbe15b9cb7eb30e842796fbbe8.
In 20a1922032 we allowed reboot-timeout=-1 again, so update the doc
accordingly.
Signed-off-by: Han Han <hhan@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20191205024821.245435-1-hhan@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
qemu-options.hx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index c63e794b64d1..6cbbefd08169 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -327,8 +327,8 @@ format(true color). The resolution should be supported by the SVGA mode, so
the recommended is 320x240, 640x480, 800x640.
A timeout could be passed to bios, guest will pause for @var{rb_timeout} ms
-when boot failed, then reboot. If @option{reboot-timeout} is not set,
-guest will not reboot by default. Currently Seabios for X86
+when boot failed, then reboot. If @var{rb_timeout} is '-1', guest will not
+reboot, qemu passes '-1' to bios by default. Currently Seabios for X86
system support it.
Do strict boot via @option{strict=on} as far as firmware/BIOS
--
2.24.1
next prev parent reply other threads:[~2019-12-18 13:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 13:00 [PULL 0/7] Trivial branch patches Laurent Vivier
2019-12-18 13:00 ` [PULL 1/7] MAINTAINERS: Add hw/sd/ssi-sd.c in the SD section Laurent Vivier
2019-12-18 13:01 ` [PULL 2/7] monitor: Remove unused define Laurent Vivier
2019-12-18 13:01 ` [PULL 3/7] util/cutils: Turn FIXME comment into QEMU_BUILD_BUG_ON() Laurent Vivier
2019-12-18 13:01 ` [PULL 4/7] test-keyval: Tighten test of trailing crap after size Laurent Vivier
2019-12-18 13:01 ` [PULL 5/7] target/sparc: Remove old TODO file Laurent Vivier
2019-12-18 13:01 ` Laurent Vivier [this message]
2019-12-18 13:01 ` [PULL 7/7] qemu-doc: Remove the unused "Guest Agent" node Laurent Vivier
2019-12-20 14:00 ` [PULL 0/7] Trivial branch patches Peter Maydell
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=20191218130105.125981-7-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=hhan@redhat.com \
--cc=mjt@tls.msk.ru \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/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;
as well as URLs for NNTP newsgroup(s).