Commit bed66336 authored by Li Qiang's avatar Li Qiang Committed by Philippe Mathieu-Daudé
Browse files

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: default avatarLi Qiang <liq3ea@gmail.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <1541052148-28752-1-git-send-email-liq3ea@gmail.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent 6395fe0c

hw/nvram/fw_cfg.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

    }