Skip to contentSkip to conversation

vl: Improve error message when we can't load fw_cfg from file

PATCH Applied Li Qiang 2 participants 3 messages Nov 1, 2018 – Nov 21, 2018

lore
Share & tools
lore

Li Qiang

author
#0 lore raw

PATCH 1/1 vl: Improve error message when we can't load fw_cfg from file

parse_fw_cfg() reports "can't load" without further details. Get the details from g_file_get_contents(), and include them in the error message.

---
 vl.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
vl.c +4 -2
index 1fcacc5..f0bd899 100644
@@ -2244,8 +2244,10 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp)
         size = strlen(str); /* NUL terminator NOT included in fw_cfg blob */
         buf = g_memdup(str, size);
     } else {
-        if (!g_file_get_contents(file, &buf, &size, NULL)) {
-            error_setg(errp, "can't load %s", file);
+        GError *err = NULL;
+        if (!g_file_get_contents(file, &buf, &size, &err)) {
+            error_setg(errp, "can't load %s: %s", file, err->message);
+            g_error_free(err);
             return -1;
         }
     }
Signature · 1 line
1.8.3.1
author
#1 lore raw

Ping....

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

parse_fw_cfg() reports "can't load" without further details. Get the details from g_file_get_contents(), and include them in the error message.

---
 vl.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
vl.c +4 -2
index 1fcacc5..f0bd899 100644
@@ -2244,8 +2244,10 @@ static int parse_fw_cfg(void *opaque, QemuOpts
 *opts, Error **errp)
         size = strlen(str); /* NUL terminator NOT included in fw_cfg blob
 */
         buf = g_memdup(str, size);
     } else {
-        if (!g_file_get_contents(file, &buf, &size, NULL)) {
-            error_setg(errp, "can't load %s", file);
+        GError *err = NULL;
+        if (!g_file_get_contents(file, &buf, &size, &err)) {
+            error_setg(errp, "can't load %s: %s", file, err->message);
+            g_error_free(err);
             return -1;
         }
     }

--
1.8.3.1

#2 lore raw
In reply to Li Qiang
Quoted 17 lines · Li Qiang

parse_fw_cfg() reports "can't load" without further details. Get the details from g_file_get_contents(), and include them in the error message.

---
 vl.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
vl.c +0 -0
index 1fcacc5..f0bd899 100644
@@ -2244,8 +2244,10 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp)
         size = strlen(str); /* NUL terminator NOT included in fw_cfg blob */
         buf = g_memdup(str, size);

vl.c static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp) · line 2253

Quoted 10 lines
vl.c +4 -2
     } else {
-        if (!g_file_get_contents(file, &buf, &size, NULL)) {
-            error_setg(errp, "can't load %s", file);
+        GError *err = NULL;
+        if (!g_file_get_contents(file, &buf, &size, &err)) {
+            error_setg(errp, "can't load %s: %s", file, err->message);
+            g_error_free(err);
             return -1;
         }
     }

Queued, thanks.

Paolo