summaryrefslogtreecommitdiff
path: root/hw/i386
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2013-03-21 00:23:19 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2013-04-04 19:23:08 -0500
commit23084327dc5c2f42e8a1c3e39ec565e344c7f52e (patch)
tree80045f2e756bbe9c9fc0394153b7c58024c92e83 /hw/i386
parente980f2bf0a39cb524259bb70084e0f75b92c8f39 (diff)
downloadqemu-23084327dc5c2f42e8a1c3e39ec565e344c7f52e.tar.gz
like acpi_table_install(), acpi_table_add() should propagate Errors
Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Message-id: 1363821803-3380-8-git-send-email-lersek@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/i386')
-rw-r--r--hw/i386/pc.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index d1bc0deb28..2e915ecd68 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -891,6 +891,7 @@ void pc_acpi_init(const char *default_dsdt)
{
char *filename = NULL, *arg = NULL;
QemuOpts *opts;
+ Error *err = NULL;
if (acpi_tables != NULL) {
/* manually set via -acpitable, leave it alone */
@@ -909,8 +910,11 @@ void pc_acpi_init(const char *default_dsdt)
opts = qemu_opts_parse(qemu_find_opts("acpi"), arg, 0);
g_assert(opts != NULL);
- if (acpi_table_add(opts) != 0) {
- fprintf(stderr, "WARNING: failed to load %s\n", filename);
+ acpi_table_add(opts, &err);
+ if (err) {
+ fprintf(stderr, "WARNING: failed to load %s: %s\n", filename,
+ error_get_pretty(err));
+ error_free(err);
}
g_free(arg);
g_free(filename);