david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Li Qiang 2018-10-31 23:02:28 -07:00 committed by Philippe Mathieu-Daudé
parent 6395fe0c2c
commit bed6633677
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/nvram/fw_cfg.c
View File

@ -68,15 +68,14 @@ static char *read_splashfile(char *filename, gsize *file_sizep,
int *file_typep) int *file_typep)
{ {
GError *err = NULL; GError *err = NULL;
gboolean res;
gchar *content; gchar *content;
int file_type; int file_type;
unsigned int filehead; unsigned int filehead;
int bmp_bpp; int bmp_bpp;
res = g_file_get_contents(filename, &content, file_sizep, &err); if (!g_file_get_contents(filename, &content, file_sizep, &err)) {
if (res == FALSE) { error_report("failed to read splash file '%s': %s",
error_report("failed to read splash file '%s'", filename); filename, err->message);
g_error_free(err); g_error_free(err);
return NULL; return NULL;
} }