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

PATCH In review Li Qiang 3 participants 4 messages Nov 1, 2018 – Dec 11, 2018

Share & tools

Li Qiang

author

2018-11-01 06:02 UTC #0 lore raw

PATCH 1/1 hw: 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 <[email protected]>

---
 hw/nvram/fw_cfg.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

hw/nvram/fw_cfg.c +3 -4

index 946f765..3fcfa35 100644
@@ -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;
     }

Signature · 1 line

1.8.3.1

Li Qiang

author

2018-11-27 03:03 UTC #1 lore raw

Hello Paolo, Philippe

Seems this patch has been lost...

I think Philippe can merge it for 4.0, right?
Also pls notice the following fw_cfg patchset. -->https://lists.gnu.org/archive/html/qemu-devel/2018-11/msg04097.html

Thanks,
Li Qiang

Quoted 38 lines · Li Qiang <[email protected]> 于2018年11月1日周四下午2:02写道：

Signed-off-by Li Qiang <[email protected]>

---
 hw/nvram/fw_cfg.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

hw/nvram/fw_cfg.c +3 -4

index 946f765..3fcfa35 100644
@@ -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

Markus Armbruster

Reviewed-by on v1 1/1

2018-11-27 06:44 UTC #2 lore raw

In reply to Li Qiang

Quoted 23 lines · Li Qiang

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 <[email protected]>
---
 hw/nvram/fw_cfg.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
hw/nvram/fw_cfg.c +0 -1
index 946f765..3fcfa35 100644
@@ -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;

hw/nvram/fw_cfg.c static char *read_splashfile(char *filename, gsize *file_sizep, · line 81

Quoted 10 lines

hw/nvram/fw_cfg.c +3 -3

 
-    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;
     }

Reviewed-by Markus Armbruster <[email protected]>

Philippe, I assume you'll take this.

Philippe Mathieu-Daudé

Reviewed-by on v1 1/1

2018-12-11 15:45 UTC #3 lore raw

In reply to Li Qiang

Quoted 24 lines · Li Qiang

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 <[email protected]>
---
 hw/nvram/fw_cfg.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
hw/nvram/fw_cfg.c +0 -1
index 946f765..3fcfa35 100644
@@ -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;

hw/nvram/fw_cfg.c static char *read_splashfile(char *filename, gsize *file_sizep, · line 81

Quoted 10 lines

hw/nvram/fw_cfg.c +3 -3

 
-    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;
     }

Reviewed-by Philippe Mathieu-Daudé <[email protected]>

and queued, thanks!

Phil.