diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-12-20 12:46:10 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-12-20 12:46:10 +0000 |
| commit | 8e5943260a8f765216674ee87ce8588cc4e7463e (patch) | |
| tree | cdafe35ea56d921b7353c4df91cc9e58e7c6cc0d /qemu-options.hx | |
| parent | 48008198270e3ebcc9394401d676c54ed5ac139c (diff) | |
| parent | 80bc935eaaf93e5b9a4efe97abd7c51d645f2612 (diff) | |
| download | qemu-8e5943260a8f765216674ee87ce8588cc4e7463e.zip qemu-8e5943260a8f765216674ee87ce8588cc4e7463e.tar.gz qemu-8e5943260a8f765216674ee87ce8588cc4e7463e.tar.bz2 | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging
Trivial fixes (20191218)
# gpg: Signature made Wed 18 Dec 2019 13:00:34 GMT
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-branch-pull-request:
qemu-doc: Remove the unused "Guest Agent" node
Revert "qemu-options.hx: Update for reboot-timeout parameter"
target/sparc: Remove old TODO file
test-keyval: Tighten test of trailing crap after size
util/cutils: Turn FIXME comment into QEMU_BUILD_BUG_ON()
monitor: Remove unused define
MAINTAINERS: Add hw/sd/ssi-sd.c in the SD section
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 64442b6..e9d6231 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -334,8 +334,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 |