qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Michael Tokarev" <mjt@tls.msk.ru>, "Han Han" <hhan@redhat.com>,
	"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
	qemu-block@nongnu.org, qemu-trivial@nongnu.org,
	"Helge Deller" <deller@gmx.de>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Hervé Poussineau" <hpoussin@reactos.org>,
	"Joel Stanley" <joel@jms.id.au>,
	"David Gibson" <david@gibson.dropbear.id.au>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Artyom Tarasenko" <atar4qemu@gmail.com>,
	"Laurent Vivier" <lvivier@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Eduardo Habkost" <ehabkost@redhat.com>,
	"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
	"Alistair Francis" <alistair@alistair23.me>,
	qemu-arm@nongnu.org, "Cédric Le Goater" <clg@kaod.org>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Igor Mammedov" <imammedo@redhat.com>,
	"Richard Henderson" <rth@twiddle.net>,
	"Andrew Jeffery" <andrew@aj.id.au>,
	"Laurent Vivier" <laurent@vivier.eu>,
	"Aleksandar Rikalo" <arikalo@wavecomp.com>,
	qemu-ppc@nongnu.org,
	"Aleksandar Markovic" <amarkovic@wavecomp.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PULL 01/19] qemu-options.hx: Update for reboot-timeout parameter
Date: Fri, 25 Oct 2019 10:34:53 +0200	[thread overview]
Message-ID: <20191025083511.11463-2-laurent@vivier.eu> (raw)
In-Reply-To: <20191025083511.11463-1-laurent@vivier.eu>

From: Han Han <hhan@redhat.com>

Since ee5d0f89d, -1 is not valid for the value of reboot-timeout. Update
that in qemu-options doc.

Signed-off-by: Han Han <hhan@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191015151451.727323-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 996b6fba7461..88b05599b1cd 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 @var{rb_timeout} is '-1', guest will not
-reboot, qemu passes '-1' to bios by default. Currently Seabios for X86
+when boot failed, then reboot. If @option{reboot-timeout} is not set,
+guest will not reboot by default. Currently Seabios for X86
 system support it.
 
 Do strict boot via @option{strict=on} as far as firmware/BIOS
-- 
2.21.0



  reply	other threads:[~2019-10-25  8:44 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-25  8:34 [PULL 00/19] Trivial branch patches Laurent Vivier
2019-10-25  8:34 ` Laurent Vivier [this message]
2019-10-25  8:34 ` [PULL 02/19] pci_bridge: fix a typo in comment Laurent Vivier
2019-10-25  8:34 ` [PULL 03/19] util/async: avoid useless cast Laurent Vivier
2019-10-25  8:34 ` [PULL 04/19] event_notifier: avoid dandling file descriptor in event_notifier_cleanup Laurent Vivier
2019-10-25  8:34 ` [PULL 05/19] qemu-timer: reuse MIN macro in qemu_timeout_ns_to_ms Laurent Vivier
2019-10-25  8:34 ` [PULL 06/19] hw/timer: Compile devices not target-dependent as common object Laurent Vivier
2019-10-25  8:34 ` [PULL 07/19] hw: Move PL031 device from hw/timer/ to hw/rtc/ subdirectory Laurent Vivier
2019-10-25  8:35 ` [PULL 08/19] hw: Move MC146818 " Laurent Vivier
2019-10-25  8:35 ` [PULL 09/19] hw: Move M48T59 " Laurent Vivier
2019-10-25  8:35 ` [PULL 10/19] hw: Move M41T80 " Laurent Vivier
2019-10-25  8:35 ` [PULL 11/19] hw: Move sun4v hypervisor RTC " Laurent Vivier
2019-10-25  8:35 ` [PULL 12/19] hw: Move TWL92230 device " Laurent Vivier
2019-10-25  8:35 ` [PULL 13/19] hw: Move DS1338 " Laurent Vivier
2019-10-25  8:35 ` [PULL 14/19] hw: Move Xilinx ZynqMP RTC " Laurent Vivier
2019-10-25  8:35 ` [PULL 15/19] hw: Move Exynos4210 " Laurent Vivier
2019-10-25  8:35 ` [PULL 16/19] hw: Move Aspeed " Laurent Vivier
2019-10-25  8:35 ` [PULL 17/19] hw/rtc/mc146818: Include mc146818rtc_regs.h a bit less Laurent Vivier
2019-10-25  8:35 ` [PULL 18/19] hw/rtc/xlnx-zynqmp-rtc: Remove unused "ptimer.h" include Laurent Vivier
2019-10-25  8:35 ` [PULL 19/19] hw/rtc/aspeed_rtc: Remove unused includes Laurent Vivier
2019-10-25 13:59 ` [PULL 00/19] 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=20191025083511.11463-2-laurent@vivier.eu \
    --to=laurent@vivier.eu \
    --cc=alistair@alistair23.me \
    --cc=amarkovic@wavecomp.com \
    --cc=andrew@aj.id.au \
    --cc=arikalo@wavecomp.com \
    --cc=armbru@redhat.com \
    --cc=atar4qemu@gmail.com \
    --cc=aurelien@aurel32.net \
    --cc=clg@kaod.org \
    --cc=david@gibson.dropbear.id.au \
    --cc=deller@gmx.de \
    --cc=edgar.iglesias@gmail.com \
    --cc=ehabkost@redhat.com \
    --cc=fam@euphon.net \
    --cc=hhan@redhat.com \
    --cc=hpoussin@reactos.org \
    --cc=imammedo@redhat.com \
    --cc=joel@jms.id.au \
    --cc=lvivier@redhat.com \
    --cc=mark.cave-ayland@ilande.co.uk \
    --cc=mjt@tls.msk.ru \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=stefanha@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;
as well as URLs for NNTP newsgroup(s).