From f11136998ed22e121b0a9df26f83e252bd5918fa Mon Sep 17 00:00:00 2001

From: Markus Armbruster <armbru@redhat.com>

Date: Mon, 7 Oct 2019 07:35:06 +0100

Subject: [PATCH 13/22] fw_cfg: Improve error message when can't load splash

 file

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Markus Armbruster <armbru@redhat.com>

Message-id: <20191007073509.5887-2-armbru@redhat.com>

Patchwork-id: 90978

O-Subject: [RHEL-8.2.0 qemu-kvm PATCH v2 1/4] fw_cfg: Improve error message when can't load splash file

Bugzilla: 1607367

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

From: Li Qiang <liq3ea@gmail.com>

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>

(cherry picked from commit bed66336771ecdcb788d394bdd081a78b843e509)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 hw/nvram/fw_cfg.c | 7 +++----

 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c

index 2a0739d..d35ac7b 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;

     }

-- 

1.8.3.1