[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/7] Revert "qemu-options.hx: Update for reboot-timeout parameter"
From: |
Laurent Vivier |
Subject: |
[PULL 6/7] Revert "qemu-options.hx: Update for reboot-timeout parameter" |
Date: |
Wed, 18 Dec 2019 14:01:04 +0100 |
From: Han Han <address@hidden>
This reverts commit bbd9e6985ff342cbe15b9cb7eb30e842796fbbe8.
In 20a1922032 we allowed reboot-timeout=-1 again, so update the doc
accordingly.
Signed-off-by: Han Han <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
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
- [PULL 0/7] Trivial branch patches, Laurent Vivier, 2019/12/18
- [PULL 2/7] monitor: Remove unused define, Laurent Vivier, 2019/12/18
- [PULL 5/7] target/sparc: Remove old TODO file, Laurent Vivier, 2019/12/18
- [PULL 3/7] util/cutils: Turn FIXME comment into QEMU_BUILD_BUG_ON(), Laurent Vivier, 2019/12/18
- [PULL 7/7] qemu-doc: Remove the unused "Guest Agent" node, Laurent Vivier, 2019/12/18
- [PULL 4/7] test-keyval: Tighten test of trailing crap after size, Laurent Vivier, 2019/12/18
- [PULL 1/7] MAINTAINERS: Add hw/sd/ssi-sd.c in the SD section, Laurent Vivier, 2019/12/18
- [PULL 6/7] Revert "qemu-options.hx: Update for reboot-timeout parameter",
Laurent Vivier <=
- Re: [PULL 0/7] Trivial branch patches, Peter Maydell, 2019/12/20