OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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

Browse Source 
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>
This commit is contained in:
Li Qiang 2018-10-31 22:59:31 -07:00 committed by Paolo Bonzini
parent 03fee66fde
commit 353c7d58b9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vl.c
View File

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