diff options
| author | Li Qiang <liq3ea@gmail.com> | 2018-10-31 23:02:28 -0700 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@redhat.com> | 2019-01-04 15:30:52 +0100 |
| commit | bed66336771ecdcb788d394bdd081a78b843e509 (patch) | |
| tree | 6266b96b73695bd96d9718460f012bdf9d5cd049 /hw | |
| parent | 6395fe0c2c7d9f336d87960a7c9924b630c57c91 (diff) | |
| download | qemu-bed66336771ecdcb788d394bdd081a78b843e509.zip qemu-bed66336771ecdcb788d394bdd081a78b843e509.tar.gz qemu-bed66336771ecdcb788d394bdd081a78b843e509.tar.bz2 | |
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 <liq3ea@gmail.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <1541052148-28752-1-git-send-email-liq3ea@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/nvram/fw_cfg.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 3cb726f..9c4409b 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -68,15 +68,14 @@ static char *read_splashfile(char *filename, gsize *file_sizep, int *file_typep) { GError *err = NULL; - gboolean res; gchar *content; int file_type; unsigned int filehead; int bmp_bpp; - res = g_file_get_contents(filename, &content, file_sizep, &err); - if (res == FALSE) { - error_report("failed to read splash file '%s'", filename); + if (!g_file_get_contents(filename, &content, file_sizep, &err)) { + error_report("failed to read splash file '%s': %s", + filename, err->message); g_error_free(err); return NULL; } |