diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-01-04 18:23:13 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-01-04 18:23:13 +0000 |
| commit | e59dbbac0364344a3ad84c3497a98c56003d3fb8 (patch) | |
| tree | 6fe351bfb78c2c94e3f53e42a1272db78d23c4c6 /vl.c | |
| parent | 6395fe0c2c7d9f336d87960a7c9924b630c57c91 (diff) | |
| parent | 19bcc4bc3213e78c303ad480a7a578f62258252d (diff) | |
| download | focaccia-qemu-e59dbbac0364344a3ad84c3497a98c56003d3fb8.tar.gz focaccia-qemu-e59dbbac0364344a3ad84c3497a98c56003d3fb8.zip | |
Merge remote-tracking branch 'remotes/philmd/tags/fw_cfg-20190104-pull-request' into staging
fw_cfg patches for 2019-01-04 Two fixes from Li Qiang: - Improve error message when can't load splash file - Fix boot bootsplash and reboot-timeout error checking # gpg: Signature made Fri 04 Jan 2019 16:22:24 GMT # gpg: using RSA key E3E32C2CDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" # Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE * remotes/philmd/tags/fw_cfg-20190104-pull-request: fw_cfg: Make qemu_extra_params_fw locally fw_cfg: Fix -boot reboot-timeout error checking fw_cfg: Fix -boot bootsplash error checking fw_cfg: Improve error message when can't load splash file Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vl.c b/vl.c index 8353d3c718..0db5ad0246 100644 --- a/vl.c +++ b/vl.c @@ -191,7 +191,6 @@ int boot_menu; bool boot_strict; uint8_t *boot_splash_filedata; size_t boot_splash_filedata_size; -uint8_t qemu_extra_params_fw[2]; bool wakeup_suspend_enabled; int icount_align_option; @@ -338,10 +337,10 @@ static QemuOptsList qemu_boot_opts = { .type = QEMU_OPT_STRING, }, { .name = "splash-time", - .type = QEMU_OPT_STRING, + .type = QEMU_OPT_NUMBER, }, { .name = "reboot-timeout", - .type = QEMU_OPT_STRING, + .type = QEMU_OPT_NUMBER, }, { .name = "strict", .type = QEMU_OPT_BOOL, |