[Qemu-commits] [qemu/qemu] bed663: fw_cfg: Improve error message when can't load spla...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: bed66336771ecdcb788d394bdd081a78b843e509
      
https://github.com/qemu/qemu/commit/bed66336771ecdcb788d394bdd081a78b843e509
  Author: Li Qiang <address@hidden>
  Date:   2019-01-04 (Fri, 04 Jan 2019)

  Changed paths:
    M hw/nvram/fw_cfg.c

  Log Message:
  -----------
  fw_cfg: Improve error message when can't load splash file

read_splashfile() reports "failed to read splash file" without
further details. Get the details from g_file_get_contents(), and
include them in the error message. Also remove unnecessary 'res'
variable.

Signed-off-by: Li Qiang <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 6912bb0b3d3b140c70d8cdfd2dff77f9890d7f12
      
https://github.com/qemu/qemu/commit/6912bb0b3d3b140c70d8cdfd2dff77f9890d7f12
  Author: Li Qiang <address@hidden>
  Date:   2019-01-04 (Fri, 04 Jan 2019)

  Changed paths:
    M hw/nvram/fw_cfg.c
    M vl.c

  Log Message:
  -----------
  fw_cfg: Fix -boot bootsplash error checking

fw_cfg_bootsplash() gets option parameter "splash-time"
with qemu_opt_get(), then converts it to an integer by hand.
It neglects to check that conversion for errors. This is
needlessly complicated and error-prone. But as "splash-time
not specified" is not the same as "splash-time=T" for any T,
we need use qemu_opt_get() to check if splash time exists.
This patch also make the qemu exit when finding or loading
splash file failed.

Signed-off-by: Li Qiang <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: ee5d0f89de3e53cdb0dcf51acc1502b310ed3bd2
      
https://github.com/qemu/qemu/commit/ee5d0f89de3e53cdb0dcf51acc1502b310ed3bd2
  Author: Li Qiang <address@hidden>
  Date:   2019-01-04 (Fri, 04 Jan 2019)

  Changed paths:
    M hw/nvram/fw_cfg.c
    M vl.c

  Log Message:
  -----------
  fw_cfg: Fix -boot reboot-timeout error checking

fw_cfg_reboot() gets option parameter "reboot-timeout" with
qemu_opt_get(), then converts it to an integer by hand. It neglects to
check that conversion for errors, and fails to reject negative values.
Positive values above the limit get reported and replaced by the limit.
This patch checks for conversion errors properly, and reject all values
outside 0...0xffff.

Signed-off-by: Li Qiang <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 19bcc4bc3213e78c303ad480a7a578f62258252d
      
https://github.com/qemu/qemu/commit/19bcc4bc3213e78c303ad480a7a578f62258252d
  Author: Li Qiang <address@hidden>
  Date:   2019-01-04 (Fri, 04 Jan 2019)

  Changed paths:
    M hw/nvram/fw_cfg.c
    M include/sysemu/sysemu.h
    M vl.c

  Log Message:
  -----------
  fw_cfg: Make qemu_extra_params_fw locally

qemu_extra_params_fw[] has external linkage, but is used
only in fw_cfg_bootsplash(), it makes sense to make it
locally.

Signed-off-by: Li Qiang <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
[PMD: Removed qemu_extra_params_fw declaration in vl.c]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: e59dbbac0364344a3ad84c3497a98c56003d3fb8
      
https://github.com/qemu/qemu/commit/e59dbbac0364344a3ad84c3497a98c56003d3fb8
  Author: Peter Maydell <address@hidden>
  Date:   2019-01-04 (Fri, 04 Jan 2019)

  Changed paths:
    M hw/nvram/fw_cfg.c
    M include/sysemu/sysemu.h
    M vl.c

  Log Message:
  -----------
  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) <address@hidden>"
# 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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/6395fe0c2c7d...e59dbbac0364
      **NOTE:** This service has been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.