From: Li Qiang <liq3ea@gmail.com>
Date: Thu, 1 Nov 2018 05:59:31 +0000 (-0700)
Subject: vl: Improve error message when we can't load fw_cfg from file
X-Git-Tag: v3.1.0-rc3~3^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=353c7d58b9192c6c0443a426ebb8582d73ded960;p=thirdparty%2Fqemu.git

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.

Signed-off-by: Li Qiang <liq3ea@gmail.com>
Message-Id: <1541051971-28584-1-git-send-email-liq3ea@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/vl.c b/vl.c
index d6fd95c227d..611d8878c60 100644
--- a/vl.c
+++ b/vl.c
@@ -2250,8 +2250,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;
         }
     }