[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/15] vl: Improve error message when we can't load f
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 06/15] vl: Improve error message when we can't load fw_cfg from file |
Date: |
Mon, 26 Nov 2018 20:40:26 +0100 |
From: Li Qiang <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
vl.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/vl.c b/vl.c
index fa25d1a..32ab6e6 100644
--- a/vl.c
+++ b/vl.c
@@ -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
- [Qemu-devel] [PULL 00/15] Misc patches for QEMU 3.1-rc3, Paolo Bonzini, 2018/11/26
- [Qemu-devel] [PULL 01/15] target/i386: kvm: add VMX migration blocker, Paolo Bonzini, 2018/11/26
- [Qemu-devel] [PULL 02/15] cpus: run work items for all vCPUs if single-threaded, Paolo Bonzini, 2018/11/26
- [Qemu-devel] [PULL 03/15] lsi: Reselection needed to remove pending commands from queue, Paolo Bonzini, 2018/11/26
- [Qemu-devel] [PULL 04/15] migration: savevm: consult migration blockers, Paolo Bonzini, 2018/11/26
- [Qemu-devel] [PULL 06/15] vl: Improve error message when we can't load fw_cfg from file,
Paolo Bonzini <=
- [Qemu-devel] [PULL 08/15] vl.c: remove outdated comment, Paolo Bonzini, 2018/11/26
- [Qemu-devel] [PULL 09/15] checkpatch: g_test_message does not need a trailing newline, Paolo Bonzini, 2018/11/26
- [Qemu-devel] [PULL 10/15] target/i386: Generate #UD when applying LOCK to a register destination, Paolo Bonzini, 2018/11/26
- [Qemu-devel] [PULL 07/15] vhost-user-bridge: fix recvmsg iovlen, Paolo Bonzini, 2018/11/26
- [Qemu-devel] [PULL 11/15] MAINTAINERS: Add some missing entries related to accelerators, Paolo Bonzini, 2018/11/26
- [Qemu-devel] [PULL 05/15] vmstate: constify VMStateField, Paolo Bonzini, 2018/11/26
- [Qemu-devel] [PULL 12/15] MAINTAINERS: Add an entry for the Firmware Configuration (fw_cfg) device, Paolo Bonzini, 2018/11/26
- [Qemu-devel] [PULL 13/15] configure: fix elf2dmp check, Paolo Bonzini, 2018/11/26
- [Qemu-devel] [PULL 14/15] hostmem-memfd: honour share=on/off property, Paolo Bonzini, 2018/11/26
- [Qemu-devel] [PULL 15/15] hostmem: no need to check for host_memory_backend_mr_inited() in alloc(), Paolo Bonzini, 2018/11/26