summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Qiang2018-11-01 06:59:31 +0100
committerPaolo Bonzini2018-11-27 15:35:18 +0100
commit353c7d58b9192c6c0443a426ebb8582d73ded960 (patch)
tree8d62beae9d7b28ab6d72629d30d4a3d9ba8ee78d
parentvmstate: constify VMStateField (diff)
downloadqemu-353c7d58b9192c6c0443a426ebb8582d73ded960.tar.gz
qemu-353c7d58b9192c6c0443a426ebb8582d73ded960.tar.xz
qemu-353c7d58b9192c6c0443a426ebb8582d73ded960.zip
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>
-rw-r--r--vl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/vl.c b/vl.c
index d6fd95c227..611d8878c6 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;
}
}