Skip to contentSkip to conversation

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

PATCH Superseded Han Han 4 participants 5 messages Dec 4, 2019 – Dec 5, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Han Han

author
#0 lore raw

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

This reverts commit bbd9e6985ff342cbe15b9cb7eb30e842796fbbe8.

In 20a1922032 we allowed reboot-timeout=-1 again, so update the doc accordingly.

---
 qemu-options.hx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
qemu-options.hx +2 -2
index 65c9473b73..e14d88e9b2 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 @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
Signature · 1 line
2.24.0.rc1
#1 lore raw
Patchew URL: https://patchew.org/QEMU/[email protected]/

Patchew URL: https://patchew.org/QEMU/[email protected]/

Hi,

This series seems to have some coding style problems. See output below for more information:

Subject: [PATCH] Revert "qemu-options.hx: Update for reboot-timeout parameter"
Type: series
Message-id: [email protected]

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
6803338 Revert "qemu-options.hx: Update for reboot-timeout parameter"

=== OUTPUT BEGIN ===
ERROR: Missing Signed-off-by: line(s)

total: 1 errors, 0 warnings, 10 lines checked

Commit 680333822026 (Revert "qemu-options.hx: Update for reboot-timeout parameter") has style problems, please review. If any of these errors are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===

Test command exited with code: 1

The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]

Reviewed-by on v1 1/1
#2 lore raw
In reply to Han Han
Quoted 13 lines · Han Han

This reverts commit bbd9e6985ff342cbe15b9cb7eb30e842796fbbe8.

In 20a1922032 we allowed reboot-timeout=-1 again, so update the doc accordingly.

---
 qemu-options.hx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
qemu-options.hx +0 -0
index 65c9473b73..e14d88e9b2 100644

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
@@ -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
#3 lore raw
In reply to Han Han
Quoted 1 line · * Han Han ([email protected]) wrote:

This reverts commit bbd9e6985ff342cbe15b9cb7eb30e842796fbbe8.

Patchew spotted you're missing the signed-off-by; please send one.

Dave

Quoted 24 lines

In 20a1922032 we allowed reboot-timeout=-1 again, so update the doc accordingly.

---
 qemu-options.hx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
qemu-options.hx +2 -2
index 65c9473b73..e14d88e9b2 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 @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
Signature · 1 line
2.24.0.rc1

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK

author
#4 lore raw

OK. Updated in version 2.

Quoted 38 lines · Dr. David Alan Gilbert
Quoted 1 line · * Han Han ([email protected]) wrote:

This reverts commit bbd9e6985ff342cbe15b9cb7eb30e842796fbbe8.

Patchew spotted you're missing the signed-off-by; please send one.

Dave

qemu-options.hx format(true color). The resolution should be

Quoted 11 lines

In 20a1922032 we allowed reboot-timeout=-1 again, so update the doc accordingly.

---
 qemu-options.hx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
qemu-options.hx +0 -0
index 65c9473b73..e14d88e9b2 100644
@@ -327,8 +327,8 @@ 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

Quoted 3 lines
qemu-options.hx +0 -0
 the recommended is 320x240, 640x480, 800x640.
 
 A timeout could be passed to bios, guest will pause for

@var{rb_timeout} ms

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

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

Quoted 7 lines
qemu-options.hx +1 -1
+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.0.rc1

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK

Signature · 8 lines
Best regards,
-----------------------------------
Han Han
Quality Engineer
Redhat.

Email: [email protected]
Phone: +861065339333