[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 06/13] error: Don't append a newline when printin
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 06/13] error: Don't append a newline when printing the error hint |
Date: |
Thu, 17 Dec 2015 17:35:14 +0100 |
Since commit 50b7b00, we have error_append_hint() to conveniently
accumulate Error member @hint. error_report_err() prints it with a
newline appended. Consequently, users of error_append_hint() need to
know whether theirs is the final line of the hint to decide whether it
needs a newline. Not a nice interface.
Change error_report_err() to print just the hint, and the (still few)
users of error_append_hint() to add the required newline.
Cc: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
qdev-monitor.c | 2 ++
util/error.c | 2 +-
util/qemu-option.c | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/qdev-monitor.c b/qdev-monitor.c
index a35098f..30936df 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -304,6 +304,7 @@ static void qbus_list_bus(DeviceState *dev, Error **errp)
error_append_hint(errp, "%s\"%s\"", sep, child->name);
sep = ", ";
}
+ error_append_hint(errp, "\n");
}
static void qbus_list_dev(BusState *bus, Error **errp)
@@ -321,6 +322,7 @@ static void qbus_list_dev(BusState *bus, Error **errp)
}
sep = ", ";
}
+ error_append_hint(errp, "\n");
}
static BusState *qbus_find_bus(DeviceState *dev, char *elem)
diff --git a/util/error.c b/util/error.c
index 80c89a2..9b27c45 100644
--- a/util/error.c
+++ b/util/error.c
@@ -204,7 +204,7 @@ void error_report_err(Error *err)
{
error_report("%s", error_get_pretty(err));
if (err->hint) {
- error_printf_unless_qmp("%s\n", err->hint->str);
+ error_printf_unless_qmp("%s", err->hint->str);
}
error_free(err);
}
diff --git a/util/qemu-option.c b/util/qemu-option.c
index a50ecea..a2d593a 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -206,7 +206,7 @@ void parse_option_size(const char *name, const char *value,
default:
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name, "a size");
error_append_hint(errp, "You may use k, M, G or T suffixes for "
- "kilobytes, megabytes, gigabytes and terabytes.");
+ "kilobytes, megabytes, gigabytes and terabytes.\n");
return;
}
} else {
@@ -647,7 +647,7 @@ QemuOpts *qemu_opts_create(QemuOptsList *list, const char
*id,
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "id",
"an identifier");
error_append_hint(errp, "Identifiers consist of letters, digits, "
- "'-', '.', '_', starting with a letter.");
+ "'-', '.', '_', starting with a letter.\n");
return NULL;
}
opts = qemu_opts_find(list, id);
--
2.4.3
- [Qemu-devel] [PATCH v3 00/13] Clean up some hw_error() misuse, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PATCH v3 05/13] raven: Mark use of hw_error() in realize() FIXME, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PATCH v3 09/13] isa: Trivially convert remaining PCI-ISA bridges to realize(), Markus Armbruster, 2015/12/17
- [Qemu-devel] [PATCH v3 11/13] isa: Clean up inappropriate hw_error(), Markus Armbruster, 2015/12/17
- [Qemu-devel] [PATCH v3 10/13] isa: Clean up error handling around isa_bus_new(), Markus Armbruster, 2015/12/17
- [Qemu-devel] [PATCH v3 04/13] etraxfs_eth: Don't use hw_error() in init() method, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PATCH v3 08/13] sysbus: Don't use hw_error() in machine_init_done_notifiers, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PATCH v3 06/13] error: Don't append a newline when printing the error hint,
Markus Armbruster <=
- [Qemu-devel] [PATCH v3 03/13] arm_mptimer: Don't use hw_error() in realize() method, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PATCH v3 12/13] audio: Clean up inappropriate and unreachable use of hw_error(), Markus Armbruster, 2015/12/17
- [Qemu-devel] [PATCH v3 02/13] omap: Don't use hw_error() in device init() methods, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PATCH v3 07/13] hw/arm/virt: Fix property "gic-version" error handling, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PATCH v3 01/13] hw: Don't use hw_error() for machine initialization errors, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PATCH v3 13/13] xen-hvm: Mark inappropriate error handling FIXME, Markus Armbruster, 2015/12/17