Le 22/10/2019 à 14:52, Philippe Mathieu-Daudé a écrit :
> On 10/22/19 8:18 AM, Markus Armbruster wrote:
>> Han Han <h...@redhat.com> writes:
>>
>>> Since ee5d0f89d, -1 is not valid for the value of reboot-timeout. Update
>>> that in qemu-options doc.
>>>
>>> Signed-off-by: Han Han <h...@redhat.com>
>>> ---
>>> qemu-options.hx | 4 ++--
>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/qemu-options.hx b/qemu-options.hx
>>> index 793d70ff..6b92a916 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
>> 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
>>> 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:
>>
>> Reviewed-by: Markus Armbruster <arm...@redhat.com>
>
> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
>
> I assume this patch will go via qemu-trivial.
>
Applied to my trivial-patches branch.
Thanks,
Laurent
