Skip to contentSkip to conversation

qemu-options.hx: Update for reboot-timeout parameter

PATCH Applied Han Han 4 participants 4 messages Oct 15, 2019 – Oct 24, 2019

lore
Share & tools
lore

Han Han

author
#0 lore raw

PATCH 1/1 qemu-options.hx: Update for reboot-timeout parameter

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

---
 qemu-options.hx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
qemu-options.hx +2 -2
index 793d70ff..6b92a916 100644
@@ -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
Signature · 1 line
2.23.0
Reviewed-by on v1 1/1
#1 lore raw

qemu-options.hx format(true color). The resolution should be supported by the SVGA mode, so

Quoted 13 lines · Han Han

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

---
 qemu-options.hx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
qemu-options.hx +0 -0
index 793d70ff..6b92a916 100644
@@ -327,8 +327,8 @@ format(true color). The resolution should be supported by the SVGA mode, so

A splash picture could be passed to bios, enabling user to show it as logo, when option splash=@var{sp_name} is given and menu=on, If firmware/BIOS supports them. Currently Seabios for X86 system support it.
limitation: The splash file could be a jpeg file or a BMP file in 24 BPP format(true color). The resolution should be supported by the SVGA mode, so

qemu-options.hx format(true color). The resolution should be supported by the SVGA mode, so · line 334

Quoted 10 lines
qemu-options.hx +2 -2
 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

Preexisting: "could be passed" sounds awkward. Same in the previous paragraph. Not this patch's problem, so:

#2 lore raw
Quoted 29 lines · Markus Armbruster

qemu-options.hx format(true color). The resolution should be supported by the SVGA mode, so

Quoted 13 lines · Han Han

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

---
  qemu-options.hx | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
qemu-options.hx +0 -0
index 793d70ff..6b92a916 100644
@@ -327,8 +327,8 @@ format(true color). The resolution should be supported by the SVGA mode, so

A splash picture could be passed to bios, enabling user to show it as logo, when option splash=@var{sp_name} is given and menu=on, If firmware/BIOS supports them. Currently Seabios for X86 system support it.
limitation: The splash file could be a jpeg file or a BMP file in 24 BPP format(true color). The resolution should be supported by the SVGA mode, so

Quoted 9 lines
qemu-options.hx +2 -2
  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.
 
Quoted 6 lines

qemu-options.hx format(true color). The resolution should be supported by the SVGA mode, so · line 334

Quoted 1 line
qemu-options.hx +0 -0
  Do strict boot via @option{strict=on} as far as firmware/BIOS

Preexisting: "could be passed" sounds awkward. Same in the previous paragraph. Not this patch's problem, so:

I assume this patch will go via qemu-trivial.

#3 lore raw

Le 22/10/2019 à 14:52, Philippe Mathieu-Daudé a écrit :

Quoted 40 lines · Markus Armbruster
Quoted 39 lines
Quoted 13 lines · Han Han

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

---
  qemu-options.hx | 4 ++--

  1 file changed, 2 insertions(+), 2 deletions(-)
qemu-options.hx +0 -0
index 793d70ff..6b92a916 100644
@@ -327,8 +327,8 @@ format(true color). The resolution should be
Quoted 1 line

supported by the SVGA mode, so

    A splash picture could be passed to bios, enabling user to show it as logo,
    when option splash=@var{sp_name} is given and menu=on, If firmware/BIOS
    supports them. Currently Seabios for X86 system support it.
    limitation: The splash file could be a jpeg file or a BMP file in 24 BPP
    format(true color). The resolution should be supported by the SVGA mode, so

Quoted 10 lines

  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

qemu-options.hx +2 -1
-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

Preexisting: "could be passed" sounds awkward.  Same in the previous paragraph.  Not this patch's problem, so:

Quoted 6 lines
Quoted 1 line

I assume this patch will go via qemu-trivial.

Applied to my trivial-patches branch.

Thanks,
Laurent