| Message ID | 20191205024821.245435-1-hhan@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] Revert "qemu-options.hx: Update for reboot-timeout parameter" | expand |
Han Han <hhan@redhat.com> writes: > 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> > --- > qemu-options.hx | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/qemu-options.hx b/qemu-options.hx > index 65c9473b..e14d88e9 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 Reviewed-by: Markus Armbruster <armbru@redhat.com>
Le 05/12/2019 à 03:48, Han Han a écrit : > 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> > --- > qemu-options.hx | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/qemu-options.hx b/qemu-options.hx > index 65c9473b..e14d88e9 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 > Applied to my trivial-patches branch. Thanks, Laurent
diff --git a/qemu-options.hx b/qemu-options.hx index 65c9473b..e14d88e9 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
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> --- qemu-options.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)